Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders.js (93657 => 93658)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders.js 2011-08-23 23:32:34 UTC (rev 93657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders.js 2011-08-23 23:33:57 UTC (rev 93658)
@@ -83,9 +83,10 @@
function fetchMostRecentBuildInfoByBuilder(callback)
{
var buildInfoByBuilder = {};
- var requestTracker = new base.RequestTracker(config.kBuilders.length, callback, [buildInfoByBuilder]);
+ var builderNames = Object.keys(config.kBuilders);
+ var requestTracker = new base.RequestTracker(builderNames.length, callback, [buildInfoByBuilder]);
net.get(kChromiumBuildBotURL + '/json/builders', function(builderStatus) {
- $.each(config.kBuilders, function(index, builderName) {
+ $.each(builderNames, function(index, builderName) {
var buildNumber = mostRecentCompletedBuildNumber(builderStatus[builderName]);
if (!buildNumber) {
buildInfoByBuilder[builderName] = null;
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js (93657 => 93658)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2011-08-23 23:32:34 UTC (rev 93657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2011-08-23 23:33:57 UTC (rev 93658)
@@ -27,22 +27,22 @@
(function() {
-config.kBuilders = [
- 'Webkit Win',
- 'Webkit Vista',
- 'Webkit Win7',
- 'Webkit Win (dbg)(1)',
- 'Webkit Win (dbg)(2)',
- 'Webkit Linux',
- 'Webkit Linux 32',
- 'Webkit Linux (dbg)(1)',
- 'Webkit Linux (dbg)(2)',
- 'Webkit Mac10.5 (CG)',
- 'Webkit Mac10.5 (CG)(dbg)(1)',
- 'Webkit Mac10.5 (CG)(dbg)(2)',
- 'Webkit Mac10.6 (CG)',
- 'Webkit Mac10.6 (CG)(dbg)',
-];
+config.kBuilders = {
+ 'Webkit Win': {version: 'xp'},
+ 'Webkit Vista': {version: 'vista'},
+ 'Webkit Win7': {version: 'win7'},
+ 'Webkit Win (dbg)(1)': {version: 'xp', debug: true},
+ 'Webkit Win (dbg)(2)': {version: 'xp', debug: true},
+ 'Webkit Linux': {version: 'lucid', is64bit: true},
+ 'Webkit Linux 32': {version: 'lucid'},
+ 'Webkit Linux (dbg)(1)': {version: 'lucid', is64bit: true, debug: true},
+ 'Webkit Linux (dbg)(2)': {version: 'lucid', is64bit: true, debug: true},
+ 'Webkit Mac10.5 (CG)': {version: 'leopard'},
+ 'Webkit Mac10.5 (CG)(dbg)(1)': {version: 'leopard', debug: true},
+ 'Webkit Mac10.5 (CG)(dbg)(2)': {version: 'leopard', debug: true},
+ 'Webkit Mac10.6 (CG)': {version: 'snowleopard'},
+ 'Webkit Mac10.6 (CG)(dbg)': {version: 'snowleopard', debug: true},
+};
config.kBuildersThatOnlyCompile = [
'Webkit Win Builder',
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/main.js (93657 => 93658)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/main.js 2011-08-23 23:32:34 UTC (rev 93657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/main.js 2011-08-23 23:33:57 UTC (rev 93658)
@@ -245,7 +245,7 @@
function showBuilderProgress()
{
$.each(model.state.resultsByBuilder, function(builderName, resultsTree) {
- var builderIndex = config.kBuilders.indexOf(builderName);
+ var builderIndex = Object.keys(config.kBuilders).indexOf(builderName);
rowsBeforeRevision(resultsTree.revision).each(function() {
$($(this).children()[builderIndex]).addClass('built');
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js (93657 => 93658)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js 2011-08-23 23:32:34 UTC (rev 93657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js 2011-08-23 23:33:57 UTC (rev 93658)
@@ -131,7 +131,7 @@
model.updateResultsByBuilder = function(callback)
{
- results.fetchResultsByBuilder(config.kBuilders, function(resultsByBuilder) {
+ results.fetchResultsByBuilder(Object.keys(config.kBuilders), function(resultsByBuilder) {
model.state.resultsByBuilder = resultsByBuilder;
callback();
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js (93657 => 93658)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js 2011-08-23 23:32:34 UTC (rev 93657)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js 2011-08-23 23:33:57 UTC (rev 93658)
@@ -89,7 +89,7 @@
var list = [];
- $.each(config.kBuilders, function(index, builderName) {
+ $.each(Object.keys(config.kBuilders), function(index, builderName) {
var block = $('<td class="builder"></td>');
block.attr('title', ui.displayNameForBuilder(builderName));
block.attr(config.kBuilderNameAttr, builderName);
Modified: trunk/Tools/ChangeLog (93657 => 93658)
--- trunk/Tools/ChangeLog 2011-08-23 23:32:34 UTC (rev 93657)
+++ trunk/Tools/ChangeLog 2011-08-23 23:33:57 UTC (rev 93658)
@@ -1,3 +1,16 @@
+2011-08-23 Dimitri Glazkov <[email protected]>
+
+ Change garden-o-matic frontend builder array to be a configuration map.
+ https://bugs.webkit.org/show_bug.cgi?id=66816
+
+ Reviewed by Adam Barth.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders.js: Made kBuilders a map, with value being a configuration object.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js: Adjusted callsites to expect a map.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/main.js: Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/model.js: Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js: Ditto.
+
2011-08-23 Cary Clark <[email protected]>
Turn WebCanvas into CGContext before drawing scrollbar (DRT using Skia on Mac)
