[Lldb-commits] [lldb] 6b44a41 - [lldb] Prevent Asan/SIP workaround from affecting Python in /usr/local/bin

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2019-11-08T09:08:27-08:00
New Revision: 6b44a41fefc7a62a5024c64fb7453f5ee93f3bb6

URL: https://github.com/llvm/llvm-project/commit/6b44a41fefc7a62a5024c64fb7453f5ee93f3bb6
DIFF: https://github.com/llvm/llvm-project/commit/6b44a41fefc7a62a5024c64fb7453f5ee93f3bb6.diff

LOG: [lldb] Prevent Asan/SIP workaround from affecting Python in /usr/local/bin

The code that works around SIP was unintentionally being triggered for
/usr/local/bin/python as well. That caused trouble on GreenDragon where
we were swapping out a Python 3 executable with the system's Python 2
executable.

Added: 
    

Modified: 
    lldb/test/API/lldbtest.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/lldbtest.py b/lldb/test/API/lldbtest.py
index 99eb1457259e..a12544c7cbc6 100644
--- a/lldb/test/API/lldbtest.py
+++ b/lldb/test/API/lldbtest.py
@@ -72,7 +72,7 @@ def execute(self, test, litConfig):
         # copying the binary into a 
diff erent location.
         if 'DYLD_INSERT_LIBRARIES' in test.config.environment and \
                 (sys.executable.startswith('/System/') or \
-                sys.executable.startswith('/usr/')):
+                sys.executable.startswith('/usr/bin/')):
             builddir = getBuildDir(cmd)
             mkdir_p(builddir)
             copied_python = os.path.join(builddir, 'copied-system-python')