Skip to content

Commit bfba621

Browse files
authored
[clang-linker-wrapper][lit] Fix OpenMP SPIR-V ELF test again (#126142)
I was able to reproduce the issue with the sanitizer buildbot scripts and confirmed this fixes it. The issue was the quotes, `"0"` is true in Python so we incorrectly added the `spirv-tools` feature even when the CMake variable was false. I don't know why it didn't always fail. Also add the var to clang's `BUILD.gn` which matches what we do for other similar variables, however I don't think it has any effect on CI here. Signed-off-by: Sarnie, Nick <[email protected]>
1 parent 7eaaa4e commit bfba621

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

clang/test/Tooling/clang-linker-wrapper-spirv-elf.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
// Verify the ELF packaging of OpenMP SPIR-V device images.
2-
// FIXME: Re-enable when spirv-tools feature detection fixed
3-
// UNSUPPORTED: system-linux
42
// REQUIRES: system-linux
53
// REQUIRES: spirv-tools
64
// RUN: mkdir -p %t_tmp

clang/test/lit.site.cfg.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ config.llvm_external_lit = path(r"@LLVM_EXTERNAL_LIT@")
4343
config.standalone_build = @CLANG_BUILT_STANDALONE@
4444
config.ppc_linux_default_ieeelongdouble = @PPC_LINUX_DEFAULT_IEEELONGDOUBLE@
4545
config.have_llvm_driver = @LLVM_TOOL_LLVM_DRIVER_BUILD@
46-
config.spirv_tools_tests = "@LLVM_INCLUDE_SPIRV_TOOLS_TESTS@"
46+
config.spirv_tools_tests = @LLVM_INCLUDE_SPIRV_TOOLS_TESTS@
4747
config.substitutions.append(("%llvm-version-major", "@LLVM_VERSION_MAJOR@"))
4848

4949
import lit.llvm

llvm/utils/gn/secondary/clang/test/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ write_lit_config("lit_site_cfg") {
7575
"Python3_EXECUTABLE=$python_path",
7676
"USE_Z3_SOLVER=",
7777
"PPC_LINUX_DEFAULT_IEEELONGDOUBLE=0",
78+
"LLVM_INCLUDE_SPIRV_TOOLS_TESTS=0",
7879
]
7980

8081
if (clang_enable_static_analyzer) {

0 commit comments

Comments
 (0)