Fix adb forward in gdbremote_testcase to support multiple devices.

[chaoren]

Summary

Update to D9510.

[ovyalov]

LGTM

[chying]

There's a call to function forward_adb_port in test/tools/lldb-server/commandline/TestStubReverseConnect.py, since you added one more argument, I think you should change it from there as well, or make the new argument optional.

[chaoren]

In D9542#168402, @chying wrote:

There's a call to function forward_adb_port in test/tools/lldb-server/commandline/TestStubReverseConnect.py, since you added one more argument, I think you should change it from there as well, or make the new argument optional.

Done.

test/tools/lldb-server/gdbremote_testcase.py

def setUp(self):
         self.set_inferior_startup_launch()
         self.port = self.get_next_port()
         self.named_pipe_path = None
         self.named_pipe = None
         self.named_pipe_fd = None
         self.stub_sends_two_stop_notifications_on_kill = False
         if lldb.platform_url:
             scheme, host = re.match('(.+)://(.+):\d+', lldb.platform_url).groups()
-            self.stub_hostname = 'localhost' if scheme == 'adb' else host
+            if scheme == 'adb':
+                self.stub_device = host
+                self.stub_hostname = 'localhost'
+            else:
+                self.stub_device = None
+                self.stub_hostname = host
         else:
             self.stub_hostname = "localhost"
 
     def get_next_port(self):
         return 12000 + random.randint(0,3999)
 
     def reset_test_sequence(self):
         self.test_sequence = GdbRemoteTestSequence(self.logger)
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 forward_adb_port(self, source, target, direction, device):
+        adb = [ 'adb' ] + ([ '-s', device ] if device else []) + [ direction ]
         def remove_port_forward():
-            subprocess.call(["adb", direction, "--remove", "tcp:%d" % source])
-        
-        subprocess.call(["adb", direction, "tcp:%d" % source, "tcp:%d" % target])
+            subprocess.call(adb + [ "--remove", "tcp:%d" % source])
+        subprocess.call(adb + [ "tcp:%d" % source, "tcp:%d" % target])
         self.addTearDownHook(remove_port_forward)
 
     def create_socket(self):
         sock = socket.socket()
         logger = self.logger
 
         triple = self.dbg.GetSelectedPlatform().GetTriple()
         if re.match(".*-.*-.*-android", triple):
-            self.forward_adb_port(self.port, self.port, "forward")
+            self.forward_adb_port(self.port, self.port, "forward", self.stub_device)
 
         connect_info = (self.stub_hostname, self.port)
         sock.connect(connect_info)
 
         def shutdown_socket():
             if sock:
                 try:
                     # send the kill packet so lldb-server shuts down gracefully