[Lldb-commits] [PATCH] D79519: [lldb/Test] Run dotest.py with the Python LLDB was built with

[Jonas Devlieghere via Phabricator via lldb-commits]

JDevlieghere created this revision.
JDevlieghere added reviewers: labath, aprantl, teemperor, mib.
Herald added a subscriber: abidh.

The Python used to run lit can be different from the Python LLDB was build with. One scenario where this happens is when LLVM can find the Python 3 interpreter, but not the Python 3 libraries, in which case LLDB build and links against Python 3. Without this change, you end up with an `ModuleNotFoundError` because of the mismatch.

Instead of looking at the Python interpreter that's used to run lit, we should use the interpreter that matches the Python version LLDB was build against.


Repository:
  rLLDB LLDB

https://reviews.llvm.org/D79519

Files:
  lldb/test/API/lldbtest.py


Index: lldb/test/API/lldbtest.py
===================================================================
--- lldb/test/API/lldbtest.py
+++ lldb/test/API/lldbtest.py
@@ -62,10 +62,15 @@
             return (lit.Test.UNSUPPORTED, 'Test is unsupported')
 
         testPath, testFile = os.path.split(test.getSourcePath())
+
+        # The Python used to run lit can be different from the Python LLDB was
+        # build with.
+        executable = test.config.python_executable
+
         # On Windows, the system does not always correctly interpret
         # shebang lines.  To make sure we can execute the tests, add
         # python exe as the first parameter of the command.
-        cmd = [sys.executable] + self.dotest_cmd + [testPath, '-p', testFile]
+        cmd = [executable] + self.dotest_cmd + [testPath, '-p', testFile]
 
         builddir = getBuildDir(cmd)
         mkdir_p(builddir)
@@ -74,13 +79,13 @@
         # libraries into system binaries, but this can be worked around by
         # copying the binary into a different location.
         if 'DYLD_INSERT_LIBRARIES' in test.config.environment and \
-                (sys.executable.startswith('/System/') or \
-                sys.executable.startswith('/usr/bin/')):
+                (executable.startswith('/System/') or \
+                executable.startswith('/usr/bin/')):
             copied_python = os.path.join(builddir, 'copied-system-python')
             if not os.path.isfile(copied_python):
                 import shutil, subprocess
                 python = subprocess.check_output([
-                    sys.executable,
+                    executable,
                     '-c',
                     'import sys; print(sys.executable)'
                 ]).decode('utf-8').strip()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D79519.262470.patch
Type: text/x-patch
Size: 1767 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20200506/48768e70/attachment.bin>