[Lldb-commits] [lldb] 99298c7 - [lldb/testsuite] Change get_debugserver_exe to support Rosetta

[Fred Riss via lldb-commits]

Author: Fred Riss
Date: 2020-08-06T10:38:30-07:00
New Revision: 99298c7fc540c74c89c92f0e5d617e00cb87cf19

URL: https://github.com/llvm/llvm-project/commit/99298c7fc540c74c89c92f0e5d617e00cb87cf19
DIFF: https://github.com/llvm/llvm-project/commit/99298c7fc540c74c89c92f0e5d617e00cb87cf19.diff

LOG: [lldb/testsuite] Change get_debugserver_exe to support Rosetta

In order to be able to run the debugserver tests against the Rosetta
debugserver, detect the Rosetta run configuration and return the
system Rosetta debugserver.

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
index 815ba3491c1d..e0ea38c78840 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
@@ -12,6 +12,7 @@
 import socket_packet_pump
 import subprocess
 from lldbsuite.test.lldbtest import *
+from lldbsuite.test import configuration
 
 from six.moves import queue
 
@@ -89,6 +90,10 @@ def get_debugserver_exe():
     if "LLDB_DEBUGSERVER_PATH" in os.environ:
         return os.environ["LLDB_DEBUGSERVER_PATH"]
 
+    if configuration.arch and configuration.arch == "x86_64" and \
+       platform.machine().startswith("arm64"):
+        return '/Library/Apple/usr/libexec/oah/debugserver'
+
     return _get_debug_monitor_from_lldb(
         lldbtest_config.lldbExec, "debugserver")