[Lldb-commits] [lldb] r265392 - Fix TestPlatformProcessConnect after rL265357

[Tamas Berghammer via lldb-commits]

Author: tberghammer
Date: Tue Apr  5 08:18:08 2016
New Revision: 265392

URL: http://llvm.org/viewvc/llvm-project?rev=265392&view=rev
Log:
Fix TestPlatformProcessConnect after rL265357

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py?rev=265392&r1=265391&r2=265392&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py Tue Apr  5 08:18:08 2016
@@ -38,7 +38,11 @@ class TestPlatformProcessConnect(gdbremo
         commandline_args = ["platform", "--listen", listen_url, "--socket-file", port_file, "--", "%s/a.out" % working_dir, "foo"]
         self.spawnSubprocess(self.debug_monitor_exe, commandline_args, install_remote=False)
         self.addTearDownHook(self.cleanupSubprocesses)
-        socket_id = self.run_shell_cmd("while [ ! -f %s ]; do sleep 0.25; done && cat %s" % (port_file, port_file))
+        
+        # Wait until the port_file have been created. Doing it with 1 shell command will fail because
+        # of a bug in LLDB shell escaping code
+        _, _ = self.run_platform_command("while [ ! -f %s ]; do sleep 0.25; done" % port_file)
+        _, socket_id = self.run_platform_command("cat %s" % port_file)
 
         new_debugger = lldb.SBDebugger.Create()
         new_debugger.SetAsync(False)