Title: [90298] trunk/Tools
- Revision
- 90298
- Author
- [email protected]
- Date
- 2011-07-01 16:45:27 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Adam Barth <[email protected]>
Refactor NRWT parsing logic in master.cfg to understand that run-webkit-tests might run NRWT
https://bugs.webkit.org/show_bug.cgi?id=63854
Reviewed by Dirk Pranke.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (90297 => 90298)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-07-01 23:41:45 UTC (rev 90297)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-07-01 23:45:27 UTC (rev 90298)
@@ -215,10 +215,7 @@
self.setCommand(self.command + rootArgument)
return shell.Test.start(self)
- def commandComplete(self, cmd):
- shell.Test.commandComplete(self, cmd)
-
- logText = cmd.logs['stdio'].getText()
+ def _parseOldRunWebKitTestsOutput(self):
incorrectLayoutLines = []
for line in logText.splitlines():
if line.find('had incorrect layout') >= 0 or line.find('were new') >= 0 or line.find('was new') >= 0:
@@ -234,6 +231,40 @@
self.incorrectLayoutLines = incorrectLayoutLines
+ def _parseNewRunWebKitTestsOutput(self):
+ incorrectLayoutLines = []
+ expressions = {
+ 'failed': re.compile(r'Regressions: Unexpected.+:?\s*\((\d+)\)'),
+ 'were flaky': re.compile(r'Unexpected flakiness.+:?\s*\((\d+)\)'),
+ 'new passes': re.compile(r'Expected to .+, but passed:\s+\((\d+)\)'),
+ }
+ testFailures = {}
+
+ for line in logText.splitlines():
+ if line.find('Exiting early') >= 0:
+ incorrectLayoutLines.append(line)
+ continue
+ for name in expressions:
+ match = expressions[name].search(line)
+ if match:
+ testFailures[name] = testFailures.get(name, 0) + int(match.group(1))
+
+ # FIXME: Parse file names and put them in results
+
+ for name in testFailures:
+ incorrectLayoutLines.append(str(testFailures[name]) + ' ' + name)
+
+ self.incorrectLayoutLines = incorrectLayoutLines
+
+ def commandComplete(self, cmd):
+ shell.Test.commandComplete(self, cmd)
+
+ logText = cmd.logs['stdio'].getText()
+ if logText.find("Collecting tests ...") >= 0:
+ self._parseNewRunWebKitTestsOutput(logText)
+ else:
+ self._parseOldRunWebKitTestsOutput(logText)
+
def evaluateCommand(self, cmd):
if self.incorrectLayoutLines:
if len(self.incorrectLayoutLines) == 1:
@@ -272,30 +303,8 @@
shell.Test.commandComplete(self, cmd)
logText = cmd.logs['stdio'].getText()
- incorrectLayoutLines = []
- expressions = {
- 'failed': re.compile(r'Regressions: Unexpected.+:?\s*\((\d+)\)'),
- 'were flaky': re.compile(r'Unexpected flakiness.+:?\s*\((\d+)\)'),
- 'new passes': re.compile(r'Expected to .+, but passed:\s+\((\d+)\)'),
- }
- testFailures = {}
+ self._parseNewRunWebKitTestsOutput(logText)
- for line in logText.splitlines():
- if line.find('Exiting early') >= 0:
- incorrectLayoutLines.append(line)
- continue
- for name in expressions:
- match = expressions[name].search(line)
- if match:
- testFailures[name] = testFailures.get(name, 0) + int(match.group(1))
-
- # FIXME: Parse file names and put them in results
-
- for name in testFailures:
- incorrectLayoutLines.append(str(testFailures[name]) + ' ' + name)
-
- self.incorrectLayoutLines = incorrectLayoutLines
-
def evaluateCommand(self, cmd):
if cmd.rc != 0:
return FAILURE
Modified: trunk/Tools/ChangeLog (90297 => 90298)
--- trunk/Tools/ChangeLog 2011-07-01 23:41:45 UTC (rev 90297)
+++ trunk/Tools/ChangeLog 2011-07-01 23:45:27 UTC (rev 90298)
@@ -1,3 +1,12 @@
+2011-07-01 Adam Barth <[email protected]>
+
+ Refactor NRWT parsing logic in master.cfg to understand that run-webkit-tests might run NRWT
+ https://bugs.webkit.org/show_bug.cgi?id=63854
+
+ Reviewed by Dirk Pranke.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
2011-07-01 Eric Seidel <[email protected]>
new-run-webkit-tests results does not understand that mac uses test_expectations files
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
