<!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>[190374] 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/190374">190374</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-30 16:56:51 -0700 (Wed, 30 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename iOS builders/testers to include version
https://bugs.webkit.org/show_bug.cgi?id=149685
Reviewed by Simon Fraser.
Substitute "Apple iOS 9" for "Apple iOS" in the names of iOS builders/testers so as
make it clear to a reader the version of iOS these builders/testers are using.
* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:</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_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="trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (190373 => 190374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2015-09-30 23:34:23 UTC (rev 190373)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2015-09-30 23:56:51 UTC (rev 190374)
</span><span class="lines">@@ -254,24 +254,24 @@
</span><span class="cx"> "slavenames": ["bot194"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "Apple iOS Release (Build)", "type": "Build", "builddir": "ios-9-release",
</del><ins>+ "name": "Apple iOS 9 Release (Build)", "type": "Build", "builddir": "ios-9-release",
</ins><span class="cx"> "platform": "ios-9", "configuration": "release", "architectures": ["armv7", "armv7s", "arm64"],
</span><span class="cx"> "slavenames": ["bot407"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "Apple iOS Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-9-release",
</del><ins>+ "name": "Apple iOS 9 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-9-release",
</ins><span class="cx"> "platform": "ios-simulator-9", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "triggers": ["ios-simulator-9-release-tests-wk1", "ios-simulator-9-release-tests-wk2"],
</span><span class="cx"> "slavenames": ["bot402", "bot403"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "Apple iOS Simulator Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-9-release-tests-wk1",
</del><ins>+ "name": "Apple iOS 9 Simulator Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-9-release-tests-wk1",
</ins><span class="cx"> "platform": "ios-simulator-9", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "additionalArguments": ["--no-retry-failures"],
</span><span class="cx"> "slavenames": ["bot197", "bot215"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "Apple iOS Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-9-release-tests-wk2",
</del><ins>+ "name": "Apple iOS 9 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-9-release-tests-wk2",
</ins><span class="cx"> "platform": "ios-simulator-9", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "additionalArguments": ["--no-retry-failures"],
</span><span class="cx"> "slavenames": ["bot216", "bot217"]
</span><span class="lines">@@ -387,10 +387,10 @@
</span><span class="cx"> "builderNames": ["Apple El Capitan Release (Build)", "Apple El Capitan Debug (Build)", "Apple El Capitan LLINT CLoop (BuildAndTest)", "Apple El Capitan 32-bit JSC (BuildAndTest)", "Apple El Capitan Release (32-bit Build)"]
</span><span class="cx"> },
</span><span class="cx"> { "type": "PlatformSpecificScheduler", "platform": "ios-9", "branch": "trunk", "treeStableTimer": 45.0,
</span><del>- "builderNames": ["Apple iOS Release (Build)"]
</del><ins>+ "builderNames": ["Apple iOS 9 Release (Build)"]
</ins><span class="cx"> },
</span><span class="cx"> { "type": "PlatformSpecificScheduler", "platform": "ios-simulator-9", "branch": "trunk", "treeStableTimer": 45.0,
</span><del>- "builderNames": ["Apple iOS Simulator Release (Build)"]
</del><ins>+ "builderNames": ["Apple iOS 9 Simulator Release (Build)"]
</ins><span class="cx"> },
</span><span class="cx"> { "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
</span><span class="cx"> "builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
</span><span class="lines">@@ -459,10 +459,10 @@
</span><span class="cx"> "builderNames": ["Apple Yosemite Release WK2 (Perf)"]
</span><span class="cx"> },
</span><span class="cx"> { "type": "Triggerable", "name": "ios-simulator-9-release-tests-wk1",
</span><del>- "builderNames": ["Apple iOS Simulator Release WK1 (Tests)"]
</del><ins>+ "builderNames": ["Apple iOS 9 Simulator Release WK1 (Tests)"]
</ins><span class="cx"> },
</span><span class="cx"> { "type": "Triggerable", "name": "ios-simulator-9-release-tests-wk2",
</span><del>- "builderNames": ["Apple iOS Simulator Release WK2 (Tests)"]
</del><ins>+ "builderNames": ["Apple iOS 9 Simulator Release WK2 (Tests)"]
</ins><span class="cx"> },
</span><span class="cx"> { "type": "Triggerable", "name": "win-release-tests",
</span><span class="cx"> "builderNames": ["Apple Win 7 Release (Tests)"]
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (190373 => 190374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-09-30 23:34:23 UTC (rev 190373)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-09-30 23:56:51 UTC (rev 190374)
</span><span class="lines">@@ -408,10 +408,10 @@
</span><span class="cx"> 'Apple El Capitan Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
</span><span class="cx"> 'Apple El Capitan Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
</span><span class="cx">
</span><del>- 'Apple iOS Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
- 'Apple iOS Simulator Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
- 'Apple iOS Simulator Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
- 'Apple iOS Simulator Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
</del><ins>+ 'Apple iOS 9 Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
+ 'Apple iOS 9 Simulator Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
+ 'Apple iOS 9 Simulator Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+ 'Apple iOS 9 Simulator Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
</ins><span class="cx">
</span><span class="cx"> 'EFL Linux 64-bit Release WK2' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'jscore-test', 'layout-test', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'archive-test-results', 'upload', 'MasterShellCommand', 'API tests'],
</span><span class="cx"> 'EFL Linux 64-bit Release WK2 (Perf)' : ['configure build', 'wait-for-svn-server', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'jhbuild', 'compile-webkit', 'perf-test'],
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (190373 => 190374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-30 23:34:23 UTC (rev 190373)
+++ trunk/Tools/ChangeLog 2015-09-30 23:56:51 UTC (rev 190374)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-09-30 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ Rename iOS builders/testers to include version
+ https://bugs.webkit.org/show_bug.cgi?id=149685
+
+ Reviewed by Simon Fraser.
+
+ Substitute "Apple iOS 9" for "Apple iOS" in the names of iOS builders/testers so as
+ make it clear to a reader the version of iOS these builders/testers are using.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+
+2015-09-30 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> Add iOS criterion for triggering a build
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149679
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>