Changeset 161868 in webkit

Timestamp:

Jan 13, 2014 1:54:13 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Remove parsing of old-run-webkit-tests output from master.cfg
​https://bugs.webkit.org/show_bug.cgi?id=126690

Patch by Peter Molnar <​pmolnar.u-szeged@partner.samsung.com> on 2014-01-13
Reviewed by Csaba Osztrogonác.

• BuildSlaveSupport/build.webkit.org-config/master.cfg:

Removed parsing of ORWT output, as it is not used anymore.

• BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:

Updated unit tests accordingly.

Location:

trunk/Tools

Files:

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

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

@@ -386 +386 @@
         return shell.Test.start(self)
 
-    def _parseOldRunWebKitTestsOutput(self, logText):
-        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:
-                incorrectLayoutLines.append(line)
-            elif line.find('test case') >= 0 and (line.find(' crashed') >= 0 or line.find(' timed out') >= 0):
-                incorrectLayoutLines.append(line)
-            elif line.startswith("WARNING:") and line.find(' leak') >= 0:
-                incorrectLayoutLines.append(line.replace('WARNING: ', ''))
-            elif line.find('Exiting early') >= 0:
-                incorrectLayoutLines.append(line)
-
-            # FIXME: Detect and summarize leaks of RefCounted objects
-
-        self.incorrectLayoutLines = incorrectLayoutLines
-
-    # FIXME: This will break if new-run-webkit-tests changes its default log formatter.
+    # FIXME: This will break if run-webkit-tests changes its default log formatter.
     nrwt_log_message_regexp = re.compile(r'\d{2}:\d{2}:\d{2}(\.\d+)?\s+\d+\s+(?P<message>.*)')
 
@@ -411 +395 @@
         return line
 
-    def _parseNewRunWebKitTestsOutput(self, logText):
+    def _parseRunWebKitTestsOutput(self, logText):
         incorrectLayoutLines = []
         expressions = [
@@ -443 +427 @@
 
         logText = cmd.logs['stdio'].getText()
-        if logText.find("Collecting tests ...") >= 0:
-            self._parseNewRunWebKitTestsOutput(logText)
-        else:
-            self._parseOldRunWebKitTestsOutput(logText)
+        self._parseRunWebKitTestsOutput(logText)
 
     def evaluateCommand(self, cmd):

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py

@@ -61 +61 @@
             '1 unique leaks found!',
         ]
-        run_webkit_tests._parseNewRunWebKitTestsOutput(log_text)
+        run_webkit_tests._parseRunWebKitTestsOutput(log_text)
         self.assertEqual(run_webkit_tests.incorrectLayoutLines, expected_incorrect_lines)
 
@@ -84 +84 @@
   svg/custom/zero-path-square-cap-rendering2.svg [ Failure ]
 """
-        run_webkit_tests._parseNewRunWebKitTestsOutput(log_text)
+        run_webkit_tests._parseRunWebKitTestsOutput(log_text)
         self.assertEqual(set(run_webkit_tests.incorrectLayoutLines),
             set(['2 new passes', '3 flakes', '1 missing results', '1 failures']))

trunk/Tools/ChangeLog

@@ +1 @@
+2014-01-13  Peter Molnar  <pmolnar.u-szeged@partner.samsung.com>
+
+        Remove parsing of old-run-webkit-tests output from master.cfg
+        https://bugs.webkit.org/show_bug.cgi?id=126690
+
+        Reviewed by Csaba Osztrogonác.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        Removed parsing of ORWT output, as it is not used anymore.
+        * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+        Updated unit tests accordingly.
+
 2014-01-13  Commit Queue  <commit-queue@webkit.org>