Author: Charles Zablit Date: 2025-06-17T11:52:03-05:00 New Revision: 556e69b7f4328a0d7c36c9d7ca0dd8f52f82ad71
URL: https://github.com/llvm/llvm-project/commit/556e69b7f4328a0d7c36c9d7ca0dd8f52f82ad71 DIFF: https://github.com/llvm/llvm-project/commit/556e69b7f4328a0d7c36c9d7ca0dd8f52f82ad71.diff LOG: [lldb] make lit use the same Python executable for building and testing (#143756) When testing LLDB, we want to make sure to use the same Python as the one we used to build it. This patch uses the CMake variable `Python3_ROOT_DIR` to add the correct Python to the `PATH` in LLDB lit tests, in order to ensure of this. Please see https://github.com/swiftlang/swift/pull/82063 for the original issue. This is a continuation of https://github.com/swiftlang/swift/pull/82063. Added: Modified: lldb/cmake/modules/FindPythonAndSwig.cmake lldb/test/API/lit.cfg.py lldb/test/API/lit.site.cfg.py.in lldb/test/Shell/lit.cfg.py Removed: ################################################################################ diff --git a/lldb/cmake/modules/FindPythonAndSwig.cmake b/lldb/cmake/modules/FindPythonAndSwig.cmake index 1f6f553e86048..b478038f144d9 100644 --- a/lldb/cmake/modules/FindPythonAndSwig.cmake +++ b/lldb/cmake/modules/FindPythonAndSwig.cmake @@ -6,7 +6,9 @@ macro(FindPython3) # Use PYTHON_HOME as a hint to find Python 3. - set(Python3_ROOT_DIR "${PYTHON_HOME}") + if(NOT Python3_ROOT_DIR) + set(Python3_ROOT_DIR "${PYTHON_HOME}") + endif() find_package(Python3 COMPONENTS Interpreter Development) if(Python3_FOUND AND Python3_Interpreter_FOUND) diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py index 646a446c86fdb..83713213ce1fe 100644 --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -349,3 +349,10 @@ def delete_module_cache(path): for v in ["SystemDrive"]: if v in os.environ: config.environment[v] = os.environ[v] + +# Some steps required to initialize the tests dynamically link with python.dll +# and need to know the location of the Python libraries. This ensures that we +# use the same version of Python that was used to build lldb to run our tests. +config.environment["PATH"] = os.path.pathsep.join( + (config.python_root_dir, config.environment.get("PATH", "")) +) diff --git a/lldb/test/API/lit.site.cfg.py.in b/lldb/test/API/lit.site.cfg.py.in index 8552d17d66631..86d58889cc4ad 100644 --- a/lldb/test/API/lit.site.cfg.py.in +++ b/lldb/test/API/lit.site.cfg.py.in @@ -20,6 +20,7 @@ config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@" config.target_triple = "@LLVM_TARGET_TRIPLE@" config.lldb_build_directory = "@LLDB_TEST_BUILD_DIRECTORY@" config.python_executable = "@LLDB_PYTHON_API_TEST_EXECUTABLE@" +config.python_root_dir = "@Python3_ROOT_DIR@" config.lua_executable = "@LUA_EXECUTABLE@" config.lldb_lua_cpath = "@LLDB_LUA_CPATH@" config.lua_test_entry = "TestLuaAPI.py" diff --git a/lldb/test/Shell/lit.cfg.py b/lldb/test/Shell/lit.cfg.py index ab6113767187a..8c9448b23c56b 100644 --- a/lldb/test/Shell/lit.cfg.py +++ b/lldb/test/Shell/lit.cfg.py @@ -203,3 +203,6 @@ def calculate_arch_features(arch_string): # location of the Python libraries. This ensures that we use the same # version of Python that was used to build lldb to run our tests. config.environment["PYTHONHOME"] = config.python_root_dir +config.environment["PATH"] = os.path.pathsep.join( + (config.python_root_dir, config.environment.get("PATH", "")) +) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
