From cb0eb9d8dd5a74ed33d5dd5c62686fb6342b10bc Mon Sep 17 00:00:00 2001 From: Jordan Rupprecht Date: Wed, 26 Oct 2022 12:07:22 -0700 Subject: [test] Fix LLDB tests with just-built libcxx when using a target directory. In certain configurations, libc++ headers all exist in the same directory, and libc++ binaries exist in the same directory as lldb libs. When `LLVM_ENABLE_PER_TARGET_RUNTIME_DIR` is enabled (*and* the host is not Apple, which is why I assume this wasn't caught by others?), this is not the case: most headers will exist in the usual `include/c++/v1` directory, but `__config_site` exists in `include/$TRIPLE/c++/v1`. Likewise, the libc++.so binary exists in `lib/$TRIPLE/`, not `lib/` (where LLDB libraries reside). This also adds the just-built-libcxx functionality to the lldb-dotest tool. The `LIBCXX_` cmake config is borrowed from `libcxx/CMakeLists.txt`. I could not figure out a way to share the cmake config; ideally we would reuse the same config instead of copy/paste. Reviewed By: JDevlieghere, fdeazeve Differential Revision: https://reviews.llvm.org/D133973 --- lldb/packages/Python/lldbsuite/test/configuration.py | 1 + 1 file changed, 1 insertion(+) (limited to 'lldb/packages/Python/lldbsuite/test/configuration.py') diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index 2a8d125..266d785 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -124,6 +124,7 @@ all_tests = set() lldb_libs_dir = None libcxx_include_dir = None +libcxx_include_target_dir = None libcxx_library_dir = None # A plugin whose tests will be enabled, like intel-pt. -- cgit v1.1