diff options
Diffstat (limited to 'tools/slang-test')
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 118 |
1 files changed, 33 insertions, 85 deletions
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index 4f96c3a6a..6fb270c35 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -436,14 +436,8 @@ static SlangResult _gatherTestsForFile( outTestList->tests.clear(); String fileContents; - try - { - fileContents = Slang::File::readAllText(filePath); - } - catch (const Slang::IOException&) - { - return SLANG_FAIL; - } + + SLANG_RETURN_ON_FAIL(Slang::File::readAllText(filePath, fileContents)); // Walk through the lines of the file, looking for test commands char const* cursor = fileContents.begin(); @@ -1168,13 +1162,9 @@ TestResult runDocTest(TestContext* context, TestInput& input) String expectedOutputPath = outputStem + ".expected"; String expectedOutput; - try - { - expectedOutput = Slang::File::readAllText(expectedOutputPath); - } - catch (const Slang::IOException&) - { - } + + // TODO(JS): Might want to check the result code.. + Slang::File::readAllText(expectedOutputPath, expectedOutput); // If no expected output file was found, then we // expect everything to be empty @@ -1258,14 +1248,9 @@ TestResult runSimpleTest(TestContext* context, TestInput& input) String expectedOutputPath = outputStem + ".expected"; String expectedOutput; - try - { - expectedOutput = Slang::File::readAllText(expectedOutputPath); - } - catch (const Slang::IOException&) - { - } - + + Slang::File::readAllText(expectedOutputPath, expectedOutput); + // If no expected output file was found, then we // expect everything to be empty if (expectedOutput.getLength() == 0) @@ -1298,15 +1283,7 @@ TestResult runSimpleTest(TestContext* context, TestInput& input) SlangResult _readText(const UnownedStringSlice& path, String& out) { - try - { - out = Slang::File::readAllText(path); - } - catch (const Slang::IOException&) - { - return SLANG_FAIL; - } - return SLANG_OK; + return Slang::File::readAllText(path, out); } static SlangResult _readExpected(const UnownedStringSlice& stem, String& out) @@ -1540,13 +1517,8 @@ TestResult runReflectionTest(TestContext* context, TestInput& input) String expectedOutputPath = outputStem + ".expected"; String expectedOutput; - try - { - expectedOutput = Slang::File::readAllText(expectedOutputPath); - } - catch (const Slang::IOException&) - { - } + + Slang::File::readAllText(expectedOutputPath, expectedOutput); // If no expected output file was found, then we // expect everything to be empty @@ -1581,14 +1553,9 @@ String getExpectedOutput(String const& outputStem) { String expectedOutputPath = outputStem + ".expected"; String expectedOutput; - try - { - expectedOutput = Slang::File::readAllText(expectedOutputPath); - } - catch (const Slang::IOException&) - { - } - + + Slang::File::readAllText(expectedOutputPath, expectedOutput); + // If no expected output file was found, then we // expect everything to be empty if (expectedOutput.getLength() == 0) @@ -1727,15 +1694,10 @@ static TestResult runCPPCompilerSharedLibrary(TestContext* context, TestInput& i { // Read the expected String expectedOutput; - try - { - String expectedOutputPath = outputStem + ".expected"; - expectedOutput = Slang::File::readAllText(expectedOutputPath); - } - catch (const Slang::IOException&) - { - } - + + String expectedOutputPath = outputStem + ".expected"; + Slang::File::readAllText(expectedOutputPath, expectedOutput); + // Compare if they are the same if (!StringUtil::areLinesEqual(actualOutput.getUnownedSlice(), expectedOutput.getUnownedSlice())) { @@ -1867,15 +1829,10 @@ static TestResult runCPPCompilerExecute(TestContext* context, TestInput& input) { // Read the expected String expectedOutput; - try - { - String expectedOutputPath = outputStem + ".expected"; - expectedOutput = Slang::File::readAllText(expectedOutputPath); - } - catch (const Slang::IOException&) - { - } - + + String expectedOutputPath = outputStem + ".expected"; + Slang::File::readAllText(expectedOutputPath, expectedOutput); + // Compare if they are the same if (!StringUtil::areLinesEqual(actualOutput.getUnownedSlice(), expectedOutput.getUnownedSlice())) { @@ -1960,11 +1917,8 @@ TestResult runCrossCompilerTest(TestContext* context, TestInput& input) { expectedOutput = getOutput(expectedExeRes); String expectedOutputPath = outputStem + ".expected"; - try - { - Slang::File::writeAllText(expectedOutputPath, expectedOutput); - } - catch (const Slang::IOException&) + + if (SLANG_FAILED(Slang::File::writeAllText(expectedOutputPath, expectedOutput))) { return TestResult::Fail; } @@ -2045,14 +1999,12 @@ TestResult generateHLSLBaseline( String expectedOutput = getOutput(exeRes); String expectedOutputPath = outputStem + ".expected"; - try - { - Slang::File::writeAllText(expectedOutputPath, expectedOutput); - } - catch (const Slang::IOException&) + + if (SLANG_FAILED(Slang::File::writeAllText(expectedOutputPath, expectedOutput))) { return TestResult::Fail; } + return TestResult::Pass; } @@ -2126,14 +2078,8 @@ static TestResult _runHLSLComparisonTest( String actualOutput = actualOutputBuilder.ProduceString(); String expectedOutput; - try - { - expectedOutput = Slang::File::readAllText(expectedOutputPath); - } - catch (const Slang::IOException&) - { - } - + Slang::File::readAllText(expectedOutputPath, expectedOutput); + TestResult result = TestResult::Pass; // If no expected output file was found, then we @@ -2543,8 +2489,10 @@ TestResult runComputeComparisonImpl(TestContext* context, TestInput& input, cons printf("referenceOutput %s not found.\n", referenceOutputFile.getBuffer()); return TestResult::Fail; } - auto actualOutputContent = File::readAllText(actualOutputFile); - auto referenceOutputContent = File::readAllText(referenceOutputFile); + String actualOutputContent, referenceOutputContent; + + File::readAllText(actualOutputFile, actualOutputContent); + File::readAllText(referenceOutputFile, referenceOutputContent); if (SLANG_FAILED(_compareWithType(actualOutputContent.getUnownedSlice(), referenceOutputContent.getUnownedSlice()))) { |