summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorYong He <yonghe@outlook.com>2024-02-02 22:28:02 -0800
committerGitHub <noreply@github.com>2024-02-02 22:28:02 -0800
commit14764896c34b230a5563f48d8b8e565de2f3aa10 (patch)
tree2f105d3f6222103f458054f1cd38e280b6fb52b4 /tools
parentc15e7ade4e27e1649d5b98f5854e9e52bb9e60ae (diff)
Capability type checking. (#3530)
* Capability type checking. * Fix. --------- Co-authored-by: Yong He <yhe@nvidia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/slang-test/slang-test-main.cpp3
-rw-r--r--tools/slang-test/slangc-tool.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index 5de9a8dc6..c93bebf33 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -2698,6 +2698,8 @@ TestResult generateActualOutput(TestContext* const context, const TestInput& inp
return TestResult::Pass;
}
+ actualOutput = getOutput(actualExeRes);
+
// Always fail if the compilation produced a failure, just
// to catch situations where, e.g., command-line options parsing
// caused the same error in both the Slang and glslang cases.
@@ -2707,7 +2709,6 @@ TestResult generateActualOutput(TestContext* const context, const TestInput& inp
return TestResult::Fail;
}
- actualOutput = getOutput(actualExeRes);
return TestResult::Pass;
}
diff --git a/tools/slang-test/slangc-tool.cpp b/tools/slang-test/slangc-tool.cpp
index a62ea6975..4c2a3244c 100644
--- a/tools/slang-test/slangc-tool.cpp
+++ b/tools/slang-test/slangc-tool.cpp
@@ -49,7 +49,7 @@ SlangResult SlangCTool::innerMain(StdWriters* stdWriters, slang::IGlobalSession*
const SlangResult res = compileRequest->processCommandLineArguments(&argv[1], argc - 1);
if (SLANG_FAILED(res))
{
- // TODO: print usage message
+ StdWriters::getOut().print("%s", compileRequest->getDiagnosticOutput());
return res;
}
}