aboutsummaryrefslogtreecommitdiff
path: root/lldb/packages/Python/lldbsuite/test/dotest.py
diff options
context:
space:
mode:
authorPavel Labath <pavel@labath.sk>2021-02-04 20:53:15 +0100
committerPavel Labath <pavel@labath.sk>2021-02-21 20:47:47 +0100
commit3ca7b2d03cce16aebfbacc33bd351c8272c38f50 (patch)
tree12c3f71b270903af2d280ccaa476f0365f8e46a3 /lldb/packages/Python/lldbsuite/test/dotest.py
parent1a6c1ac6862a10c2484ea2880ea9b67ad8b9c144 (diff)
downloadllvm-3ca7b2d03cce16aebfbacc33bd351c8272c38f50.zip
llvm-3ca7b2d03cce16aebfbacc33bd351c8272c38f50.tar.gz
llvm-3ca7b2d03cce16aebfbacc33bd351c8272c38f50.tar.bz2
Reapply "[lldb/test] Automatically find debug servers to test"
This reapplies 7df4eaaa93/D96202, which was reverted due to issues on windows. These were caused by problems in the computation of the liblldb directory, which was fixed by D96779. The original commit message was: Our test configuration logic assumes that the tests can be run either with debugserver or with lldb-server. This is not entirely correct, since lldb server has two "personalities" (platform server and debug server) and debugserver is only a replacement for the latter. A consequence of this is that it's not possible to test the platform behavior of lldb-server on macos, as it is not possible to get a hold of the lldb-server binary. One solution to that would be to duplicate the server configuration logic to be able to specify both executables. However, that seems excessively redundant. A well-behaved lldb should be able to find the debug server on its own, and testing lldb with a different (lldb-|debug)server does not seem very useful (even in the out-of-tree debugserver setup, we copy the server into the build tree to make it appear "real"). Therefore, this patch deletes the configuration altogether and changes the low-level server retrieval functions to be able to both lldb-server and debugserver paths. They do this by consulting the "support executable" directory of the lldb under test. Differential Revision: https://reviews.llvm.org/D96202
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/dotest.py')
-rw-r--r--lldb/packages/Python/lldbsuite/test/dotest.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 62508a1..945b3f0 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -366,12 +366,6 @@ def parseOptionsAndInitTestdirs():
args.executable)
sys.exit(-1)
- if args.server and args.out_of_tree_debugserver:
- logging.warning('Both --server and --out-of-tree-debugserver are set')
-
- 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)