Merge pull request #7685 from gmilos/sr-100-lit-python-search-path

Use get_python_lib to look for lldb python lib dir.

Author: alblue

test/lit.cfg

@@ -27,6 +27,7 @@ import tempfile
 import socket
 import glob
 import pipes
+from distutils.sysconfig import get_python_lib
 
 import lit
 import lit.formats
@@ -1068,3 +1069,10 @@ if os.path.exists(libswiftCore_path):
     config.available_features.add("static_stdlib")
     config.substitutions.append(('%target-static-stdlib-path', static_stdlib_path))
     lit_config.note('using static stdlib path: %s' % static_stdlib_path)
+
+if config.lldb_build_root != "":
+    config.available_features.add('lldb')
+    # Note: using the same approach to locating the lib dir as in
+    # finishSwigPythonLLDB.py in the lldb repo
+    python_lib_dir = get_python_lib(True, False, config.lldb_build_root)
+    config.substitutions.append(('%lldb-python-path', python_lib_dir))

test/lit.site.cfg.in

@@ -34,6 +34,7 @@ config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
 config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
 
 config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
+config.lldb_build_root = "@LLDB_BUILD_DIR@"
 
 if "@SWIFT_ASAN_BUILD@" == "TRUE":
     config.available_features.add("asan")
@@ -79,13 +80,6 @@ if "@CMAKE_GENERATOR@" == "Xcode":
 
 config.available_features.add("CMAKE_GENERATOR=@CMAKE_GENERATOR@")
 
-if "@LLDB_ENABLE@" == "TRUE":
-    config.available_features.add('lldb')
-    for root, dirs, files in os.walk("@LLDB_BUILD_DIR@"):
-        if root.endswith("site-packages"):
-            config.substitutions.append(('%lldb-python-path', root))
-            break
-
 # Let the main config do the real work.
 if config.test_exec_root is None:
     config.test_exec_root = os.path.dirname(os.path.realpath(__file__))

validation-test/lit.site.cfg.in

@@ -32,6 +32,7 @@ config.android_ndk_path = "@SWIFT_ANDROID_NDK_PATH@"
 config.android_ndk_gcc_version = "@SWIFT_ANDROID_NDK_GCC_VERSION@"
 
 config.coverage_mode = "@SWIFT_ANALYZE_CODE_COVERAGE@"
+config.lldb_build_root = "@LLDB_BUILD_DIR@"
 
 if "@SWIFT_ASAN_BUILD@" == "TRUE":
     config.available_features.add("asan")