Forward adb port for reverse connect test cases

[tberghammer]

Summary

Forward adb port for reverse connect test cases

The test cases in TestStubReverseConnect are using a socket connection from python to lldb-server running on a remote target. To enable the socket connection an adb port forwarding have to be set up when the remote target is android.

[labath]

lgtm

test/tools/lldb-server/commandline/TestStubReverseConnect.py

def reverse_connect_works(self):
         if self.debug_monitor_extra_args:
             self.debug_monitor_extra_args += appended_stub_args
         else:
             self.debug_monitor_extra_args = appended_stub_args
 
         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)
         self.assertTrue(lldbgdbserverutils.process_is_running(server.pid, True))
 
         # Listen for the stub's connection to us.
         (stub_socket, address) = self.listener_socket.accept()
         self.assertIsNotNone(stub_socket)

test/tools/lldb-server/gdbremote_testcase.py

def init_debugserver_test(self, use_named_pipe=True):
             self.skipTest("debugserver exe not found")
         self.debug_monitor_extra_args = ["--log-file=/tmp/packets-{}.log".format(self._testMethodName), "--log-flags=0x800000"]
         if use_named_pipe:
             (self.named_pipe_path, self.named_pipe, self.named_pipe_fd) = self.create_named_pipe()
         # The debugserver stub has a race on handling the 'k' command, so it sends an X09 right away, then sends the real X notification
         # 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
 
         def shutdown_socket():
             if sock:
                 try:
                     # send the kill packet so lldb-server shuts down gracefully
                     sock.sendall(GdbRemoteTestCaseBase._GDBREMOTE_KILL_PACKET)
                 except:
                     logger.warning("failed to send kill packet to debug monitor: {}; ignoring".format(sys.exc_info()[0]))
 
                 try:
                     sock.close()
                 except:
                     logger.warning("failed to close socket to debug monitor: {}; ignoring".format(sys.exc_info()[0]))
 
         self.addTearDownHook(shutdown_socket)
 
         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])
         sock.connect(connect_info)
 
         return sock
 
     def set_inferior_startup_launch(self):