Author: Pavel Labath Date: 2021-01-19T11:01:07+01:00 New Revision: 079e664661770a78e30c0d27a12d50047f1b1ea8
URL: https://github.com/llvm/llvm-project/commit/079e664661770a78e30c0d27a12d50047f1b1ea8 DIFF: https://github.com/llvm/llvm-project/commit/079e664661770a78e30c0d27a12d50047f1b1ea8.diff LOG: [lldb] Re-enable TestPlatformProcessConnect on macos The test couldn't find lldb-server as it's path was being overridden by LLDB_DEBUGSERVER_PATH environment variable (pointing to debugserver). This test should always use lldb-server, as it tests its platform capabilities. There's no need for the environment override, as lldb-server tests should test the executable they just built, so I just remote the override capability. Added: Modified: lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py index 07136108b2a4..d16549420a14 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py @@ -72,9 +72,6 @@ def get_lldb_server_exe(): A path to the lldb-server exe if it is found to exist; otherwise, returns None. """ - if "LLDB_DEBUGSERVER_PATH" in os.environ: - return os.environ["LLDB_DEBUGSERVER_PATH"] - return _get_debug_monitor_from_lldb( lldbtest_config.lldbExec, "lldb-server") diff --git a/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py b/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py index 8ddab260b494..3607c49c9c97 100644 --- a/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py +++ b/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py @@ -11,7 +11,6 @@ class TestPlatformProcessConnect(gdbremote_testcase.GdbRemoteTestCaseBase): @skipIfRemote @expectedFailureAll(hostoslist=["windows"], triple='.*-android') @skipIfWindows # lldb-server does not terminate correctly - @skipIfDarwin # lldb-server not found correctly def test_platform_process_connect(self): self.build() _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
