Skip to content

Commit f14ddda

Browse files
committed
Fix LongVectors tests running as part of standard test passes
Currently, the various test runners (lit, hcttest.cmd) only run execution tests where the Priority metadata is <2. Previously, the LongVectors tests didn't set a value for priority, and this resulted in them never being selected. This change adds the missing priority metadata - and then fixes up the tests so they don't immediately fail if the runtime/device doesn't support SM 6.9!
1 parent fa3fe95 commit f14ddda

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

tools/clang/unittests/HLSLExec/LongVectors.cpp

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,6 +1353,7 @@ class DxilConf_SM69_Vectorized {
13531353
TEST_CLASS_PROPERTY(
13541354
"Kits.Specification",
13551355
"Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement")
1356+
TEST_METHOD_PROPERTY(L"Priority", L"0")
13561357
END_TEST_CLASS()
13571358

13581359
TEST_CLASS_SETUP(classSetup) {
@@ -1419,8 +1420,14 @@ class DxilConf_SM69_Vectorized {
14191420
OverrideInputSize);
14201421
}
14211422

1422-
// Only skip unsupported tests for RITP runs.
1423-
const bool SkipUnsupported = IsRITP;
1423+
bool FailIfRequirementsNotMet = false;
1424+
#ifdef _HLK_CONF
1425+
FailIsRequirementsNotMet = true;
1426+
#endif
1427+
WEX::TestExecution::RuntimeParameters::TryGetValue(
1428+
L"FailIfRequirementsNotMet", FailIfRequirementsNotMet);
1429+
1430+
const bool SkipUnsupported = !FailIfRequirementsNotMet;
14241431
createDevice(&D3DDevice, ExecTestUtils::D3D_SHADER_MODEL_6_9,
14251432
SkipUnsupported);
14261433
}

0 commit comments

Comments
 (0)