Skip to content

Commit fc04749

Browse files
[lldb] Fix detection of existing libcxx
The CMake variable LLDB_HAS_LIBCXX is passed to `llvm_canonicalize_cmake_booleans`, which transforms TRUE/FALSE into '1'/'0'. It also transforms undefined variables to '0'. In particular, this means that the configuration script for LLDB API's test always has _some_ value for the `has_libcxx` configuration: ``` config.has_libcxx = '@LLDB_HAS_LIBCXX@' ``` When deciding whether a libcxx exist, the testing scripts would only check for the existence of `has_libcxx`, but not for its value. In other words, because `if ('0')` is true in python we always think there is a libcxx. This was caught once D132940 was merged and most tests started to use libcxx by default if `has_libcxx` is true. Prior to that, no failures were seen because only tests are marked with `@add_test_categories(["libc++"])` would require a libcxx, and these would be filtered out on builds without the libcxx target. Furthermore, the MacOS bots always build libcxx. We fix this by making `has_libcxx` a boolean (instead of a string) and by checking its value in the test configuration. Differential Revision: https://reviews.llvm.org/D133639
1 parent 4ca25c6 commit fc04749

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

lldb/test/API/lit.cfg.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,11 @@ def delete_module_cache(path):
171171
dotest_cmd += ['--env', 'LLVM_TOOLS_DIR=' + config.llvm_tools_dir]
172172

173173
# If we have a just-built libcxx, prefer it over the system one.
174-
if is_configured('has_libcxx') and platform.system() != 'Windows':
175-
if is_configured('llvm_include_dir') and is_configured('llvm_libs_dir'):
176-
dotest_cmd += ['--libcxx-include-dir', os.path.join(config.llvm_include_dir, 'c++', 'v1')]
177-
dotest_cmd += ['--libcxx-library-dir', config.llvm_libs_dir]
174+
if is_configured('has_libcxx') and config.has_libcxx:
175+
if platform.system() != 'Windows':
176+
if is_configured('llvm_include_dir') and is_configured('llvm_libs_dir'):
177+
dotest_cmd += ['--libcxx-include-dir', os.path.join(config.llvm_include_dir, 'c++', 'v1')]
178+
dotest_cmd += ['--libcxx-library-dir', config.llvm_libs_dir]
178179

179180
# Forward ASan-specific environment variables to tests, as a test may load an
180181
# ASan-ified dylib.

lldb/test/API/lit.site.cfg.py.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ config.lldb_executable = lit_config.substitute('@LLDB_TEST_EXECUTABLE@')
3131
config.test_arch = '@LLDB_TEST_ARCH@'
3232
config.test_compiler = lit_config.substitute('@LLDB_TEST_COMPILER@')
3333
config.dsymutil = lit_config.substitute('@LLDB_TEST_DSYMUTIL@')
34-
config.has_libcxx = '@LLDB_HAS_LIBCXX@'
34+
config.has_libcxx = @LLDB_HAS_LIBCXX@
3535
# The API tests use their own module caches.
3636
config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-api")
3737
config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-api")

0 commit comments

Comments
 (0)