diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2020-04-22 11:09:09 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 11:09:09 -0700 |
| commit | e45f8c1f49855cebe90b6722324ec24146ff5a3d (patch) | |
| tree | c369c9dcaa781991ac97227528fb9e714b5ee4c1 /tools/slang-test/slang-test-main.cpp | |
| parent | 58904b58bcc5436950dcae6680c9214e6361be92 (diff) | |
Disable OptiX tests by default. (#1331)
When running `slang-test`, the OptiX tests will be skipped by default for now, and must be explicitly enabled by adding `-category optix` on the command line.
I will need to add a better discovery mechanism down the line, closer to how support for different graphics APIs is being tested, but for now this should be enough to unblock our CI builds.
Diffstat (limited to 'tools/slang-test/slang-test-main.cpp')
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index da03d67fe..8b3fda9dd 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -3105,6 +3105,7 @@ SlangResult innerMain(int argc, char** argv) auto vulkanTestCategory = categorySet.add("vulkan", fullTestCategory); auto unitTestCatagory = categorySet.add("unit-test", fullTestCategory); auto cudaTestCategory = categorySet.add("cuda", fullTestCategory); + auto optixTestCategory = categorySet.add("optix", cudaTestCategory); auto compatibilityIssueCategory = categorySet.add("compatibility-issue", fullTestCategory); @@ -3206,6 +3207,12 @@ SlangResult innerMain(int argc, char** argv) options.includeCategories.Add(fullTestCategory, fullTestCategory); } + // Don't include OptiX tests unless the client has explicit opted into them. + if( !options.includeCategories.ContainsKey(optixTestCategory) ) + { + options.excludeCategories.Add(optixTestCategory, optixTestCategory); + } + // Exclude rendering tests when building under AppVeyor. // // TODO: this is very ad hoc, and we should do something cleaner. |
