<!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>[180945] 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/180945">180945</a></dd>
<dt>Author</dt> <dd>mmirman@apple.com</dd>
<dt>Date</dt> <dd>2015-03-03 11:14:24 -0800 (Tue, 03 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSC tests should not be repeated twice for each branch builder, and should if possible have their own queue.
https://bugs.webkit.org/show_bug.cgi?id=142094
Reviewed by Csaba Osztrogonác.
* BuildSlaveSupport/build.webkit.org-config/config.json: Added bots 155 and 157
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(TestFactory):
(TestFactory.__init__): Made running of JSC tests conditional.
(TestAllButJSCFactory):
(TestJSCFactory): Added.
(TestJSCFactory.__init__):
(TestWebKit2AndJSCFactory): Added factory to not run JSC tests on WebKit2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (180944 => 180945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2015-03-03 19:13:13 UTC (rev 180944)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2015-03-03 19:14:24 UTC (rev 180945)
</span><span class="lines">@@ -19,6 +19,8 @@
</span><span class="cx">
</span><span class="cx"> { "name": "bot139", "platform": "mac-yosemite" },
</span><span class="cx"> { "name": "bot148", "platform": "mac-yosemite" },
</span><ins>+ { "name": "bot155", "platform": "mac-yosemite" },
+ { "name": "bot157", "platform": "mac-yosemite" },
</ins><span class="cx"> { "name": "bot180", "platform": "mac-yosemite" },
</span><span class="cx"> { "name": "bot181", "platform": "mac-yosemite" },
</span><span class="cx"> { "name": "bot182", "platform": "mac-yosemite" },
</span><span class="lines">@@ -113,11 +115,15 @@
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple Yosemite Debug (Build)", "type": "Build", "builddir": "yosemite-debug",
</span><span class="cx"> "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
</span><del>- "triggers": ["yosemite-debug-tests-wk1", "yosemite-debug-tests-wk2", "yosemite-leaks"],
</del><ins>+ "triggers": ["yosemite-debug-tests-jsc", "yosemite-debug-tests-wk1", "yosemite-debug-tests-wk2", "yosemite-leaks"],
</ins><span class="cx"> "slavenames": ["bot180", "bot181"]
</span><span class="cx"> },
</span><del>- { "name": "Apple Yosemite Debug WK1 (Tests)", "type": "Test", "builddir": "yosemite-debug-tests-wk1",
</del><ins>+ { "name": "Apple Yosemite Debug JSC (Tests)", "type": "TestJSC", "builddir": "yosemite-debug-tests-jsc",
</ins><span class="cx"> "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
</span><ins>+ "slavenames": ["bot155"]
+ },
+ { "name": "Apple Yosemite Debug WK1 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-debug-tests-wk1",
+ "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
</ins><span class="cx"> "additionalArguments": ["--no-retry-failures"],
</span><span class="cx"> "slavenames": ["bot182", "bot183"]
</span><span class="cx"> },
</span><span class="lines">@@ -136,11 +142,15 @@
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple Yosemite Release (Build)", "type": "Build", "builddir": "yosemite-release",
</span><span class="cx"> "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "triggers": ["yosemite-release-tests-wk1", "yosemite-release-tests-wk2", "yosemite-release-perf"],
</del><ins>+ "triggers": ["yosemite-release-tests-jsc", "yosemite-release-tests-wk1", "yosemite-release-tests-wk2", "yosemite-release-perf"],
</ins><span class="cx"> "slavenames": ["bot188", "bot189"]
</span><span class="cx"> },
</span><del>- { "name": "Apple Yosemite Release WK1 (Tests)", "type": "Test", "builddir": "yosemite-release-tests-wk1",
</del><ins>+ { "name": "Apple Yosemite Release JSC (Tests)", "type": "TestJSC", "builddir": "yosemite-release-tests-jsc",
</ins><span class="cx"> "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
</span><ins>+ "slavenames": ["bot157"]
+ },
+ { "name": "Apple Yosemite Release WK1 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-release-tests-wk1",
+ "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
</ins><span class="cx"> "additionalArguments": ["--no-retry-failures"],
</span><span class="cx"> "slavenames": ["bot190", "bot191"]
</span><span class="cx"> },
</span><span class="lines">@@ -188,7 +198,7 @@
</span><span class="cx"> "slavenames": ["gtk-linux-slave-2"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "GTK Linux 64-bit Release (Tests)", "type": "TestWebKit2", "builddir": "gtk-linux-64-release-tests",
</del><ins>+ "name": "GTK Linux 64-bit Release (Tests)", "type": "TestWebKit2AndJSC", "builddir": "gtk-linux-64-release-tests",
</ins><span class="cx"> "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["gtk-linux-slave-6"]
</span><span class="cx"> },
</span><span class="lines">@@ -199,7 +209,7 @@
</span><span class="cx"> "slavenames": ["gtk-linux-slave-3"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "GTK Linux 64-bit Debug (Tests)", "type": "TestWebKit2", "builddir": "gtk-linux-64-debug-tests",
</del><ins>+ "name": "GTK Linux 64-bit Debug (Tests)", "type": "TestWebKit2AndJSC", "builddir": "gtk-linux-64-debug-tests",
</ins><span class="cx"> "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["gtk-linux-slave-7"]
</span><span class="cx"> },
</span><span class="lines">@@ -276,12 +286,18 @@
</span><span class="cx"> { "type": "Triggerable", "name": "mavericks-release-perf",
</span><span class="cx"> "builderNames": ["Apple Mavericks Release (Perf)"]
</span><span class="cx"> },
</span><ins>+ { "type": "Triggerable", "name": "yosemite-release-tests-jsc",
+ "builderNames": ["Apple Yosemite Release JSC (Tests)"]
+ },
</ins><span class="cx"> { "type": "Triggerable", "name": "yosemite-release-tests-wk1",
</span><span class="cx"> "builderNames": ["Apple Yosemite Release WK1 (Tests)"]
</span><span class="cx"> },
</span><span class="cx"> { "type": "Triggerable", "name": "yosemite-release-tests-wk2",
</span><span class="cx"> "builderNames": ["Apple Yosemite Release WK2 (Tests)"]
</span><span class="cx"> },
</span><ins>+ { "type": "Triggerable", "name": "yosemite-debug-tests-jsc",
+ "builderNames": ["Apple Yosemite Debug JSC (Tests)"]
+ },
</ins><span class="cx"> { "type": "Triggerable", "name": "yosemite-debug-tests-wk1",
</span><span class="cx"> "builderNames": ["Apple Yosemite Debug WK1 (Tests)"]
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (180944 => 180945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-03 19:13:13 UTC (rev 180944)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-03 19:14:24 UTC (rev 180945)
</span><span class="lines">@@ -778,13 +778,15 @@
</span><span class="cx"> return max(requests, key=operator.attrgetter("submittedAt"))
</span><span class="cx">
</span><span class="cx"> class TestFactory(Factory):
</span><ins>+ JSCTestClass = RunJavaScriptCoreTests
</ins><span class="cx"> LayoutTestClass = RunWebKitTests
</span><span class="cx"> ExtractTestResultsClass = ExtractTestResults
</span><span class="cx"> def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
</span><span class="cx"> Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
</span><span class="cx"> self.addStep(DownloadBuiltProduct())
</span><span class="cx"> self.addStep(ExtractBuiltProduct())
</span><del>- self.addStep(RunJavaScriptCoreTests())
</del><ins>+ if self.JSCTestClass:
+ self.addStep(self.JSCTestClass())
</ins><span class="cx"> if self.LayoutTestClass:
</span><span class="cx"> self.addStep(self.LayoutTestClass())
</span><span class="cx">
</span><span class="lines">@@ -864,9 +866,23 @@
</span><span class="cx"> self.addStep(UploadTestResults())
</span><span class="cx"> self.addStep(ExtractTestResultsAndLeaks())
</span><span class="cx">
</span><ins>+class TestAllButJSCFactory(TestFactory):
+ JSCTestClass = None
+
+class TestJSCFactory(Factory):
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
+ self.addStep(DownloadBuiltProduct())
+ self.addStep(ExtractBuiltProduct())
+ self.addStep(RunJavaScriptCoreTests())
+
</ins><span class="cx"> class TestWebKit2Factory(TestFactory):
</span><span class="cx"> LayoutTestClass = RunWebKit2Tests
</span><ins>+ JSCTestClass = None
</ins><span class="cx">
</span><ins>+class TestWebKit2AndJSCFactory(TestFactory):
+ LayoutTestClass = RunWebKit2Tests
+
</ins><span class="cx"> class BuildAndPerfTestFactory(Factory):
</span><span class="cx"> def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
</span><span class="cx"> Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180944 => 180945)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-03 19:13:13 UTC (rev 180944)
+++ trunk/Tools/ChangeLog 2015-03-03 19:14:24 UTC (rev 180945)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-03 Matthew Mirman <mmirman@apple.com>
+
+ JSC tests should not be repeated twice for each branch builder, and should if possible have their own queue.
+ https://bugs.webkit.org/show_bug.cgi?id=142094
+
+ Reviewed by Csaba Osztrogonác.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json: Added bots 155 and 157
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (TestFactory):
+ (TestFactory.__init__): Made running of JSC tests conditional.
+ (TestAllButJSCFactory):
+ (TestJSCFactory): Added.
+ (TestJSCFactory.__init__):
+ (TestWebKit2AndJSCFactory): Added factory to not run JSC tests on WebKit2.
+
</ins><span class="cx"> 2015-03-03 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> `build-webkit --help` is wrong about how to build for the iOS simulator
</span></span></pre>
</div>
</div>
</body>
</html>