diff options
| author | Pavel Labath <pavel@labath.sk> | 2021-02-04 20:53:15 +0100 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2021-02-21 20:47:47 +0100 |
| commit | 3ca7b2d03cce16aebfbacc33bd351c8272c38f50 (patch) | |
| tree | 12c3f71b270903af2d280ccaa476f0365f8e46a3 /lldb/utils | |
| parent | 1a6c1ac6862a10c2484ea2880ea9b67ad8b9c144 (diff) | |
| download | llvm-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/utils')
| -rw-r--r-- | lldb/utils/lldb-dotest/CMakeLists.txt | 1 | ||||
| -rwxr-xr-x | lldb/utils/lldb-dotest/lldb-dotest.in | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index 979722e..5b752283 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -19,7 +19,6 @@ set(vars LLDB_TEST_EXECUTABLE LLDB_TEST_COMPILER LLDB_TEST_DSYMUTIL - LLDB_TEST_SERVER LLDB_LIBS_DIR LLVM_TOOLS_DIR ) diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in index 580b97a..f6b5e0d 100755 --- a/lldb/utils/lldb-dotest/lldb-dotest.in +++ b/lldb/utils/lldb-dotest/lldb-dotest.in @@ -8,7 +8,6 @@ arch = '@LLDB_TEST_ARCH@' executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@' compiler = '@LLDB_TEST_COMPILER_CONFIGURED@' dsymutil = '@LLDB_TEST_DSYMUTIL_CONFIGURED@' -server = '@LLDB_TEST_SERVER_CONFIGURED@' lldb_build_dir = '@LLDB_TEST_BUILD_DIRECTORY_CONFIGURED@' lldb_build_intel_pt = "@LLDB_BUILD_INTEL_PT@" lldb_framework_dir = "@LLDB_FRAMEWORK_DIR_CONFIGURED@" @@ -28,8 +27,6 @@ if __name__ == '__main__': cmd.extend(['--dsymutil', dsymutil]) cmd.extend(['--lldb-libs-dir', lldb_libs_dir]) cmd.extend(['--llvm-tools-dir', llvm_tools_dir]) - if server: - cmd.extend(['--server', server]) if lldb_framework_dir: cmd.extend(['--framework', lldb_framework_dir]) if lldb_build_intel_pt == "1": |