<!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>[179342] 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/179342">179342</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-29 05:32:25 -0800 (Thu, 29 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[buildbot] Simplify jscore-test buildstep
https://bugs.webkit.org/show_bug.cgi?id=140821
Reviewed by Alexey Proskuryakov.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunJavaScriptCoreTests): Inherited from TestWithFailureCount and removed useless actual.html logfile.
(RunJavaScriptCoreTests.countFailures): Added.
(RunJavaScriptCoreTests.commandComplete): Deleted.
(RunJavaScriptCoreTests.evaluateCommand): Deleted.
(RunJavaScriptCoreTests.getText): Deleted.
(RunJavaScriptCoreTests.getText2): Deleted.
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py: Updated.
(RunJavaScriptCoreTestsTest.test_mozilla_failure_old_output):
(RunJavaScriptCoreTestsTest.test_mozilla_failures_old_output):
(RunJavaScriptCoreTestsTest.test_jsc_stress_failure_new_output):
(RunJavaScriptCoreTestsTest.test_jsc_stress_failures_new_output):</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 (179341 => 179342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-29 12:09:46 UTC (rev 179341)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-29 13:32:25 UTC (rev 179342)
</span><span class="lines">@@ -279,12 +279,12 @@
</span><span class="cx"> flunkOnFailure = True
</span><span class="cx">
</span><span class="cx">
</span><del>-class RunJavaScriptCoreTests(shell.Test):
</del><ins>+class RunJavaScriptCoreTests(TestWithFailureCount):
</ins><span class="cx"> name = "jscore-test"
</span><span class="cx"> description = ["jscore-tests running"]
</span><span class="cx"> descriptionDone = ["jscore-tests"]
</span><span class="cx"> command = ["perl", "./Tools/Scripts/run-javascriptcore-tests", WithProperties("--%(configuration)s")]
</span><del>- logfiles = {'actual.html (source)': 'Source/JavaScriptCore/tests/mozilla/actual.html'}
</del><ins>+ failedTestsFormatString = "%d JSC test%s failed"
</ins><span class="cx">
</span><span class="cx"> def __init__(self, buildJSCTool=True, *args, **kwargs):
</span><span class="cx"> self.buildJSCTool = buildJSCTool
</span><span class="lines">@@ -297,52 +297,19 @@
</span><span class="cx"> self.setCommand(self.command + ['--no-build'])
</span><span class="cx"> return shell.Test.start(self)
</span><span class="cx">
</span><del>- def commandComplete(self, cmd):
- shell.Test.commandComplete(self, cmd)
</del><ins>+ def countFailures(self, cmd):
</ins><span class="cx"> logText = cmd.logs['stdio'].getText()
</span><span class="cx">
</span><del>- expressions = [
- ('failing Mozilla test', re.compile(r'^Results for Mozilla tests:\r?\n\s+(\d+) regression', re.MULTILINE)),
- ('failing JSC stress test', re.compile(r'^Results for JSC stress tests:\r?\n\s+(\d+) failure', re.MULTILINE)),
- ]
- resultLines = {}
</del><ins>+ match = re.search(r'^Results for JSC stress tests:\r?\n\s+(\d+) failure', logText, re.MULTILINE)
+ if match:
+ return int(match.group(1))
</ins><span class="cx">
</span><del>- for name, expression in expressions:
- match = expression.search(logText)
- resultLines[name] = int(match.group(1)) if match else 0
</del><ins>+ match = re.search(r'^Results for Mozilla tests:\r?\n\s+(\d+) regression', logText, re.MULTILINE)
+ if match:
+ return int(match.group(1))
</ins><span class="cx">
</span><del>- self.regressionLine = []
- for name in resultLines:
- failures = resultLines[name]
- if not failures:
- continue
</del><ins>+ return 0
</ins><span class="cx">
</span><del>- if failures == 1:
- pluralSuffix = ''
- else:
- pluralSuffix = 's'
- self.regressionLine.append("%d %s%s " % (failures, name, pluralSuffix))
-
- if 'actual.html (source)' in cmd.logs:
- self.addHTMLLog('actual.html', cmd.logs['actual.html (source)'].getText())
-
- def evaluateCommand(self, cmd):
- if self.regressionLine:
- return FAILURE
-
- if cmd.rc != 0:
- return FAILURE
-
- return SUCCESS
-
- def getText(self, cmd, results):
- return self.getText2(cmd, results)
-
- def getText2(self, cmd, results):
- result = [self.name]
- result.extend(self.regressionLine)
- return result
-
</del><span class="cx"> class RunWebKitTests(shell.Test):
</span><span class="cx"> name = "layout-test"
</span><span class="cx"> description = ["layout-tests running"]
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (179341 => 179342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-29 12:09:46 UTC (rev 179341)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-29 13:32:25 UTC (rev 179342)
</span><span class="lines">@@ -122,21 +122,21 @@
</span><span class="cx"> OK.""")
</span><span class="cx">
</span><span class="cx"> def test_mozilla_failure_old_output(self):
</span><del>- self.assertResults(FAILURE, ["jscore-test", '1 failing Mozilla test '], 1, """Results for Mozilla tests:
</del><ins>+ self.assertResults(FAILURE, ["1 JSC test failed"], 1, """Results for Mozilla tests:
</ins><span class="cx"> 1 regression found.
</span><span class="cx"> 0 tests fixed.""")
</span><span class="cx">
</span><span class="cx"> def test_mozilla_failures_old_output(self):
</span><del>- self.assertResults(FAILURE, ["jscore-test", '2 failing Mozilla tests '], 1, """Results for Mozilla tests:
</del><ins>+ self.assertResults(FAILURE, ["2 JSC tests failed"], 1, """Results for Mozilla tests:
</ins><span class="cx"> 2 regressions found.
</span><span class="cx"> 0 tests fixed.""")
</span><span class="cx">
</span><span class="cx"> def test_jsc_stress_failure_new_output(self):
</span><del>- self.assertResults(FAILURE, ["jscore-test", '1 failing JSC stress test '], 1, """Results for JSC stress tests:
</del><ins>+ self.assertResults(FAILURE, ["1 JSC test failed"], 1, """Results for JSC stress tests:
</ins><span class="cx"> 1 failure found.""")
</span><span class="cx">
</span><span class="cx"> def test_jsc_stress_failures_new_output(self):
</span><del>- self.assertResults(FAILURE, ["jscore-test", '5 failing JSC stress tests '], 1, """Results for JSC stress tests:
</del><ins>+ self.assertResults(FAILURE, ["5 JSC tests failed"], 1, """Results for JSC stress tests:
</ins><span class="cx"> 5 failures found.""")
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179341 => 179342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-29 12:09:46 UTC (rev 179341)
+++ trunk/Tools/ChangeLog 2015-01-29 13:32:25 UTC (rev 179342)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2015-01-29 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><ins>+ [buildbot] Simplify jscore-test buildstep
+ https://bugs.webkit.org/show_bug.cgi?id=140821
+
+ Reviewed by Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunJavaScriptCoreTests): Inherited from TestWithFailureCount and removed useless actual.html logfile.
+ (RunJavaScriptCoreTests.countFailures): Added.
+ (RunJavaScriptCoreTests.commandComplete): Deleted.
+ (RunJavaScriptCoreTests.evaluateCommand): Deleted.
+ (RunJavaScriptCoreTests.getText): Deleted.
+ (RunJavaScriptCoreTests.getText2): Deleted.
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py: Updated.
+ (RunJavaScriptCoreTestsTest.test_mozilla_failure_old_output):
+ (RunJavaScriptCoreTestsTest.test_mozilla_failures_old_output):
+ (RunJavaScriptCoreTestsTest.test_jsc_stress_failure_new_output):
+ (RunJavaScriptCoreTestsTest.test_jsc_stress_failures_new_output):
+
+2015-01-29 Csaba Osztrogonác <ossy@webkit.org>
+
</ins><span class="cx"> Unreviewed, revert r179337, we don't need this dependency.
</span><span class="cx">
</span><span class="cx"> * efl/install-dependencies:
</span></span></pre>
</div>
</div>
</body>
</html>