Title: [139505] trunk/Tools
- Revision
- 139505
- Author
- rn...@webkit.org
- Date
- 2013-01-11 14:57:29 -0800 (Fri, 11 Jan 2013)
Log Message
REGRESSION: buildbot mangles error messages with timestamps run-webkit-tests outputs
https://bugs.webkit.org/show_bug.cgi?id=106688
Reviewed by Eric Seidel.
Update the regular _expression_ used to strip the garbage at the beginning.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests.nrwt_log_message_regexp):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (139504 => 139505)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-01-11 22:56:34 UTC (rev 139504)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2013-01-11 22:57:29 UTC (rev 139505)
@@ -363,7 +363,7 @@
self.incorrectLayoutLines = incorrectLayoutLines
# FIXME: This will break if new-run-webkit-tests changes its default log formatter.
- nrwt_log_message_regexp = re.compile(r'(?P<log_prefix>.*) (?P<log_level>DEBUG|INFO) (?P<message>.*)')
+ 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):
match_object = self.nrwt_log_message_regexp.match(line)
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (139504 => 139505)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2013-01-11 22:56:34 UTC (rev 139504)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2013-01-11 22:57:29 UTC (rev 139505)
@@ -53,11 +53,11 @@
def test_nrwt_leaks_parsing(self):
run_webkit_tests = RunWebKitTests() # pylint is confused by the way we import the module ... pylint: disable-msg=E0602
log_text = """
-2011-08-09 10:05:18,580 29486 mac.py:275 INFO leaks found for a total of 197,936 bytes!
-2011-08-09 10:05:18,580 29486 mac.py:276 INFO 1 unique leaks found!
+12:44:24.295 77706 13981 total leaks found for a total of 197,936 bytes!
+12:44:24.295 77706 1 unique leaks found!
"""
expected_incorrect_lines = [
- 'leaks found for a total of 197,936 bytes!',
+ '13981 total leaks found for a total of 197,936 bytes!',
'1 unique leaks found!',
]
run_webkit_tests._parseNewRunWebKitTestsOutput(log_text)
Modified: trunk/Tools/ChangeLog (139504 => 139505)
--- trunk/Tools/ChangeLog 2013-01-11 22:56:34 UTC (rev 139504)
+++ trunk/Tools/ChangeLog 2013-01-11 22:57:29 UTC (rev 139505)
@@ -1,3 +1,15 @@
+2013-01-11 Ryosuke Niwa <rn...@webkit.org>
+
+ REGRESSION: buildbot mangles error messages with timestamps run-webkit-tests outputs
+ https://bugs.webkit.org/show_bug.cgi?id=106688
+
+ Reviewed by Eric Seidel.
+
+ Update the regular _expression_ used to strip the garbage at the beginning.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunWebKitTests.nrwt_log_message_regexp):
+
2013-01-11 Pratik Solanki <psola...@apple.com>
TestRunner leaks when running tests
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
