Title: [127547] trunk/Tools
- Revision
- 127547
- Author
- timothy_hor...@apple.com
- Date
- 2012-09-04 20:45:33 -0700 (Tue, 04 Sep 2012)
Log Message
Have NRWT log more output when crash logs are missing
https://bugs.webkit.org/show_bug.cgi?id=95814
Reviewed by Dan Bernstein.
Log the stderr and stdout of the test, in order to provide slightly more
context when the WebProcess times out while running tests.
* Scripts/webkitpy/layout_tests/port/driver.py:
(Driver.run_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (127546 => 127547)
--- trunk/Tools/ChangeLog 2012-09-05 03:33:40 UTC (rev 127546)
+++ trunk/Tools/ChangeLog 2012-09-05 03:45:33 UTC (rev 127547)
@@ -1,3 +1,16 @@
+2012-09-04 Tim Horton <timothy_hor...@apple.com>
+
+ Have NRWT log more output when crash logs are missing
+ https://bugs.webkit.org/show_bug.cgi?id=95814
+
+ Reviewed by Dan Bernstein.
+
+ Log the stderr and stdout of the test, in order to provide slightly more
+ context when the WebProcess times out while running tests.
+
+ * Scripts/webkitpy/layout_tests/port/driver.py:
+ (Driver.run_test):
+
2012-09-04 Xianzhu Wang <wangxian...@chromium.org>
[Chromium-Android] Include device serial number in ChromiumAndroidDriver log messages
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py (127546 => 127547)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-09-05 03:33:40 UTC (rev 127546)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-09-05 03:45:33 UTC (rev 127547)
@@ -176,11 +176,15 @@
# If we don't find a crash log use a placeholder error message instead.
if not crash_log:
pid_str = str(self._crashed_pid) if self._crashed_pid else "unknown pid"
- crash_log = 'no crash log found for %s:%s.' % (self._crashed_process_name, pid_str)
+ crash_log = 'No crash log found for %s:%s.\n' % (self._crashed_process_name, pid_str)
# If we were unresponsive append a message informing there may not have been a crash.
if self._subprocess_was_unresponsive:
- crash_log += ' Process failed to become responsive before timing out.'
+ crash_log += 'Process failed to become responsive before timing out.\n'
+ # Print stdout and stderr to the placeholder crash log; we want as much context as possible.
+ if self.error_from_test:
+ crash_log += '\nstdout:\n%s\nstderr:\n%s\n' % (text, self.error_from_test)
+
return DriverOutput(text, image, actual_image_hash, audio,
crash=crashed, test_time=time.time() - test_begin_time,
timeout=timed_out, error=self.error_from_test,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
