Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions tools/clang/unittests/HLSLExec/LongVectors.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1353,6 +1353,7 @@ class DxilConf_SM69_Vectorized {
TEST_CLASS_PROPERTY(
"Kits.Specification",
"Device.Graphics.D3D12.DXILCore.ShaderModel69.CoreRequirement")
TEST_METHOD_PROPERTY(L"Priority", L"0")
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, actually wondering if this is right? I tested it seems to work as I would expect. The individual methods all seem to inherit it. But seeing a TEST_METHOD_PROPERTY inside of the TEST_CLASS definition seems weird.

Did you sanity check that? Wondering if this behavior could change in the future.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take that back. It shouldn't compile if it isnt expected to work.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it looks weird, but this is how it's done in ExecutionTest.cpp. I'm not sure you'd expect a compilation error due to the way TAEF is implemented, but a runtime error maybe. Practically, it seems to apply the same property to all the methods in the class.

END_TEST_CLASS()

TEST_CLASS_SETUP(classSetup) {
Expand Down Expand Up @@ -1419,8 +1420,14 @@ class DxilConf_SM69_Vectorized {
OverrideInputSize);
}

// Only skip unsupported tests for RITP runs.
const bool SkipUnsupported = IsRITP;
bool FailIfRequirementsNotMet = false;
#ifdef _HLK_CONF
FailIsRequirementsNotMet = true;
Comment thread
damyanp marked this conversation as resolved.
Outdated
#endif
WEX::TestExecution::RuntimeParameters::TryGetValue(
L"FailIfRequirementsNotMet", FailIfRequirementsNotMet);

const bool SkipUnsupported = !FailIfRequirementsNotMet;
createDevice(&D3DDevice, ExecTestUtils::D3D_SHADER_MODEL_6_9,
SkipUnsupported);
}
Expand Down
Loading