<!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>[173725] 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/173725">173725</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-18 10:15:01 -0700 (Thu, 18 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix countFailures of RunLLINTCLoopTests and Run32bitJSCTests (II)
https://bugs.webkit.org/show_bug.cgi?id=136856
Reviewed by Darin Adler.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunLLINTCLoopTests.countFailures):
(Run32bitJSCTests.countFailures):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(RunLLINTCLoopTestsTest.test_failures):
(RunLLINTCLoopTestsTest.test_failure):
(RunLLINTCLoopTestsTest.test_no_failure):
(Run32bitJSCTestsTest.test_failures):
(Run32bitJSCTestsTest.test_failure):
(Run32bitJSCTestsTest.test_no_failure):</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 (173724 => 173725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-18 16:52:10 UTC (rev 173724)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-18 17:15:01 UTC (rev 173725)
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> def countFailures(self, cmd):
</span><span class="cx"> logText = cmd.logs['stdio'].getText()
</span><span class="cx"> # We're looking for the line that looks like this: 0 regressions found.
</span><del>- regex = re.compile(r'(?P<count>\d+) regressions? found.')
</del><ins>+ regex = re.compile(r'\s*(?P<count>\d+) regressions? found.')
</ins><span class="cx"> for line in logText.splitlines():
</span><span class="cx"> match = regex.match(line)
</span><span class="cx"> if not match:
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx"> def countFailures(self, cmd):
</span><span class="cx"> logText = cmd.logs['stdio'].getText()
</span><span class="cx"> # We're looking for the line that looks like this: 0 failures found.
</span><del>- regex = re.compile(r'(?P<count>\d+) failures? found.')
</del><ins>+ regex = re.compile(r'\s*(?P<count>\d+) failures? found.')
</ins><span class="cx"> for line in logText.splitlines():
</span><span class="cx"> match = regex.match(line)
</span><span class="cx"> if not match:
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (173724 => 173725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-09-18 16:52:10 UTC (rev 173724)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-09-18 17:15:01 UTC (rev 173725)
</span><span class="lines">@@ -154,13 +154,13 @@
</span><span class="cx"> self.assertEqual(actual_text, expected_text)
</span><span class="cx">
</span><span class="cx"> def test_failures(self):
</span><del>- self.assertResults(FAILURE, ['5 regressions found.'], 1, '5 regressions found.')
</del><ins>+ self.assertResults(FAILURE, ['5 regressions found.'], 1, ' 5 regressions found.')
</ins><span class="cx">
</span><span class="cx"> def test_failure(self):
</span><del>- self.assertResults(FAILURE, ['1 regressions found.'], 1, '1 regression found.')
</del><ins>+ self.assertResults(FAILURE, ['1 regressions found.'], 1, ' 1 regression found.')
</ins><span class="cx">
</span><span class="cx"> def test_no_failure(self):
</span><del>- self.assertResults(SUCCESS, ['webkit-jsc-cloop-test'], 0, '0 regressions found.')
</del><ins>+ self.assertResults(SUCCESS, ['webkit-jsc-cloop-test'], 0, ' 0 regressions found.')
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class Run32bitJSCTestsTest(unittest.TestCase):
</span><span class="lines">@@ -175,13 +175,13 @@
</span><span class="cx"> self.assertEqual(actual_text, expected_text)
</span><span class="cx">
</span><span class="cx"> def test_failures(self):
</span><del>- self.assertResults(FAILURE, ['5 regressions found.'], 1, '5 failures found.')
</del><ins>+ self.assertResults(FAILURE, ['5 regressions found.'], 1, ' 5 failures found.')
</ins><span class="cx">
</span><span class="cx"> def test_failure(self):
</span><del>- self.assertResults(FAILURE, ['1 regressions found.'], 1, '1 failure found.')
</del><ins>+ self.assertResults(FAILURE, ['1 regressions found.'], 1, ' 1 failure found.')
</ins><span class="cx">
</span><span class="cx"> def test_no_failure(self):
</span><del>- self.assertResults(SUCCESS, ['webkit-32bit-jsc-test'], 0, '0 failures found.')
</del><ins>+ self.assertResults(SUCCESS, ['webkit-32bit-jsc-test'], 0, ' 0 failures found.')
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class RunUnitTestsTest(unittest.TestCase):
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173724 => 173725)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-18 16:52:10 UTC (rev 173724)
+++ trunk/Tools/ChangeLog 2014-09-18 17:15:01 UTC (rev 173725)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-09-18 Csaba Osztrogonác <ossy@webkit.org>
+
+ Fix countFailures of RunLLINTCLoopTests and Run32bitJSCTests (II)
+ https://bugs.webkit.org/show_bug.cgi?id=136856
+
+ Reviewed by Darin Adler.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunLLINTCLoopTests.countFailures):
+ (Run32bitJSCTests.countFailures):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (RunLLINTCLoopTestsTest.test_failures):
+ (RunLLINTCLoopTestsTest.test_failure):
+ (RunLLINTCLoopTestsTest.test_no_failure):
+ (Run32bitJSCTestsTest.test_failures):
+ (Run32bitJSCTestsTest.test_failure):
+ (Run32bitJSCTestsTest.test_no_failure):
+
</ins><span class="cx"> 2014-09-18 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> GMainLoopSource is exposed to race conditions
</span></span></pre>
</div>
</div>
</body>
</html>