Title: [161868] trunk/Tools
- Revision
- 161868
- Author
- [email protected]
- Date
- 2014-01-13 01:54:13 -0800 (Mon, 13 Jan 2014)
Log 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 <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (161867 => 161868)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-01-13 09:46:57 UTC (rev 161867)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-01-13 09:54:13 UTC (rev 161868)
@@ -385,23 +385,7 @@
self.setCommand(self.command + additionalArguments)
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>.*)')
def _strip_python_logging_prefix(self, line):
@@ -410,7 +394,7 @@
return match_object.group('message')
return line
- def _parseNewRunWebKitTestsOutput(self, logText):
+ def _parseRunWebKitTestsOutput(self, logText):
incorrectLayoutLines = []
expressions = [
('flakes', re.compile(r'Unexpected flakiness.+\((\d+)\)')),
@@ -442,10 +426,7 @@
shell.Test.commandComplete(self, cmd)
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):
result = SUCCESS
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (161867 => 161868)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-01-13 09:46:57 UTC (rev 161867)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-01-13 09:54:13 UTC (rev 161868)
@@ -60,7 +60,7 @@
'13981 total leaks found for a total of 197,936 bytes!',
'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)
def test_nrwt_missing_results(self):
@@ -83,7 +83,7 @@
Regressions: Unexpected text-only failures (1)
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']))
Modified: trunk/Tools/ChangeLog (161867 => 161868)
--- trunk/Tools/ChangeLog 2014-01-13 09:46:57 UTC (rev 161867)
+++ trunk/Tools/ChangeLog 2014-01-13 09:54:13 UTC (rev 161868)
@@ -1,3 +1,15 @@
+2014-01-13 Peter Molnar <[email protected]>
+
+ 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 <[email protected]>
Unreviewed, rolling out r161808.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
