summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Devlieghere <jonas@devlieghere.com>2019-11-08 09:06:39 -0800
committerJonas Devlieghere <jonas@devlieghere.com>2019-11-08 09:08:27 -0800
commit6b44a41fefc7a62a5024c64fb7453f5ee93f3bb6 (patch)
treecf83290f56460569556d26da8f23e2b395502a3f
parent9e48a946b7b5cb90690bbeb196b185eda2fd8982 (diff)
downloadbcm5719-llvm-6b44a41fefc7a62a5024c64fb7453f5ee93f3bb6.tar.gz
bcm5719-llvm-6b44a41fefc7a62a5024c64fb7453f5ee93f3bb6.zip
[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.
-rw-r--r--lldb/test/API/lldbtest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/test/API/lldbtest.py b/lldb/test/API/lldbtest.py
index 99eb1457259..a12544c7cbc 100644
--- a/lldb/test/API/lldbtest.py
+++ b/lldb/test/API/lldbtest.py
@@ -72,7 +72,7 @@ class LLDBTest(TestFormat):
# 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/')):
+ sys.executable.startswith('/usr/bin/')):
builddir = getBuildDir(cmd)
mkdir_p(builddir)
copied_python = os.path.join(builddir, 'copied-system-python')
OpenPOWER on IntegriCloud