<!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>[172701] 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/172701">172701</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-18 02:52:33 -0700 (Mon, 18 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>master.cfg should handle special return codes of run-perf-tests
https://bugs.webkit.org/show_bug.cgi?id=135974
Patch by Renato Nagy <nagy.renato@stud.u-szeged.hu> on 2014-08-18
Reviewed by Ryosuke Niwa.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunAndUploadPerfTests.getText2):
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
(RunAndUploadPerfTestsTest):
(RunAndUploadPerfTestsTest.assertResults):
(RunAndUploadPerfTestsTest.test_tests_failed):
(RunAndUploadPerfTestsTest.test_build_bad_build):
(RunAndUploadPerfTestsTest.test_build_bad_source_json):
(RunAndUploadPerfTestsTest.test_build_bad_marge):
(RunAndUploadPerfTestsTest.test_build_bad_failed_uploading):
(RunAndUploadPerfTestsTest.test_build_bad_preparation):</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 (172700 => 172701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-08-18 08:16:53 UTC (rev 172700)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-08-18 09:52:33 UTC (rev 172701)
</span><span class="lines">@@ -726,7 +726,18 @@
</span><span class="cx">
</span><span class="cx"> def getText2(self, cmd, results):
</span><span class="cx"> if results != SUCCESS:
</span><del>- return ["%d perf tests failed" % cmd.rc]
</del><ins>+ if cmd.rc == -1 & 0xff:
+ return ["build not up to date"]
+ elif cmd.rc == -2 & 0xff:
+ return ["slave config JSON error"]
+ elif cmd.rc == -3 & 0xff:
+ return ["output JSON merge error"]
+ elif cmd.rc == -4 & 0xff:
+ return ["upload error"]
+ elif cmd.rc == -5 & 0xff:
+ return ["system dependency error"]
+ else:
+ return ["%d perf tests failed" % cmd.rc]
</ins><span class="cx">
</span><span class="cx"> return [self.name]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (172700 => 172701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-08-18 08:16:53 UTC (rev 172700)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2014-08-18 09:52:33 UTC (rev 172701)
</span><span class="lines">@@ -426,6 +426,36 @@
</span><span class="cx"> self.assertResults(expected_missing=False, expected_new=False, stdio="")
</span><span class="cx">
</span><span class="cx">
</span><ins>+class RunAndUploadPerfTestsTest(unittest.TestCase):
+ def assertResults(self, rc, expected_text):
+ cmd = StubRemoteCommand(rc, expected_text)
+ step = RunAndUploadPerfTests()
+ step.commandComplete(cmd)
+ actual_results = step.evaluateCommand(cmd)
+ actual_text = str(step.getText2(cmd, actual_results)[0])
+ self.assertEqual(expected_text, actual_text)
+
+ def test_success(self):
+ self.assertResults(0, "perf-test")
+
+ def test_tests_failed(self):
+ self.assertResults(5, "5 perf tests failed")
+
+ def test_build_bad_build(self):
+ self.assertResults(255, "build not up to date")
+
+ def test_build_bad_source_json(self):
+ self.assertResults(254, "slave config JSON error")
+
+ def test_build_bad_marge(self):
+ self.assertResults(253, "output JSON merge error")
+
+ def test_build_bad_failed_uploading(self):
+ self.assertResults(252, "upload error")
+
+ def test_build_bad_preparation(self):
+ self.assertResults(251, "system dependency error")
+
</ins><span class="cx"> # FIXME: We should run this file as part of test-webkitpy.
</span><span class="cx"> # Unfortunately test-webkitpy currently requires that unittests
</span><span class="cx"> # be located in a directory with a valid module name.
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172700 => 172701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-18 08:16:53 UTC (rev 172700)
+++ trunk/Tools/ChangeLog 2014-08-18 09:52:33 UTC (rev 172701)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-08-18 Renato Nagy <nagy.renato@stud.u-szeged.hu>
+
+ master.cfg should handle special return codes of run-perf-tests
+ https://bugs.webkit.org/show_bug.cgi?id=135974
+
+ Reviewed by Ryosuke Niwa.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunAndUploadPerfTests.getText2):
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ (RunAndUploadPerfTestsTest):
+ (RunAndUploadPerfTestsTest.assertResults):
+ (RunAndUploadPerfTestsTest.test_tests_failed):
+ (RunAndUploadPerfTestsTest.test_build_bad_build):
+ (RunAndUploadPerfTestsTest.test_build_bad_source_json):
+ (RunAndUploadPerfTestsTest.test_build_bad_marge):
+ (RunAndUploadPerfTestsTest.test_build_bad_failed_uploading):
+ (RunAndUploadPerfTestsTest.test_build_bad_preparation):
+
</ins><span class="cx"> 2014-08-17 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed change to force rebuild
</span></span></pre>
</div>
</div>
</body>
</html>