Title: [174702] trunk/Tools
- Revision
- 174702
- Author
- [email protected]
- Date
- 2014-10-14 14:33:55 -0700 (Tue, 14 Oct 2014)
Log Message
[Mac] DRT stderr logging after the test completes gets attributed to the next test
Reviewed by Alexey Proskuryakov.
DRT would send "#EOF" to stderr just after doing so to stdout, which cause any later
logging to stderr to get associated with the next test.
Fix by logging #EOF to stderr later, after we've completely finished with this test.
* DumpRenderTree/mac/DumpRenderTree.mm:
(dumpTestResults):
(runTest):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (174701 => 174702)
--- trunk/Tools/ChangeLog 2014-10-14 21:33:53 UTC (rev 174701)
+++ trunk/Tools/ChangeLog 2014-10-14 21:33:55 UTC (rev 174702)
@@ -1,3 +1,18 @@
+2014-10-14 Simon Fraser <[email protected]>
+
+ [Mac] DRT stderr logging after the test completes gets attributed to the next test
+
+ Reviewed by Alexey Proskuryakov.
+
+ DRT would send "#EOF" to stderr just after doing so to stdout, which cause any later
+ logging to stderr to get associated with the next test.
+
+ Fix by logging #EOF to stderr later, after we've completely finished with this test.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (dumpTestResults):
+ (runTest):
+
2014-10-14 Brent Fulgham <[email protected]>
[Win] Unreviewed gardening. Ignore Visual Studio *.sdf temporary files.
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (174701 => 174702)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-10-14 21:33:53 UTC (rev 174701)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-10-14 21:33:55 UTC (rev 174702)
@@ -1644,10 +1644,8 @@
// This is a speculative fix for: https://bugs.webkit.org/show_bug.cgi?id=32339
invalidateAnyPreviousWaitToDumpWatchdog();
- if (printSeparators) {
+ if (printSeparators)
puts("#EOF"); // terminate the content block
- fputs("#EOF\n", stderr);
- }
}
if (dumpPixelsForCurrentTest && gTestRunner->generatePixelResults())
@@ -1655,9 +1653,7 @@
dumpWebViewAsPixelsAndCompareWithExpected(gTestRunner->expectedPixelHash());
puts("#EOF"); // terminate the (possibly empty) pixels block
-
fflush(stdout);
- fflush(stderr);
done = YES;
CFRunLoopStop(CFRunLoopGetMain());
@@ -1933,6 +1929,9 @@
if (gcBetweenTests)
[WebCoreStatistics garbageCollectJavaScriptObjects];
+
+ fputs("#EOF\n", stderr);
+ fflush(stderr);
}
void displayWebView()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
