Title: [109056] trunk/Tools
- Revision
- 109056
- Author
- dpra...@chromium.org
- Date
- 2012-02-27 18:05:13 -0800 (Mon, 27 Feb 2012)
Log Message
nrwt: log multiline stderr/crash output properly
https://bugs.webkit.org/show_bug.cgi?id=79722
Reviewed by Adam Barth.
This cleans up some nits in the log output to make things
slightly easier to read (every line gets timestamped, etc.).
Also tweaks the log message for pixel hash mismatches.
* Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
(SingleTestRunner._handle_error):
(SingleTestRunner._compare_image):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109055 => 109056)
--- trunk/Tools/ChangeLog 2012-02-28 01:59:09 UTC (rev 109055)
+++ trunk/Tools/ChangeLog 2012-02-28 02:05:13 UTC (rev 109056)
@@ -1,3 +1,19 @@
+2012-02-27 Dirk Pranke <dpra...@chromium.org>
+
+ nrwt: log multiline stderr/crash output properly
+ https://bugs.webkit.org/show_bug.cgi?id=79722
+
+ Reviewed by Adam Barth.
+
+ This cleans up some nits in the log output to make things
+ slightly easier to read (every line gets timestamped, etc.).
+
+ Also tweaks the log message for pixel hash mismatches.
+
+ * Scripts/webkitpy/layout_tests/controllers/single_test_runner.py:
+ (SingleTestRunner._handle_error):
+ (SingleTestRunner._compare_image):
+
2012-02-27 Ryosuke Niwa <rn...@webkit.org>
Touch the master.cfg to force a reconfig.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py (109055 => 109056)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2012-02-28 01:59:09 UTC (rev 109055)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py 2012-02-28 02:05:13 UTC (rev 109056)
@@ -198,11 +198,14 @@
if driver_output.crash:
failures.append(test_failures.FailureCrash(bool(reference_filename)))
- _log.debug("%s Stacktrace for %s:\n%s" % (self._worker_name, testname,
- driver_output.error))
+ if driver_output.error:
+ _log.debug("%s %s crashed, stack trace:" % (self._worker_name, testname))
+ else:
+ _log.debug("%s %s crashed, no stack trace" % (self._worker_name, testname))
elif driver_output.error:
- _log.debug("%s %s output stderr lines:\n%s" % (self._worker_name, testname,
- driver_output.error))
+ _log.debug("%s %s output stderr lines:" % (self._worker_name, testname))
+ for line in driver_output.error.splitlines():
+ _log.debug(" %s" % line)
return failures
def _compare_output(self, driver_output, expected_driver_output):
@@ -266,7 +269,7 @@
failures.append(test_failures.FailureImageHashMismatch(diff_result[1]))
else:
# See https://bugs.webkit.org/show_bug.cgi?id=69444 for why this isn't a full failure.
- _log.warning('%s -> pixel hash failed (but pixel test still passes)' % self._test_name)
+ _log.warning(' %s -> pixel hash failed (but pixel test still passes)' % self._test_name)
return failures
def _run_reftest(self):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
