summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:54:31 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:54:31 +0000
commit40c96f0c5a2f83beb57d9a3497683fb5e2112dfa (patch)
tree78df0eea78ab263a6e8ae9ae8429d1abe4283e10 /webkit
parent6aa4a1c041ca9bd2c3087c3c059a87193b1a82e1 (diff)
downloadchromium_src-40c96f0c5a2f83beb57d9a3497683fb5e2112dfa.zip
chromium_src-40c96f0c5a2f83beb57d9a3497683fb5e2112dfa.tar.gz
chromium_src-40c96f0c5a2f83beb57d9a3497683fb5e2112dfa.tar.bz2
Update layout test output to log the thread the test runs on, so we can easily see dependencies between tests running on the same thread.
Also changes output from "thread Thread-1 starting" to just "Thread-1 starting" when threads start up. BUG=none TEST=none Review URL: http://codereview.chromium.org/543050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/layout_package/test_shell_thread.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_shell_thread.py b/webkit/tools/layout_tests/layout_package/test_shell_thread.py
index f66c70a..2ba23fc 100644
--- a/webkit/tools/layout_tests/layout_package/test_shell_thread.py
+++ b/webkit/tools/layout_tests/layout_package/test_shell_thread.py
@@ -260,16 +260,16 @@ class TestShellThread(threading.Thread):
self._start_time = time.time()
self._num_tests = 0
try:
- logging.debug('thread %s starting' % (self.getName()))
+ logging.debug('%s starting' % (self.getName()))
self._Run(test_runner=None, result_summary=None)
- logging.debug('thread %s done (%d tests)' % (self.getName(),
+ logging.debug('%s done (%d tests)' % (self.getName(),
self.GetNumTests()))
except:
# Save the exception for our caller to see.
self._exception_info = sys.exc_info()
self._stop_time = time.time()
# Re-raise it and die.
- logging.error('thread %s dying: %s' % (self.getName(),
+ logging.error('%s dying: %s' % (self.getName(),
self._exception_info))
raise
self._stop_time = time.time()
@@ -345,10 +345,11 @@ class TestShellThread(threading.Thread):
batch_count = 0
# Print the error message(s).
error_str = '\n'.join([' ' + f.Message() for f in failures])
- logging.debug("%s failed:\n%s" %
- (path_utils.RelativeTestFilename(filename), error_str))
+ logging.debug("%s %s failed:\n%s" % (self.getName(),
+ path_utils.RelativeTestFilename(filename), error_str))
else:
- logging.debug(path_utils.RelativeTestFilename(filename) + " passed")
+ logging.debug("%s %s passed" % (self.getName(),
+ path_utils.RelativeTestFilename(filename)))
self._result_queue.put((filename, failures))
if batch_size > 0 and batch_count > batch_size: