diff options
| author | Yong He <yonghe@outlook.com> | 2017-10-31 06:28:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 06:28:23 -0400 |
| commit | e2b473060133ae25a0be92fcfe80c5c7e51fa10a (patch) | |
| tree | cf5e40c2fc7c20156cc71001dc209a268cc1cf76 /tools | |
| parent | 832d9c708891b10145c6648d893b04ca4a0b879a (diff) | |
| parent | 8ba5d28be28fff7ac3a99a0046cac9fd9897d16e (diff) | |
Merge pull request #240 from csyonghe/master
Fixing issue #236
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/render-test/render-gl.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/main.cpp | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tools/render-test/render-gl.cpp b/tools/render-test/render-gl.cpp index 9563ced96..a853a53a4 100644 --- a/tools/render-test/render-gl.cpp +++ b/tools/render-test/render-gl.cpp @@ -609,7 +609,7 @@ public: } return shaderID; - } + } virtual void dispatchCompute(int x, int y, int z) override { diff --git a/tools/slang-test/main.cpp b/tools/slang-test/main.cpp index 5b4337d12..0ff6535b8 100644 --- a/tools/slang-test/main.cpp +++ b/tools/slang-test/main.cpp @@ -1134,7 +1134,11 @@ TestResult runComputeComparisonImpl(TestInput& input, const char * langOption, S spawner.pushArgument(langOption); spawner.pushArgument("-o"); - spawner.pushArgument(outputStem + ".actual.txt"); + auto actualOutputFile = outputStem + ".actual.txt"; + spawner.pushArgument(actualOutputFile); + + // clear the stale actual output file first. This will allow us to detect error if render-test fails and outputs nothing. + File::WriteAllText(actualOutputFile, ""); if (spawnAndWait(outputStem, spawner) != kOSError_None) { @@ -1145,7 +1149,7 @@ TestResult runComputeComparisonImpl(TestInput& input, const char * langOption, S auto actualOutput = getOutput(spawner); // check against reference output - if (!File::Exists(outputStem + ".actual.txt")) + if (!File::Exists(actualOutputFile)) { printf("render-test not producing expected outputs.\n"); printf("render-test output:\n%s\n", actualOutput.Buffer()); @@ -1156,7 +1160,7 @@ TestResult runComputeComparisonImpl(TestInput& input, const char * langOption, S printf("referenceOutput %s not found.\n", referenceOutput.Buffer()); return kTestResult_Fail; } - auto actualOutputContent = File::ReadAllText(outputStem + ".actual.txt"); + auto actualOutputContent = File::ReadAllText(actualOutputFile); auto actualProgramOutput = Split(actualOutputContent, '\n'); auto referenceProgramOutput = Split(File::ReadAllText(referenceOutput), '\n'); auto printOutput = [&]() |