diff options
| -rw-r--r-- | lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py | 4 | ||||
| -rw-r--r-- | lldb/test/tools/lldb-server/gdbremote_testcase.py | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py index 8701f92c5d7..1b0ac11d1c9 100644 --- a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py +++ b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py @@ -47,6 +47,10 @@ class TestStubReverseConnect(gdbremote_testcase.GdbRemoteTestCaseBase): self.stub_hostname = "127.0.0.1" self.port = self.listener_port + triple = self.dbg.GetSelectedPlatform().GetTriple() + if re.match(".*-.*-.*-android", triple): + self.forward_adb_port(self.port, self.port, "reverse") + # Start the stub. server = self.launch_debug_monitor(logfile=sys.stdout) self.assertIsNotNone(server) diff --git a/lldb/test/tools/lldb-server/gdbremote_testcase.py b/lldb/test/tools/lldb-server/gdbremote_testcase.py index 8d769b83ed3..e4999fbf189 100644 --- a/lldb/test/tools/lldb-server/gdbremote_testcase.py +++ b/lldb/test/tools/lldb-server/gdbremote_testcase.py @@ -173,6 +173,13 @@ class GdbRemoteTestCaseBase(TestBase): # when the process truly dies. self.stub_sends_two_stop_notifications_on_kill = True + def forward_adb_port(self, source, target, direction): + def remove_port_forward(): + subprocess.call(["adb", direction, "--remove", "tcp:%d" % source]) + + subprocess.call(["adb", direction, "tcp:%d" % source, "tcp:%d" % target]) + self.addTearDownHook(remove_port_forward) + def create_socket(self): sock = socket.socket() logger = self.logger @@ -194,11 +201,7 @@ class GdbRemoteTestCaseBase(TestBase): triple = self.dbg.GetSelectedPlatform().GetTriple() if re.match(".*-.*-.*-android", triple): - subprocess.call(["adb", "forward", "tcp:%d" % self.port, "tcp:%d" % self.port]) - def remove_port_forward(): - subprocess.call(["adb", "forward", "--remove", "tcp:%d" % self.port]) - - self.addTearDownHook(remove_port_forward) + self.forward_adb_port(self.port, self.port, "forward") connect_info = (self.stub_hostname, self.port) # print "connecting to stub on {}:{}".format(connect_info[0], connect_info[1]) |
