Skip to content

Commit 989483c

Browse files
committed
[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. (cherry picked from commit 99298c7)
1 parent e3400af commit 989483c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import socket_packet_pump
1313
import subprocess
1414
from lldbsuite.test.lldbtest import *
15+
from lldbsuite.test import configuration
1516

1617
from six.moves import queue
1718

@@ -89,6 +90,10 @@ def get_debugserver_exe():
8990
if "LLDB_DEBUGSERVER_PATH" in os.environ:
9091
return os.environ["LLDB_DEBUGSERVER_PATH"]
9192

93+
if configuration.arch and configuration.arch == "x86_64" and \
94+
platform.machine().startswith("arm64"):
95+
return '/Library/Apple/usr/libexec/oah/debugserver'
96+
9297
return _get_debug_monitor_from_lldb(
9398
lldbtest_config.lldbExec, "debugserver")
9499

0 commit comments

Comments
 (0)