Index: lldb/trunk/test/dotest.py
===================================================================
--- lldb/trunk/test/dotest.py
+++ lldb/trunk/test/dotest.py
@@ -1334,14 +1334,17 @@
     if lldb_platform_url:
         # We must connect to a remote platform if a LLDB platform URL was specified
         print "Connecting to remote platform '%s' at '%s'..." % (lldb_platform_name, lldb_platform_url)
-        platform_connect_options = lldb.SBPlatformConnectOptions(lldb_platform_url); 
+        lldb.platfrom_url = lldb_platform_url
+        platform_connect_options = lldb.SBPlatformConnectOptions(lldb_platform_url)
         err = lldb.remote_platform.ConnectRemote(platform_connect_options)
         if err.Success():
             print "Connected."
         else:
             print "error: failed to connect to remote platform using URL '%s': %s" % (lldb_platform_url, err)
             exitTestSuite(1)
-    
+    else:
+        lldb.platfrom_url = None
+
     if lldb_platform_working_dir:
         print "Setting remote platform working directory to '%s'..." % (lldb_platform_working_dir)
         lldb.remote_platform.SetWorkingDirectory(lldb_platform_working_dir)
@@ -1351,6 +1354,7 @@
 else:
     lldb.remote_platform = None
     lldb.remote_platform_working_dir = None
+    lldb.platfrom_url = None
 
 target_platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]
 
Index: lldb/trunk/test/tools/lldb-server/gdbremote_testcase.py
===================================================================
--- lldb/trunk/test/tools/lldb-server/gdbremote_testcase.py
+++ lldb/trunk/test/tools/lldb-server/gdbremote_testcase.py
@@ -60,7 +60,10 @@
         self.named_pipe = None
         self.named_pipe_fd = None
         self.stub_sends_two_stop_notifications_on_kill = False
-        self.stub_hostname = "localhost"
+        if lldb.platfrom_url:
+            self.stub_hostname = re.match(".*://(.*):[0-9]+", lldb.platfrom_url).group(1)
+        else:
+            self.stub_hostname = "localhost"
 
     def get_next_port(self):
         return 12000 + random.randint(0,3999)
@@ -184,6 +187,13 @@
         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")
+
+        connect_info = (self.stub_hostname, self.port)
+        sock.connect(connect_info)
+
         def shutdown_socket():
             if sock:
                 try:
@@ -199,14 +209,6 @@
 
         self.addTearDownHook(shutdown_socket)
 
-        triple = self.dbg.GetSelectedPlatform().GetTriple()
-        if re.match(".*-.*-.*-android", triple):
-            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):
@@ -219,7 +221,11 @@
         self._inferior_startup = self._STARTUP_ATTACH_MANUALLY
 
     def get_debug_monitor_command_line_args(self, attach_pid=None):
-        commandline_args = self.debug_monitor_extra_args + ["localhost:{}".format(self.port)]
+        if lldb.remote_platform:
+            commandline_args = self.debug_monitor_extra_args + ["*:{}".format(self.port)]
+        else:
+            commandline_args = self.debug_monitor_extra_args + ["localhost:{}".format(self.port)]
+
         if attach_pid:
             commandline_args += ["--attach=%d" % attach_pid]
         if self.named_pipe_path:
@@ -284,16 +290,23 @@
                     logger.warning("failed to terminate server for debug monitor: {}; ignoring".format(sys.exc_info()[0]))
             self.addTearDownHook(shutdown_debug_monitor)
 
-            # Create a socket to talk to the server
-            try:
-                self.sock = self.create_socket()
-                return server
-            except socket.error as serr:
-                # We're only trying to handle connection refused.
-                if serr.errno != errno.ECONNREFUSED:
-                    raise serr
-                # We should close the server here to be safe.
-                server.terminate()
+            connect_attemps = 0
+            MAX_CONNECT_ATTEMPTS = 10
+
+            while connect_attemps < MAX_CONNECT_ATTEMPTS:
+                # Create a socket to talk to the server
+                try:
+                    self.sock = self.create_socket()
+                    return server
+                except socket.error as serr:
+                    # We're only trying to handle connection refused.
+                    if serr.errno != errno.ECONNREFUSED:
+                        raise serr
+                time.sleep(0.5)
+                connect_attemps += 1
+
+            # We should close the server here to be safe.
+            server.terminate()
 
             # Increment attempts.
             print("connect to debug monitor on port %d failed, attempt #%d of %d" % (self.port, attempts + 1, MAX_ATTEMPTS))