<!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>[187172] 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/187172">187172</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-22 12:00:39 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo.
https://bugs.webkit.org/show_bug.cgi?id=147043
Patch by Jason Marcell <jmarcell@apple.com> on 2015-07-22
Reviewed by Daniel Bates and Alexey Proskuryakov.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
(Buildbot.prototype._normalizeQueueInfo):
The _normalizeQueueInfo method now calls the defaultBranches getter instead of using hardcoded values
in cases where the queue.branch property is not set and the queue is not a combined queue.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:
(BuildbotCombinedQueueView):
Ensuring uniformity of repository branches within a combined queue.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot.prototype.get defaultBranches):
Added; provides a WebKit-specific implementation that sets the queue.branches dictionary to have a
single entry for "openSource" as the default set of branches. Note that we intentionally omitted a
base class implementation of the defaultBranches getter so as to cause a JavaScript TypeError when a
sub-queue of a combined queue does not specify property branch and the derived Buildbot class does not
implement defaultBranches so that a person can either update the definition of the sub-queue or
implement defaultBranches in the derived Buildbot class they are using.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotCombinedQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsWebKitBuildbotjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js (187171 => 187172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2015-07-22 18:52:47 UTC (rev 187171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js 2015-07-22 19:00:39 UTC (rev 187172)
</span><span class="lines">@@ -102,7 +102,8 @@
</span><span class="cx">
</span><span class="cx"> _normalizeQueueInfo: function(queueInfo)
</span><span class="cx"> {
</span><del>- queueInfo.branch = queueInfo.branch || { openSource: "trunk", internal: "trunk" };
</del><ins>+ if (!queueInfo.combinedQueues)
+ queueInfo.branch = queueInfo.branch || this.defaultBranches;
</ins><span class="cx"> queueInfo.debug = queueInfo.debug || false;
</span><span class="cx"> queueInfo.builder = queueInfo.builder || false;
</span><span class="cx"> queueInfo.tester = queueInfo.tester || false;
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotCombinedQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js (187171 => 187172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js 2015-07-22 18:52:47 UTC (rev 187171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js 2015-07-22 19:00:39 UTC (rev 187172)
</span><span class="lines">@@ -25,10 +25,22 @@
</span><span class="cx">
</span><span class="cx"> BuildbotCombinedQueueView = function(queue)
</span><span class="cx"> {
</span><del>- for (var i = 1, end = queue.combinedQueues.length; i < end; ++i) {
</del><ins>+ console.assert(queue.branch === undefined);
+ var indexOfFirstQueueWithRepository = {};
+ for (var i = 0, end = queue.combinedQueues.length; i < end; ++i) {
</ins><span class="cx"> console.assert(queue.combinedQueues[0].buildbot === queue.combinedQueues[i].buildbot);
</span><del>- console.assert(queue.combinedQueues[0].branch.openSource === queue.combinedQueues[i].branch.openSource);
- console.assert(queue.combinedQueues[0].branch.internal === queue.combinedQueues[i].branch.internal);
</del><ins>+ var branches = queue.combinedQueues[i].branch;
+ for (var repository in branches) {
+ var indexOfFirstQueue = indexOfFirstQueueWithRepository[repository];
+ if (indexOfFirstQueue === undefined) {
+ indexOfFirstQueueWithRepository[repository] = i;
+ continue;
+ }
+ var message = queue.id + ": combinedQueues[" + i + "].branch[" + repository + "]";
+ message += " === combinedQueues[" + indexOfFirstQueue + "].branch[" + repository + "]";
+ console.assert(queue.combinedQueues[i].branch[repository]
+ === queue.combinedQueues[indexOfFirstQueue].branch[repository], message);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BuildbotQueueView.call(this, queue.combinedQueues);
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsWebKitBuildbotjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (187171 => 187172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2015-07-22 18:52:47 UTC (rev 187171)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2015-07-22 19:00:39 UTC (rev 187172)
</span><span class="lines">@@ -75,6 +75,11 @@
</span><span class="cx"> __proto__: Buildbot.prototype,
</span><span class="cx"> performanceDashboardURL: "https://perf.webkit.org",
</span><span class="cx">
</span><ins>+ get defaultBranches()
+ {
+ return { openSource: "trunk" };
+ },
+
</ins><span class="cx"> layoutTestResultsDirectoryURLForIteration: function(iteration)
</span><span class="cx"> {
</span><span class="cx"> return this.baseURL + "results/" + encodeURIComponent(iteration.queue.id) + "/" + encodeURIComponent("r" + iteration.openSourceRevision + " (" + iteration.id + ")");
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (187171 => 187172)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-07-22 18:52:47 UTC (rev 187171)
+++ trunk/Tools/ChangeLog 2015-07-22 19:00:39 UTC (rev 187172)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-07-22 Jason Marcell <jmarcell@apple.com>
+
+ Remove hardcoded "internal" from Buildbot.prototype._normalizeQueueInfo.
+ https://bugs.webkit.org/show_bug.cgi?id=147043
+
+ Reviewed by Daniel Bates and Alexey Proskuryakov.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Buildbot.js:
+ (Buildbot.prototype._normalizeQueueInfo):
+ The _normalizeQueueInfo method now calls the defaultBranches getter instead of using hardcoded values
+ in cases where the queue.branch property is not set and the queue is not a combined queue.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotCombinedQueueView.js:
+ (BuildbotCombinedQueueView):
+ Ensuring uniformity of repository branches within a combined queue.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js:
+ (WebKitBuildbot.prototype.get defaultBranches):
+ Added; provides a WebKit-specific implementation that sets the queue.branches dictionary to have a
+ single entry for "openSource" as the default set of branches. Note that we intentionally omitted a
+ base class implementation of the defaultBranches getter so as to cause a JavaScript TypeError when a
+ sub-queue of a combined queue does not specify property branch and the derived Buildbot class does not
+ implement defaultBranches so that a person can either update the definition of the sub-queue or
+ implement defaultBranches in the derived Buildbot class they are using.
+
</ins><span class="cx"> 2015-07-22 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Switch WinCairo build to use CMake.
</span></span></pre>
</div>
</div>
</body>
</html>