<!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>[179116] 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/179116">179116</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-26 09:20:20 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[buildbot] Fix grammar of TestWithFailureCount
https://bugs.webkit.org/show_bug.cgi?id=140884
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(TestWithFailureCount):
(TestWithFailureCount.commandComplete):
(TestWithFailureCount.getText2):
(RunUnitTests):
(RunPythonTests):
(RunPerlTests):
(RunLLINTCLoopTests):
(Run32bitJSCTests):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(RunLLINTCLoopTestsTest.test_failure):
(Run32bitJSCTestsTest.test_failure):
(RunUnitTestsTest.assertFailures):</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 (179115 => 179116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 16:25:09 UTC (rev 179115)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 17:20:20 UTC (rev 179116)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class TestWithFailureCount(shell.Test):
</span><del>- failedTestsFormatString = "%d tests failed"
</del><ins>+ failedTestsFormatString = "%d test%s failed"
</ins><span class="cx">
</span><span class="cx"> def countFailures(self, cmd):
</span><span class="cx"> return 0
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx"> def commandComplete(self, cmd):
</span><span class="cx"> shell.Test.commandComplete(self, cmd)
</span><span class="cx"> self.failedTestCount = self.countFailures(cmd)
</span><ins>+ self.failedTestPluralSuffix = "" if self.failedTestCount == 1 else "s"
</ins><span class="cx">
</span><span class="cx"> def evaluateCommand(self, cmd):
</span><span class="cx"> if self.failedTestCount:
</span><span class="lines">@@ -85,7 +86,7 @@
</span><span class="cx">
</span><span class="cx"> def getText2(self, cmd, results):
</span><span class="cx"> if results != SUCCESS and self.failedTestCount:
</span><del>- return [self.failedTestsFormatString % self.failedTestCount]
</del><ins>+ return [self.failedTestsFormatString % (self.failedTestCount, self.failedTestPluralSuffix)]
</ins><span class="cx">
</span><span class="cx"> return [self.name]
</span><span class="cx">
</span><span class="lines">@@ -460,7 +461,7 @@
</span><span class="cx"> description = ["unit tests running"]
</span><span class="cx"> descriptionDone = ["unit-tests"]
</span><span class="cx"> command = ["perl", "./Tools/Scripts/run-api-tests", WithProperties("--%(configuration)s"), "--verbose"]
</span><del>- failedTestsFormatString = "%d unit tests failed or timed out"
</del><ins>+ failedTestsFormatString = "%d unit test%s failed or timed out"
</ins><span class="cx">
</span><span class="cx"> def start(self):
</span><span class="cx"> platform = self.getProperty('fullPlatform')
</span><span class="lines">@@ -490,7 +491,7 @@
</span><span class="cx"> description = ["python-tests running"]
</span><span class="cx"> descriptionDone = ["python-tests"]
</span><span class="cx"> command = ["python", "./Tools/Scripts/test-webkitpy", "--verbose"]
</span><del>- failedTestsFormatString = "%d python tests failed"
</del><ins>+ failedTestsFormatString = "%d python test%s failed"
</ins><span class="cx">
</span><span class="cx"> def start(self):
</span><span class="cx"> platform = self.getProperty('platform')
</span><span class="lines">@@ -521,7 +522,7 @@
</span><span class="cx"> description = ["perl-tests running"]
</span><span class="cx"> descriptionDone = ["perl-tests"]
</span><span class="cx"> command = ["perl", "./Tools/Scripts/test-webkitperl"]
</span><del>- failedTestsFormatString = "%d perl tests failed"
</del><ins>+ failedTestsFormatString = "%d perl test%s failed"
</ins><span class="cx">
</span><span class="cx"> def countFailures(self, cmd):
</span><span class="cx"> logText = cmd.logs['stdio'].getText()
</span><span class="lines">@@ -540,7 +541,7 @@
</span><span class="cx"> description = ["cloop-tests running"]
</span><span class="cx"> descriptionDone = ["cloop-tests"]
</span><span class="cx"> command = ["perl", "./Tools/Scripts/run-javascriptcore-tests", "--cloop", "--no-build", "--no-jsc-stress", WithProperties("--%(configuration)s")]
</span><del>- failedTestsFormatString = "%d regressions found."
</del><ins>+ failedTestsFormatString = "%d regression%s found."
</ins><span class="cx">
</span><span class="cx"> def countFailures(self, cmd):
</span><span class="cx"> logText = cmd.logs['stdio'].getText()
</span><span class="lines">@@ -559,7 +560,7 @@
</span><span class="cx"> description = ["32bit-jsc-tests running"]
</span><span class="cx"> descriptionDone = ["32bit-jsc-tests"]
</span><span class="cx"> command = ["perl", "./Tools/Scripts/run-javascriptcore-tests", "--32-bit", "--no-build", WithProperties("--%(configuration)s")]
</span><del>- failedTestsFormatString = "%d regressions found."
</del><ins>+ failedTestsFormatString = "%d regression%s found."
</ins><span class="cx">
</span><span class="cx"> def countFailures(self, cmd):
</span><span class="cx"> logText = cmd.logs['stdio'].getText()
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (179115 => 179116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 16:25:09 UTC (rev 179115)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 17:20:20 UTC (rev 179116)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> self.assertResults(FAILURE, ['5 regressions found.'], 1, ' 5 regressions found.')
</span><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 regression found.'], 1, ' 1 regression found.')
</ins><span class="cx">
</span><span class="cx"> def test_no_failure(self):
</span><span class="cx"> self.assertResults(SUCCESS, ['webkit-jsc-cloop-test'], 0, ' 0 regressions found.')
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> self.assertResults(FAILURE, ['5 regressions found.'], 1, ' 5 failures found.')
</span><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 regression found.'], 1, ' 1 failure found.')
</ins><span class="cx">
</span><span class="cx"> def test_no_failure(self):
</span><span class="cx"> self.assertResults(SUCCESS, ['webkit-32bit-jsc-test'], 0, ' 0 failures found.')
</span><span class="lines">@@ -187,7 +187,8 @@
</span><span class="cx"> if expected_failure_count:
</span><span class="cx"> rc = 1
</span><span class="cx"> expected_results = FAILURE
</span><del>- expected_text = '{0} unit tests failed or timed out'.format(expected_failure_count)
</del><ins>+ plural_suffix = "" if expected_failure_count == 1 else "s"
+ expected_text = '%d unit test%s failed or timed out' % (expected_failure_count, plural_suffix)
</ins><span class="cx"> else:
</span><span class="cx"> rc = 0
</span><span class="cx"> expected_results = SUCCESS
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179115 => 179116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-26 16:25:09 UTC (rev 179115)
+++ trunk/Tools/ChangeLog 2015-01-26 17:20:20 UTC (rev 179116)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-01-26 Csaba Osztrogonác <ossy@webkit.org>
+
+ [buildbot] Fix grammar of TestWithFailureCount
+ https://bugs.webkit.org/show_bug.cgi?id=140884
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (TestWithFailureCount):
+ (TestWithFailureCount.commandComplete):
+ (TestWithFailureCount.getText2):
+ (RunUnitTests):
+ (RunPythonTests):
+ (RunPerlTests):
+ (RunLLINTCLoopTests):
+ (Run32bitJSCTests):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (RunLLINTCLoopTestsTest.test_failure):
+ (Run32bitJSCTestsTest.test_failure):
+ (RunUnitTestsTest.assertFailures):
+
</ins><span class="cx"> 2015-01-26 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Moving myself to the committer section.
</span></span></pre>
</div>
</div>
</body>
</html>