Update SPIRV-Tools to 2020.1 / SPIRV-Cross to 65aa0c3 (#2121)
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include "gmock/gmock.h"
|
||||
#include "source/util/string_utils.h"
|
||||
#include "test/test_fixture.h"
|
||||
#include "test/unit_spirv.h"
|
||||
|
||||
@@ -26,7 +27,7 @@ namespace spvtools {
|
||||
namespace {
|
||||
|
||||
using spvtest::MakeInstruction;
|
||||
using spvtest::MakeVector;
|
||||
using utils::MakeVector;
|
||||
using spvtest::TextToBinaryTest;
|
||||
using ::testing::Eq;
|
||||
|
||||
@@ -73,8 +74,8 @@ TEST_P(OpSourceTest, AnyLanguage) {
|
||||
GetParam().version})));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TextToBinaryTestDebug, OpSourceTest,
|
||||
::testing::ValuesIn(kLanguageCases), );
|
||||
INSTANTIATE_TEST_SUITE_P(TextToBinaryTestDebug, OpSourceTest,
|
||||
::testing::ValuesIn(kLanguageCases));
|
||||
|
||||
TEST_F(OpSourceTest, WrongLanguage) {
|
||||
EXPECT_THAT(CompileFailure("OpSource xxyyzz 12345"),
|
||||
@@ -113,9 +114,9 @@ TEST_P(OpSourceContinuedTest, AnyExtension) {
|
||||
}
|
||||
|
||||
// TODO(dneto): utf-8, quoting, escaping
|
||||
INSTANTIATE_TEST_CASE_P(TextToBinaryTestDebug, OpSourceContinuedTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}), );
|
||||
INSTANTIATE_TEST_SUITE_P(TextToBinaryTestDebug, OpSourceContinuedTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}));
|
||||
|
||||
// Test OpSourceExtension
|
||||
|
||||
@@ -132,9 +133,9 @@ TEST_P(OpSourceExtensionTest, AnyExtension) {
|
||||
}
|
||||
|
||||
// TODO(dneto): utf-8, quoting, escaping
|
||||
INSTANTIATE_TEST_CASE_P(TextToBinaryTestDebug, OpSourceExtensionTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}), );
|
||||
INSTANTIATE_TEST_SUITE_P(TextToBinaryTestDebug, OpSourceExtensionTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}));
|
||||
|
||||
TEST_F(TextToBinaryTest, OpLine) {
|
||||
EXPECT_THAT(CompiledInstructions("OpLine %srcfile 42 99"),
|
||||
@@ -158,9 +159,9 @@ TEST_P(OpStringTest, AnyString) {
|
||||
}
|
||||
|
||||
// TODO(dneto): utf-8, quoting, escaping
|
||||
INSTANTIATE_TEST_CASE_P(TextToBinaryTestDebug, OpStringTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}), );
|
||||
INSTANTIATE_TEST_SUITE_P(TextToBinaryTestDebug, OpStringTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}));
|
||||
|
||||
using OpNameTest =
|
||||
spvtest::TextToBinaryTestBase<::testing::TestWithParam<const char*>>;
|
||||
@@ -174,8 +175,8 @@ TEST_P(OpNameTest, AnyString) {
|
||||
|
||||
// UTF-8, quoting, escaping, etc. are covered in the StringLiterals tests in
|
||||
// BinaryToText.Literal.cpp.
|
||||
INSTANTIATE_TEST_CASE_P(TextToBinaryTestDebug, OpNameTest,
|
||||
::testing::Values("", "foo bar this and that"), );
|
||||
INSTANTIATE_TEST_SUITE_P(TextToBinaryTestDebug, OpNameTest,
|
||||
::testing::Values("", "foo bar this and that"));
|
||||
|
||||
using OpMemberNameTest =
|
||||
spvtest::TextToBinaryTestBase<::testing::TestWithParam<const char*>>;
|
||||
@@ -190,9 +191,9 @@ TEST_P(OpMemberNameTest, AnyString) {
|
||||
}
|
||||
|
||||
// TODO(dneto): utf-8, quoting, escaping
|
||||
INSTANTIATE_TEST_CASE_P(TextToBinaryTestDebug, OpMemberNameTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}), );
|
||||
INSTANTIATE_TEST_SUITE_P(TextToBinaryTestDebug, OpMemberNameTest,
|
||||
::testing::ValuesIn(std::vector<const char*>{
|
||||
"", "foo bar this and that"}));
|
||||
|
||||
// TODO(dneto): Parse failures?
|
||||
|
||||
@@ -207,8 +208,8 @@ TEST_P(OpModuleProcessedTest, AnyString) {
|
||||
Eq(MakeInstruction(SpvOpModuleProcessed, MakeVector(GetParam()))));
|
||||
}
|
||||
|
||||
INSTANTIATE_TEST_CASE_P(TextToBinaryTestDebug, OpModuleProcessedTest,
|
||||
::testing::Values("", "foo bar this and that"), );
|
||||
INSTANTIATE_TEST_SUITE_P(TextToBinaryTestDebug, OpModuleProcessedTest,
|
||||
::testing::Values("", "foo bar this and that"));
|
||||
|
||||
} // namespace
|
||||
} // namespace spvtools
|
||||
|
||||
Reference in New Issue
Block a user