Commit adbe4011 authored by rniwa@webkit.org's avatar rniwa@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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94868 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c35b19f9
......@@ -315,18 +315,24 @@ class RunWebKitTests(shell.Test):
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 @@ class NewRunWebKitTests(RunWebKitTests):
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"]
......
2011-09-09 Ryosuke Niwa <rniwa@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 <mhahnenberg@apple.com>
Add myself to committers.py
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment