Skip to content

Commit

Permalink
Enable some tests on non-Windows (#5549)
Browse files Browse the repository at this point in the history
These tests all build and pass on non-Windows platforms, so we should
run them there too.
  • Loading branch information
llvm-beanz authored Aug 15, 2023
1 parent 756125c commit 15d086f
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 10 deletions.
2 changes: 0 additions & 2 deletions tools/clang/unittests/HLSL/DxilContainerTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,6 @@ bool DxilContainerTest::InitSupport() {
return true;
}

#ifdef _WIN32 // - No reflection support
TEST_F(DxilContainerTest, CompileWhenDebugSourceThenSourceMatters) {
char program1[] = "float4 main() : SV_Target { return 0; }";
char program2[] = " float4 main() : SV_Target { return 0; } ";
Expand Down Expand Up @@ -661,7 +660,6 @@ TEST_F(DxilContainerTest, CompileWhenDebugSourceThenSourceMatters) {
// Source hash and bin hash should be different
VERIFY_IS_FALSE(0 == strcmp(binHash1Zss.c_str(), binHash1.c_str()));
}
#endif // WIN32 - No reflection support

TEST_F(DxilContainerTest, ContainerBuilder_AddPrivateForceLast) {
if (m_ver.SkipDxilVersion(1, 7)) return;
Expand Down
2 changes: 0 additions & 2 deletions tools/clang/unittests/HLSL/FunctionTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ class FunctionTest : public ::testing::Test {
CComPtr<IDxcBlob> pContainer;

VERIFY_SUCCEEDED(pResult->GetResult(&pContainer));
#ifdef _WIN32 // No reflection support
VERIFY_SUCCEEDED(m_support.CreateInstance(CLSID_DxcContainerReflection, &pReflection));
VERIFY_SUCCEEDED(pReflection->Load(pContainer));
UINT count;
Expand All @@ -114,7 +113,6 @@ class FunctionTest : public ::testing::Test {
}
}
VERIFY_IS_TRUE(found);
#endif // _WIN32 - No reflection support
}
}

Expand Down
6 changes: 0 additions & 6 deletions tools/clang/unittests/HLSLTestLib/FileCheckerTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,7 @@ FileRunCommandResult FileRunCommandPart::Run(dxc::DxcDllSupport &DllSupport, con
return RunDxr(DllSupport, Prior);
}
else if (0 == _stricmp(Command.c_str(), "%dxl")) {
#ifdef _WIN32 // Linking unsupported
return RunLink(DllSupport, Prior);
#else
FileRunCommandResult result = FileRunCommandResult::Success("Can't run dxl on non-windows, so just assuming success");
result.AbortPipeline = true;
return result;
#endif // WIN32 - Linking unsupported
}
else if (pPluginToolsPaths != nullptr) {
auto it = pPluginToolsPaths->find(Command.c_str());
Expand Down

0 comments on commit 15d086f

Please sign in to comment.