[llvm-branch-commits] [lldb] 599fdfc - Revert "[lldb] Re-enable TestPlatformProcessConnect on macos"

[Pavel Labath via llvm-branch-commits]

Author: Pavel Labath
Date: 2021-01-20T20:49:03+01:00
New Revision: 599fdfc5db8f44582ee9bd05544769268ec9b4a3

URL: https://github.com/llvm/llvm-project/commit/599fdfc5db8f44582ee9bd05544769268ec9b4a3
DIFF: https://github.com/llvm/llvm-project/commit/599fdfc5db8f44582ee9bd05544769268ec9b4a3.diff

LOG: Revert "[lldb] Re-enable TestPlatformProcessConnect on macos"

This reverts commit 079e664661770a78e30c0d27a12d50047f1b1ea8. It needs
more work.

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 d16549420a14..07136108b2a4 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
@@ -72,6 +72,9 @@ 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 3607c49c9c97..8ddab260b494 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,6 +11,7 @@ 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()