Title: [94868] trunk/Tools
- Revision
- 94868
- Author
- rn...@webkit.org
- Date
- 2011-09-09 11:21:54 -0700 (Fri, 09 Sep 2011)
Log Message
Buildbot may use RunWebKitTest's evaluateCommand on bots that run nrwt
https://bugs.webkit.org/show_bug.cgi?id=67855
Reviewed by Dirk Pranke.
The bug was caused by the fact some ports use RunWebKitTests instead of NewRunWebKitTests to run tests,
and using RunWebKitTests.evaluateCommand after calling _parseNewRunWebKitTestsOutput.
Fixed the bug by merging evaluateCommand of RunWebKitTests and NewRunWebKitTests.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (94867 => 94868)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-09-09 18:17:32 UTC (rev 94867)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2011-09-09 18:21:54 UTC (rev 94868)
@@ -315,18 +315,24 @@
self._parseOldRunWebKitTestsOutput(logText)
def evaluateCommand(self, cmd):
+ result = SUCCESS
+
if self.incorrectLayoutLines:
if len(self.incorrectLayoutLines) == 1:
line = self.incorrectLayoutLines[0]
if line.find('were new') >= 0 or line.find('was new') >= 0 or line.find(' leak') >= 0:
return WARNINGS
- return FAILURE
+ for line in self.incorrectLayoutLines:
+ if line.find('flakes') >= 0 or line.find('new passes') >= 0 or line.find('missing results') >= 0:
+ result = WARNINGS
+ else:
+ return FAILURE
if cmd.rc != 0:
return FAILURE
- return SUCCESS
+ return result
def getText(self, cmd, results):
return self.getText2(cmd, results)
@@ -354,20 +360,6 @@
logText = cmd.logs['stdio'].getText()
self._parseNewRunWebKitTestsOutput(logText)
- def evaluateCommand(self, cmd):
- if cmd.rc != 0:
- return FAILURE
-
- result = SUCCESS
- if self.incorrectLayoutLines:
- for line in self.incorrectLayoutLines:
- if line.find('flakes') >= 0 or line.find('new passes') >= 0 or line.find('missing results') >= 0:
- result = WARNINGS
- else:
- return FAILURE
-
- return result
-
class RunUnitTests(shell.Test):
name = "run-api-tests"
description = ["unit tests running"]
Modified: trunk/Tools/ChangeLog (94867 => 94868)
--- trunk/Tools/ChangeLog 2011-09-09 18:17:32 UTC (rev 94867)
+++ trunk/Tools/ChangeLog 2011-09-09 18:21:54 UTC (rev 94868)
@@ -1,3 +1,17 @@
+2011-09-09 Ryosuke Niwa <rn...@webkit.org>
+
+ Buildbot may use RunWebKitTest's evaluateCommand on bots that run nrwt
+ https://bugs.webkit.org/show_bug.cgi?id=67855
+
+ Reviewed by Dirk Pranke.
+
+ The bug was caused by the fact some ports use RunWebKitTests instead of NewRunWebKitTests to run tests,
+ and using RunWebKitTests.evaluateCommand after calling _parseNewRunWebKitTestsOutput.
+
+ Fixed the bug by merging evaluateCommand of RunWebKitTests and NewRunWebKitTests.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+
2011-09-09 Mark Hahnenberg <mhahnenb...@apple.com>
Add myself to committers.py
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
