Author: nerix Date: 2025-09-13T09:15:52Z New Revision: b31f8cb1c9108f6b45c8929df27b61396a4ccd45
URL: https://github.com/llvm/llvm-project/commit/b31f8cb1c9108f6b45c8929df27b61396a4ccd45 DIFF: https://github.com/llvm/llvm-project/commit/b31f8cb1c9108f6b45c8929df27b61396a4ccd45.diff LOG: [LLDB] Require DIA SDK for testing the PDB plugin-selection setting (#158284) If LLDB is built without the DIA SDK enabled, then the native plugin is used regardless of `plugin.symbol-file.pdb.reader` or `LLDB_USE_NATIVE_PDB_READER`. This made the test fail on Windows when the DIA SDK was disabled (https://github.com/llvm/llvm-project/issues/114906#issuecomment-3241796062). This PR changes the requirement for the test from `target-windows` to `diasdk` (only used in this test). Added: Modified: lldb/test/CMakeLists.txt lldb/test/Shell/SymbolFile/PDB/native-setting.cpp lldb/test/Shell/lit.cfg.py lldb/test/Shell/lit.site.cfg.py.in Removed: ################################################################################ diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index 39462560c4b98..8116f4c3c823a 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -250,6 +250,7 @@ llvm_canonicalize_cmake_booleans( LLDB_ENABLE_LZMA LLVM_ENABLE_ZLIB LLVM_ENABLE_SHARED_LIBS + LLVM_ENABLE_DIA_SDK LLDB_HAS_LIBCXX LLDB_TEST_SHELL_DISABLE_REMOTE LLDB_TOOL_LLDB_SERVER_BUILD diff --git a/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp b/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp index ce188e75553c7..edf7508b88f17 100644 --- a/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp +++ b/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp @@ -1,4 +1,4 @@ -// REQUIRES: target-windows +// REQUIRES: diasdk // Test plugin.symbol-file.pdb.reader setting // RUN: %build -o %t.exe -- %s diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index 46e2117cdb8e7..505847fb763e0 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -170,6 +170,9 @@ def calculate_arch_features(arch_string): ) ) +if config.have_dia_sdk: + config.available_features.add("diasdk") + # NetBSD permits setting dbregs either if one is root # or if user_set_dbregs is enabled can_set_dbregs = True diff --git a/lldb/test/Shell/lit.site.cfg.py.in b/lldb/test/Shell/lit.site.cfg.py.in index beaa41e6fd379..47beac002a19c 100644 --- a/lldb/test/Shell/lit.site.cfg.py.in +++ b/lldb/test/Shell/lit.site.cfg.py.in @@ -34,6 +34,7 @@ config.have_lldb_server = @LLDB_TOOL_LLDB_SERVER_BUILD@ config.lldb_system_debugserver = @LLDB_USE_SYSTEM_DEBUGSERVER@ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.lldb_has_lldbrpc = @LLDB_BUILD_LLDBRPC@ +config.have_dia_sdk = @LLVM_ENABLE_DIA_SDK@ # The shell tests use their own module caches. config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-shell") config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-shell") _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
