Skip to content

Commit e45f8c1

Browse files
author
Tim Foley
authored
Disable OptiX tests by default. (shader-slang#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.
1 parent 58904b5 commit e45f8c1

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

tests/pipeline/ray-tracing/raygen.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// raygen.slang
22

3-
//TEST:COMPARE_COMPUTE_EX:-cuda -rt -output-using-type -compute-dispatch 4,1,1
3+
//TEST(optix):COMPARE_COMPUTE_EX:-cuda -rt -output-using-type -compute-dispatch 4,1,1
44

55
//TEST_INPUT:ubuffer(data=[0 0 0 0],stride=4):name gOutput,out
66

tools/slang-test/slang-test-main.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -3105,6 +3105,7 @@ SlangResult innerMain(int argc, char** argv)
31053105
auto vulkanTestCategory = categorySet.add("vulkan", fullTestCategory);
31063106
auto unitTestCatagory = categorySet.add("unit-test", fullTestCategory);
31073107
auto cudaTestCategory = categorySet.add("cuda", fullTestCategory);
3108+
auto optixTestCategory = categorySet.add("optix", cudaTestCategory);
31083109

31093110
auto compatibilityIssueCategory = categorySet.add("compatibility-issue", fullTestCategory);
31103111

@@ -3206,6 +3207,12 @@ SlangResult innerMain(int argc, char** argv)
32063207
options.includeCategories.Add(fullTestCategory, fullTestCategory);
32073208
}
32083209

3210+
// Don't include OptiX tests unless the client has explicit opted into them.
3211+
if( !options.includeCategories.ContainsKey(optixTestCategory) )
3212+
{
3213+
options.excludeCategories.Add(optixTestCategory, optixTestCategory);
3214+
}
3215+
32093216
// Exclude rendering tests when building under AppVeyor.
32103217
//
32113218
// TODO: this is very ad hoc, and we should do something cleaner.

0 commit comments

Comments
 (0)