Changeset 215109 in webkit

Timestamp:

Apr 7, 2017, 12:07:33 PM (8 years ago)

Author:

Jonathan Bedard

Message:

REGRESSION (r214553): Allow layout-tests to be run from Xcode without re-directing stdout, stdin and stderr
​https://bugs.webkit.org/show_bug.cgi?id=170601
<rdar://problem/31492696>

Reviewed by Simon Fraser.

• TestRunnerShared/IOSLayoutTestCommunication.cpp:

(setUpIOSLayoutTestCommunication): Skip TCP setup if no port is in the environment.
(tearDownIOSLayoutTestCommunication): Only teardown if TCP was used.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestRunnerShared/IOSLayoutTestCommunication.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-04-07  Jonathan Bedard  <jbedard@apple.com>
+
+        REGRESSION (r214553): Allow layout-tests to be run from Xcode without re-directing stdout, stdin and stderr
+        https://bugs.webkit.org/show_bug.cgi?id=170601
+        <rdar://problem/31492696>
+
+        Reviewed by Simon Fraser.
+
+        * TestRunnerShared/IOSLayoutTestCommunication.cpp:
+        (setUpIOSLayoutTestCommunication): Skip TCP setup if no port is in the environment.
+        (tearDownIOSLayoutTestCommunication): Only teardown if TCP was used.
+
 2017-04-07  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/TestRunnerShared/IOSLayoutTestCommunication.cpp

@@ -37 +37 @@
 static int stdoutSocket;
 static int stderrSocket;
+static bool isUsingTCP = false;
 
 static int connectToServer(sockaddr_in& serverAddress)
@@ -48 +49 @@
 void setUpIOSLayoutTestCommunication()
 {
-    int port = atoi(getenv("PORT"));
+    char* portFromEnvironment = getenv("PORT");
+    if (!portFromEnvironment)
+        return;
+    int port = atoi(portFromEnvironment);
     RELEASE_ASSERT(port > 0);
+    isUsingTCP = true;
 
     struct hostent* host = gethostbyname("127.0.0.1");
@@ -74 +79 @@
 void tearDownIOSLayoutTestCommunication()
 {
+    if (!isUsingTCP)
+        return;
     close(stdinSocket);
     close(stdoutSocket);