<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161868] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161868">161868</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-13 01:54:13 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (161867 => 161868)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -385,23 +385,7 @@
</span><span class="cx"> self.setCommand(self.command + additionalArguments)
</span><span class="cx"> return shell.Test.start(self)
</span><span class="cx">
</span><del>- 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.
</del><ins>+ # FIXME: This will break if run-webkit-tests changes its default log formatter.
</ins><span class="cx"> nrwt_log_message_regexp = re.compile(r'\d{2}:\d{2}:\d{2}(\.\d+)?\s+\d+\s+(?P<message>.*)')
</span><span class="cx">
</span><span class="cx"> def _strip_python_logging_prefix(self, line):
</span><span class="lines">@@ -410,7 +394,7 @@
</span><span class="cx"> return match_object.group('message')
</span><span class="cx"> return line
</span><span class="cx">
</span><del>- def _parseNewRunWebKitTestsOutput(self, logText):
</del><ins>+ def _parseRunWebKitTestsOutput(self, logText):
</ins><span class="cx"> incorrectLayoutLines = []
</span><span class="cx"> expressions = [
</span><span class="cx"> ('flakes', re.compile(r'Unexpected flakiness.+\((\d+)\)')),
</span><span class="lines">@@ -442,10 +426,7 @@
</span><span class="cx"> shell.Test.commandComplete(self, cmd)
</span><span class="cx">
</span><span class="cx"> logText = cmd.logs['stdio'].getText()
</span><del>- if logText.find("Collecting tests ...") >= 0:
- self._parseNewRunWebKitTestsOutput(logText)
- else:
- self._parseOldRunWebKitTestsOutput(logText)
</del><ins>+ self._parseRunWebKitTestsOutput(logText)
</ins><span class="cx">
</span><span class="cx"> def evaluateCommand(self, cmd):
</span><span class="cx"> result = SUCCESS
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (161867 => 161868)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> '13981 total leaks found for a total of 197,936 bytes!',
</span><span class="cx"> '1 unique leaks found!',
</span><span class="cx"> ]
</span><del>- run_webkit_tests._parseNewRunWebKitTestsOutput(log_text)
</del><ins>+ run_webkit_tests._parseRunWebKitTestsOutput(log_text)
</ins><span class="cx"> self.assertEqual(run_webkit_tests.incorrectLayoutLines, expected_incorrect_lines)
</span><span class="cx">
</span><span class="cx"> def test_nrwt_missing_results(self):
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> Regressions: Unexpected text-only failures (1)
</span><span class="cx"> svg/custom/zero-path-square-cap-rendering2.svg [ Failure ]
</span><span class="cx"> """
</span><del>- run_webkit_tests._parseNewRunWebKitTestsOutput(log_text)
</del><ins>+ run_webkit_tests._parseRunWebKitTestsOutput(log_text)
</ins><span class="cx"> self.assertEqual(set(run_webkit_tests.incorrectLayoutLines),
</span><span class="cx"> set(['2 new passes', '3 flakes', '1 missing results', '1 failures']))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161867 => 161868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-01-13 09:46:57 UTC (rev 161867)
+++ trunk/Tools/ChangeLog        2014-01-13 09:54:13 UTC (rev 161868)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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.
+
</ins><span class="cx"> 2014-01-13 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r161808.
</span></span></pre>
</div>
</div>
</body>
</html>