diff options
| author | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 17:12:58 +0000 |
|---|---|---|
| committer | gwilson@google.com <gwilson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-15 17:12:58 +0000 |
| commit | f4abfbb568e292857badbf4cfd1787ca66e02376 (patch) | |
| tree | 96348b8c095221b0a6beca984f147db12a9fd4b8 /webkit | |
| parent | b694453d2397cb3886e4fb59bfdefb55c9f9081e (diff) | |
| download | chromium_src-f4abfbb568e292857badbf4cfd1787ca66e02376.zip chromium_src-f4abfbb568e292857badbf4cfd1787ca66e02376.tar.gz chromium_src-f4abfbb568e292857badbf4cfd1787ca66e02376.tar.bz2 | |
Updates the layout test formatter to match the current output from the layout test scripts, whose output recently changed.
Also fixes some failure double-counting.
R=ojan
BUG=none
TEST=test_output_formatter.bat should pick up failures properly, and not have duplicates.
Review URL: http://codereview.chromium.org/496012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34562 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/failure_finder.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/failure_finder.py b/webkit/tools/layout_tests/layout_package/failure_finder.py index 3775e98..8fb4d14 100644 --- a/webkit/tools/layout_tests/layout_package/failure_finder.py +++ b/webkit/tools/layout_tests/layout_package/failure_finder.py @@ -72,7 +72,7 @@ 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 = ("ERROR (" + TEST_PATH_REGEX + ") failed:\s*" +FAILED_REGEX = ("DEBUG (" + TEST_PATH_REGEX + ") failed:\s*" "(" + TEXT_DIFF_MISMATCH + ")?\s*" "(" + IMAGE_MISMATCH + ")?\s*" "(" + TEST_TIMED_OUT + ")?\s*" @@ -82,7 +82,8 @@ LAST_BUILD_REGEX = ("<h2>Recent Builds:</h2>" "[\s\S]*?<a href=\"../builders/.*?/builds/(\d+)\">") # Sometimes the lines of hyphens gets interrupted with multiple processes # outputting to stdio, so don't rely on them being contiguous. -SUMMARY_REGEX = "-{78}(.*?)-{78}" # -{78} --> 78 dashes in a row. +SUMMARY_REGEX = ("\d+ tests ran as expected, " + "\d+ didn't:(.*?)-{78}") # -{78} --> 78 dashes in a row. SUMMARY_REGRESSIONS = "Regressions:.*?\n((?: [^\s]+(?: = .*?)?\n)+)" TEST_EXPECTATIONS_PLATFORM_REGEX = "((WONTFIX |BUG.* )+.* %s.* : %s = [^\n]*)" TEST_EXPECTATIONS_NO_PLATFORM_REGEX = ("((WONTFIX |BUG.* )+.*" @@ -346,6 +347,9 @@ class FailureFinder(object): print "and wrap quotes around builder names that have spaces." return None + # TODO(gwilson): The type of failure is now output in the summary, so no + # matching between the summary and the earlier output is necessary. + # Change this method and others to derive failure types from summary only. def _FindMatchesInBuilderOutput(self, output): matches = [] matches = re.findall(FAILED_REGEX, output, re.MULTILINE) @@ -387,6 +391,7 @@ class FailureFinder(object): for failure in failures: if failure[0].find(regression) > -1: matches.append(failure) + break return matches # TODO(gwilson): add support for multiple conflicting build numbers by |