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

[davide]

Summary

Now that there are two implementations of debugserver, one for native and the other for Rosetta [on Apple Silicon], this is needed.

[aprantl]

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

366

Does this have any surprising interplay with the existing LLDB_USE_SYSTEM_DEBUGSERVER cmake flag?

[davide]

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

366

I don't think so?

[aprantl]

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

366

Great. The name made it sound dangerous!

[vsk]

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

366

This actually gets rid of some surprising interplay between --server and --out-of-tree-debugserver.

That surprising situation arises due to the fact that the Rosetta debugserver is not built as part of lldb. I.e. when we need to run tests on Apple Silicon under x86_64 emulation, we still build debugserver as arm64 (if at all).

Now, at some point, it was common practice for lldb-dotest to always set --server to path/to/native/build/debugserver: this would break testing under Rosetta emulation, because the arm64 debugserver couldn't interoperate with the emulator.

So that's why it was necessary to prevent --server and --out-of-tree-debugserver from both being in effect at the same time.

366

Now that I think about this a bit more, it could be a good idea to log a warning when args.out_of_tree_debugserver and args.server are both set.

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

if args.executable:
         if not is_exe(lldbtest_config.lldbExec):
             lldbtest_config.lldbExec = which(args.executable)
         if not is_exe(lldbtest_config.lldbExec):
             logging.error(
                     '%s is not a valid executable to test; aborting...',
                     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:
         for excl_file in args.excluded:
             parseExclusion(excl_file)
 
     if args.p:
         if args.p.startswith('-'):