[Lldb-commits] [lldb] r198961 - Fixed the connect remote test.

[Greg Clayton]

Author: gclayton
Date: Fri Jan 10 16:21:12 2014
New Revision: 198961

URL: http://llvm.org/viewvc/llvm-project?rev=198961&view=rev
Log:
Fixed the connect remote test.


Modified:
    lldb/trunk/test/functionalities/connect_remote/EchoServer.py
    lldb/trunk/test/functionalities/connect_remote/TestConnectRemote.py

Modified: lldb/trunk/test/functionalities/connect_remote/EchoServer.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/connect_remote/EchoServer.py?rev=198961&r1=198960&r2=198961&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/connect_remote/EchoServer.py (original)
+++ lldb/trunk/test/functionalities/connect_remote/EchoServer.py Fri Jan 10 16:21:12 2014
@@ -17,7 +17,11 @@ conn, addr = s.accept()
 print 'Connected by', addr
 while 1:
     data = conn.recv(1024)
-    if not data: break
-    conn.send(data)
-    print 'Received:', data
+    if data: 
+        print 'Received:', data
+        # Don't response to acks that are sent to us
+        if data != '+':
+            conn.send("+$#00")
+    else:
+        break
 conn.close()

Modified: lldb/trunk/test/functionalities/connect_remote/TestConnectRemote.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/connect_remote/TestConnectRemote.py?rev=198961&r1=198960&r2=198961&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/connect_remote/TestConnectRemote.py (original)
+++ lldb/trunk/test/functionalities/connect_remote/TestConnectRemote.py Fri Jan 10 16:21:12 2014
@@ -32,10 +32,7 @@ class ConnectRemoteTestCase(TestBase):
         fakeserver.expect_exact('Listening on localhost:12345')
 
         # Connect to the fake server....
-        if sys.platform.startswith('freebsd') or sys.platform.startswith("linux"):
-            self.runCmd("process connect -p gdb-remote connect://localhost:12345")
-        else:
-            self.runCmd("process connect connect://localhost:12345")
+        self.runCmd("process connect -p gdb-remote connect://localhost:12345")
 
 
 if __name__ == '__main__':