mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix several comments in GTest fixture.

Browse Source
This commit is contained in:
Lei Zhang
2016-05-17 16:43:05 -04:00
parent 9af54c3337
commit fc697cc938
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtests/Hlsl.FromFile.cpp
View File

@@ -59,7 +59,7 @@ std::string FileNameAsCustomTestSuffix(
using HlslCompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>; using HlslCompileTest = GlslangTest<::testing::TestWithParam<FileNameEntryPointPair>>;
// Compiling HLSL to SPIR-V under Vulkan semantics. Expected to successfully // Compiling HLSL to SPIR-V under Vulkan semantics. Expected to successfully
// generate SPIR-V. // generate both AST and SPIR-V.
TEST_P(HlslCompileTest, FromFile) TEST_P(HlslCompileTest, FromFile)
{ {
loadFileCompileAndCheck(GLSLANG_TEST_DIRECTORY, GetParam().fileName, loadFileCompileAndCheck(GLSLANG_TEST_DIRECTORY, GetParam().fileName,

15
gtests/TestFixture.h
View File

@@ -129,14 +129,13 @@ public:
} }
// Checks the equality of |expected| and |real|. If they are not equal, // Checks the equality of |expected| and |real|. If they are not equal,
// write // write |real| to the given file named as |fname| if update mode is on.
// |real| to the given file named as |fname| if update mode is on.
void checkEqAndUpdateIfRequested(const std::string& expected, void checkEqAndUpdateIfRequested(const std::string& expected,
const std::string& real, const std::string& real,
const std::string& fname) const std::string& fname)
{ {
// In order to output the message we want under proper circumstances, we // In order to output the message we want under proper circumstances,
// need the following operator<< stuff. // we need the following operator<< stuff.
EXPECT_EQ(expected, real) EXPECT_EQ(expected, real)
<< (GlobalTestSettings.updateMode << (GlobalTestSettings.updateMode
? ("Mismatch found and update mode turned on - " ? ("Mismatch found and update mode turned on - "
@@ -145,10 +144,8 @@ public:
// Update the expected output file if requested. // Update the expected output file if requested.
// It looks weird to duplicate the comparison between expected_output // It looks weird to duplicate the comparison between expected_output
// and // and stream.str(). However, if creating a variable for the comparison
// stream.str(). However, if creating a variable for the comparison // result, we cannot have pretty print of the string diff in the above.
// result,
// we cannot have pretty print of the string diff in the above.
if (GlobalTestSettings.updateMode && expected != real) { if (GlobalTestSettings.updateMode && expected != real) {
EXPECT_TRUE(WriteFile(fname, real)) << "Flushing failed"; EXPECT_TRUE(WriteFile(fname, real)) << "Flushing failed";
} }
@@ -165,7 +162,7 @@ public:
const std::string spirv; // Optional SPIR-V disassembly text. const std::string spirv; // Optional SPIR-V disassembly text.
}; };
// Compiles and linkes the given source |code| of the given shader // Compiles and links the given source |code| of the given shader
// |stage| into the given |target| under the given |semantics|. Returns // |stage| into the given |target| under the given |semantics|. Returns
// a GlslangResult instance containing all the information generated // a GlslangResult instance containing all the information generated
// during the process. If |target| is Target::Spirv, also disassembles // during the process. If |target| is Target::Spirv, also disassembles