Title: [91448] trunk/Tools
- Revision
- 91448
- Author
- rn...@webkit.org
- Date
- 2011-07-20 23:53:59 -0700 (Wed, 20 Jul 2011)
Log Message
Buildbot marks a nrwt bot red when tests are missing results
https://bugs.webkit.org/show_bug.cgi?id=64812
Reviewed by Adam Barth.
The bug was caused by multiple expressions matching on the single output.
Fixed it by exiting the loop as soon as one _expression_ matches.
Because the regular _expression_ for 'failures' is most general,
moved it to the end of the list to avoid it catching other cases.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (91447 => 91448)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-07-21 06:22:59 UTC (rev 91447)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-07-21 06:53:59 UTC (rev 91448)
@@ -233,25 +233,24 @@
def _parseNewRunWebKitTestsOutput(self, logText):
incorrectLayoutLines = []
- expressions = {
- 'failures': re.compile(r'Regressions: Unexpected.+:?\s*\((\d+)\)'),
- 'flakes': re.compile(r'Unexpected flakiness.+:?\s*\((\d+)\)'),
- 'new passes': re.compile(r'Expected to .+, but passed:\s+\((\d+)\)'),
- 'missing results': re.compile(r'no expected results found\s*:\s+\((\d+)\)'),
- }
+ expressions = [
+ ('flakes', re.compile(r'Unexpected flakiness.+:?\s*\((\d+)\)')),
+ ('new passes', re.compile(r'Expected to .+, but passed:\s+\((\d+)\)')),
+ ('missing results', re.compile(r'no expected results found\s*:\s+\((\d+)\)')),
+ ('failures', re.compile(r'Regressions: Unexpected.+:?\s*\((\d+)\)')),
+ ]
testFailures = {}
for line in logText.splitlines():
- if line.find('Exiting early') >= 0:
+ if line.find('Exiting early') >= 0 or line.find('leaks found') >= 0:
incorrectLayoutLines.append(line)
continue
- if line find('leaks found') >= 0:
- incorrectLayoutLines.append(line)
- continue
- for name in expressions:
- match = expressions[name].search(line)
+ for name, _expression_ in expressions:
+ match = _expression_.search(line)
+
if match:
testFailures[name] = testFailures.get(name, 0) + int(match.group(1))
+ break
# FIXME: Parse file names and put them in results
Modified: trunk/Tools/ChangeLog (91447 => 91448)
--- trunk/Tools/ChangeLog 2011-07-21 06:22:59 UTC (rev 91447)
+++ trunk/Tools/ChangeLog 2011-07-21 06:53:59 UTC (rev 91448)
@@ -1,3 +1,18 @@
+2011-07-20 Ryosuke Niwa <rn...@webkit.org>
+
+ Buildbot marks a nrwt bot red when tests are missing results
+ https://bugs.webkit.org/show_bug.cgi?id=64812
+
+ Reviewed by Adam Barth.
+
+ The bug was caused by multiple expressions matching on the single output.
+ Fixed it by exiting the loop as soon as one _expression_ matches.
+
+ Because the regular _expression_ for 'failures' is most general,
+ moved it to the end of the list to avoid it catching other cases.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
2011-07-20 Chang Shu <c...@webkit.org>
Adding myself to the reviewers list; No review needed.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
