Changeset 86434 in webkit

Timestamp:

May 13, 2011 8:26:45 AM (13 years ago)

Author:

zherczeg@webkit.org

Message:

2011-05-13 Zoltan Herczeg <​zherczeg@webkit.org>

Reviewed by Csaba Osztrogonác.

Missing 2nd #EOF if WebProcess is killed.
​https://bugs.webkit.org/show_bug.cgi?id=60761

If the WebProcess is killed, only one #EOF is yielded
by WebKitTestRunner. However, run-webkit-test wait for
a second #EOF, which signals the finishing of pixel dump.
Since this never happens, run-webkit-test waits forever.

• WebKitTestRunner/TestInvocation.cpp: (WTR::TestInvocation::dump): (WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
• WebKitTestRunner/TestInvocation.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestInvocation.cpp (modified) (3 diffs)
• WebKitTestRunner/TestInvocation.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-13  Zoltan Herczeg  <zherczeg@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Missing 2nd #EOF if WebProcess is killed.
+        https://bugs.webkit.org/show_bug.cgi?id=60761
+
+        If the WebProcess is killed, only one #EOF is yielded
+        by WebKitTestRunner. However, run-webkit-test wait for
+        a second #EOF, which signals the finishing of pixel dump.
+        Since this never happens, run-webkit-test waits forever.
+
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::dump):
+        (WTR::TestInvocation::didReceiveMessageFromInjectedBundle):
+        * WebKitTestRunner/TestInvocation.h:
+
 2011-05-13  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
 

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -162 +162 @@
 }
 
-void TestInvocation::dump(const char* stringToDump)
+void TestInvocation::dump(const char* stringToDump, bool singleEOF)
 {
     printf("Content-Type: text/plain\n");
@@ -169 +169 @@
     fputs("#EOF\n", stdout);
     fputs("#EOF\n", stderr);
+    if (!singleEOF)
+        fputs("#EOF\n", stdout);
     fflush(stdout);
     fflush(stderr);
@@ -208 +210 @@
 
         // Dump text.
-        dump(toSTD(textOutput).c_str());
+        dump(toSTD(textOutput).c_str(), true);
 
         // Dump pixels (if necessary).

trunk/Tools/WebKitTestRunner/TestInvocation.h

@@ -46 +46 @@
 
 private:
-    void dump(const char*);
+    void dump(const char*, bool singleEOF = false);
     void dumpPixelsAndCompareWithExpected(WKImageRef);