From 91ac1555d7838961c3b5c41d5af39c7a881f59eb Mon Sep 17 00:00:00 2001 From: "YONGH\\yongh" Date: Mon, 30 Oct 2017 19:40:13 -0400 Subject: Fixing issue #236 --- tools/slang-test/main.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tools') 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 = [&]() -- cgit v1.2.3 From 8ba5d28be28fff7ac3a99a0046cac9fd9897d16e Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 31 Oct 2017 05:56:28 -0400 Subject: initiate rebuild --- tools/render-test/render-gl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') 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 { -- cgit v1.2.3