Skip to content
Permalink
Browse files
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):

Canonical link: https://commits.webkit.org/96818@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@109056 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
dpranke committed Feb 28, 2012
1 parent 95ae249 commit d72add55ed9b7d19e9a1ded9f93df04f7b340766
Showing with 24 additions and 5 deletions.
  1. +16 −0 Tools/ChangeLog
  2. +8 −5 Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py
@@ -1,3 +1,19 @@
2012-02-27 Dirk Pranke <dpranke@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 <rniwa@webkit.org>

Touch the master.cfg to force a reconfig.
@@ -198,11 +198,14 @@ def _handle_error(self, driver_output, reference_filename=None):

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 @@ def _compare_image(self, driver_output, expected_driver_output):
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):

0 comments on commit d72add5

Please sign in to comment.