[Lldb-commits] [lldb] 5832473 - Do not set LLDB_DEBUGSERVER_PATH if --out-of-tree-debugserver is passed.

[Davide Italiano via lldb-commits]

Author: Davide Italiano
Date: 2020-07-07T15:01:21-07:00
New Revision: 5832473dcf4e5b22c9eb6381fb291be92f431208

URL: https://github.com/llvm/llvm-project/commit/5832473dcf4e5b22c9eb6381fb291be92f431208
DIFF: https://github.com/llvm/llvm-project/commit/5832473dcf4e5b22c9eb6381fb291be92f431208.diff

LOG: Do not set LLDB_DEBUGSERVER_PATH if --out-of-tree-debugserver is passed.

This gets rid of some surprising interplay between the flags.
Mainly needed because of Rosetta debugserver & Apple Silicon.

Differential Revision:  https://reviews.llvm.org/D82804

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/dotest.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 2b8185a18b77..f13f445aaa9f 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -363,7 +363,7 @@ def parseOptionsAndInitTestdirs():
                     args.executable)
             sys.exit(-1)
 
-    if args.server:
+    if args.server and not args.out_of_tree_debugserver:
         os.environ['LLDB_DEBUGSERVER_PATH'] = args.server
 
     if args.excluded: