summaryrefslogtreecommitdiffstats
path: root/webkit/tools/layout_tests/webkitpy
diff options
context:
space:
mode:
authorvictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-25 16:43:28 +0000
committervictorw@chromium.org <victorw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-25 16:43:28 +0000
commit7987ad9fb388bfbb7a886478df0b2e20f1c629cf (patch)
treeb6851efade27135414a1d894e1546ff1eaef1a40 /webkit/tools/layout_tests/webkitpy
parent37ef15c5b8ce5cf2c8bd48d296796a4c385b26b9 (diff)
downloadchromium_src-7987ad9fb388bfbb7a886478df0b2e20f1c629cf.zip
chromium_src-7987ad9fb388bfbb7a886478df0b2e20f1c629cf.tar.gz
chromium_src-7987ad9fb388bfbb7a886478df0b2e20f1c629cf.tar.bz2
Fix layout test comparison tool
Patch http://src.chromium.org/viewvc/chrome?view=rev&revision=36379 added thread name to logging out and breaks the layout test comparison tool. BUG=none TEST=none Review URL: http://codereview.chromium.org/552115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/webkitpy')
-rw-r--r--webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/failure_finder.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/failure_finder.py b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/failure_finder.py
index d8aa34f..e9c5d7d 100644
--- a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/failure_finder.py
+++ b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/failure_finder.py
@@ -72,12 +72,14 @@ CHROMIUM_LINUX_PLATFORM_DIRS = [CHROMIUM_LINUX, CHROMIUM_WIN]
ARCHIVE_URL_REGEX = "last.*change: (\d+)"
BUILD_NAME_REGEX = "build name: ([^\s]*)"
CHROMIUM_FILE_AGE_REGEX = '<br />\s*Modified\s*<em>.*</em> \((.*)\) by'
-TEST_PATH_REGEX = "[^\s]+?"
-FAILED_REGEX = ("DEBUG (" + TEST_PATH_REGEX + ") failed:\s*"
- "(" + TEXT_DIFF_MISMATCH + ")?\s*"
- "(" + IMAGE_MISMATCH + ")?\s*"
- "(" + TEST_TIMED_OUT + ")?\s*"
- "(" + TEST_SHELL_CRASHED + ")?")
+THREAD_NAME_REGEX = "[\S]+?"
+TEST_PATH_REGEX = "[\S]+?"
+FAILED_REGEX = ("DEBUG " + THREAD_NAME_REGEX + " " +
+ "(" + TEST_PATH_REGEX + ") failed:\s*"
+ "(" + TEXT_DIFF_MISMATCH + ")?\s*"
+ "(" + IMAGE_MISMATCH + ")?\s*"
+ "(" + TEST_TIMED_OUT + ")?\s*"
+ "(" + TEST_SHELL_CRASHED + ")?")
FAILED_UNEXPECTED_REGEX = " [^\s]+(?: = .*?)?\n"
LAST_BUILD_REGEX = ("<h2>Recent Builds:</h2>"
"[\s\S]*?<a href=\"../builders/.*?/builds/(\d+)\">")