Skip to content

Commit 047f91e

Browse files
[XRay] Run tests inside bootstrapping build
COMPILER_RT_STANDALONE_BUILD is set when doing a bootstrapping build through LLVM_ENABLE_RUNTIMES with the CMake source directory being in llvm/. This patch changes the XRay tests to also detect that we have LLVM sources and the llvm-xray tool if we are in a bootstrapping build through the use of the LLVM_TREE_AVAILABLE variable which is set in runtimes/CMakeLists.txt.
1 parent e70e9ec commit 047f91e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

compiler-rt/test/xray/lit.site.cfg.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ config.name_suffix = "@XRAY_TEST_CONFIG_SUFFIX@"
55
config.xray_lit_source_dir = "@XRAY_LIT_SOURCE_DIR@"
66
config.target_cflags = "@XRAY_TEST_TARGET_CFLAGS@"
77
config.target_arch = "@XRAY_TEST_TARGET_ARCH@"
8-
config.built_with_llvm = ("@COMPILER_RT_STANDALONE_BUILD@" != "TRUE")
8+
config.built_with_llvm = ("@COMPILER_RT_STANDALONE_BUILD AND NOT LLVM_TREE_AVAILABLE@" != "TRUE")
99

1010
# TODO: Look into whether we can run a capability test on the standalone build to
1111
# see whether it can run 'llvm-xray convert' instead of turning off tests for a

0 commit comments

Comments
 (0)