Commit 45f97950 authored by Michał Górny's avatar Michał Górny
Browse files

[lldb] [test] Terminate "process connect" connections via kill 

Fix the termination of "process connect" (and "gdb-remote") to kill
the process rather than attempting to disconnect the platform.
The latter only results in an error since we did not use "platform
connect", and apparently process-level connections (at least via
gdb-remote) do not really support disconnecting.

Differential Revision: https://reviews.llvm.org/D110996
parent 14bcd8bf

lldb/test/API/functionalities/gdb_remote_client/TestProcessConnect.py

+8 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class TestProcessConnect(GDBRemoteTestBase): 
            self.expect("gdb-remote " + self.server.get_connect_address(),

                        substrs=['Process', 'stopped'])

        finally:

            self.dbg.GetSelectedPlatform().DisconnectRemote()

            self.dbg.GetSelectedTarget().GetProcess().Kill()



    def test_gdb_remote_async(self):

        """Test the gdb-remote command in asynchronous mode"""
@@ -30,7 +30,9 @@ class TestProcessConnect(GDBRemoteTestBase): 
            lldbutil.expect_state_changes(self, self.dbg.GetListener(),

                                          self.process(), [lldb.eStateStopped])

        finally:

            self.dbg.GetSelectedPlatform().DisconnectRemote()

            self.dbg.GetSelectedTarget().GetProcess().Kill()

        lldbutil.expect_state_changes(self, self.dbg.GetListener(),

                                      self.process(), [lldb.eStateExited])



    @skipIfWindows

    def test_process_connect_sync(self):
@@ -42,7 +44,7 @@ class TestProcessConnect(GDBRemoteTestBase): 
            self.expect("process connect " + self.server.get_connect_url(),

                        substrs=['Process', 'stopped'])

        finally:

            self.dbg.GetSelectedPlatform().DisconnectRemote()

            self.dbg.GetSelectedTarget().GetProcess().Kill()



    @skipIfWindows

    def test_process_connect_async(self):
@@ -57,4 +59,6 @@ class TestProcessConnect(GDBRemoteTestBase): 
            lldbutil.expect_state_changes(self, self.dbg.GetListener(),

                                          self.process(), [lldb.eStateStopped])

        finally:

            self.dbg.GetSelectedPlatform().DisconnectRemote()
 
            self.dbg.GetSelectedTarget().GetProcess().Kill()

        lldbutil.expect_state_changes(self, self.dbg.GetListener(),

                                      self.process(), [lldb.eStateExited])

lldb/test/API/functionalities/gdb_remote_client/TestPty.py

+4 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class TestPty(GDBRemoteTestBase): 
            self.expect("process connect " + self.server.get_connect_url(),

                        substrs=['Process', 'stopped'])

        finally:

            self.dbg.GetSelectedPlatform().DisconnectRemote()

            self.dbg.GetSelectedTarget().GetProcess().Kill()



    def test_process_connect_async(self):

        """Test the process connect command in asynchronous mode"""
@@ -32,4 +32,6 @@ class TestPty(GDBRemoteTestBase): 
            lldbutil.expect_state_changes(self, self.dbg.GetListener(),

                                          self.process(), [lldb.eStateStopped])

        finally:

            self.dbg.GetSelectedPlatform().DisconnectRemote()
 
            self.dbg.GetSelectedTarget().GetProcess().Kill()

        lldbutil.expect_state_changes(self, self.dbg.GetListener(),

                                      self.process(), [lldb.eStateExited])