Changeset 91448 in webkit

Timestamp:

Jul 20, 2011 11:53:59 PM (13 years ago)

Author:

rniwa@webkit.org

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:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -234 +234 @@
     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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-20  Ryosuke Niwa  <rniwa@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  <cshu@webkit.org>