Changeset 94868 in webkit

Timestamp:

Sep 9, 2011 11:21:54 AM (13 years ago)

Author:

rniwa@webkit.org

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:

Location:

trunk/Tools

Files:

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

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

@@ -316 +316 @@
 
     def evaluateCommand(self, cmd):
+        result = SUCCESS
+
         if self.incorrectLayoutLines:
             if len(self.incorrectLayoutLines) == 1:
@@ -322 +324 @@
                     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):
@@ -354 +360 @@
         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):

trunk/Tools/ChangeLog

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