Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js (104422 => 104423)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js 2012-01-09 00:49:44 UTC (rev 104422)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js 2012-01-09 01:01:39 UTC (rev 104423)
@@ -37,7 +37,7 @@
"slaves": ["vm124-m1"],
"state": "building"
},
- "Webkit Mac10.6 (CG)": {
+ "Webkit Mac10.6": {
"basedir": "Webkit_Linux",
"cachedBuilds": [11459, 11460, 11461, 11462],
"category": "6webkit linux latest",
@@ -598,7 +598,7 @@
callback(kExampleBuilderStatusJSON);
else if (/Webkit%20Linux/.exec(url))
callback(kExampleBuildInfoJSON);
- else if (/Webkit%20Mac10\.6%20\(CG\)/.exec(url))
+ else if (/Webkit%20Mac10\.6/.exec(url))
callback(failingBuildInfoJSON);
else {
ok(false, "Unexpected URL: " + url);
@@ -609,14 +609,14 @@
simulator.runTest(function() {
builders.buildersFailingStepRequredForTestCoverage(function(builderNameList) {
- deepEqual(builderNameList, ["Webkit Mac10.6 (CG)"]);
+ deepEqual(builderNameList, ["Webkit Mac10.6"]);
});
});
deepEqual(requestedURLs, [
"http://build.chromium.org/p/chromium.webkit/json/builders",
"http://build.chromium.org/p/chromium.webkit/json/builders/Webkit%20Linux/builds/11461",
- "http://build.chromium.org/p/chromium.webkit/json/builders/Webkit%20Mac10.6%20(CG)/builds/11460",
+ "http://build.chromium.org/p/chromium.webkit/json/builders/Webkit%20Mac10.6/builds/11460",
]);
});
@@ -624,7 +624,7 @@
var simulator = new NetworkSimulator();
var builderStatusJSON = JSON.parse(JSON.stringify(kExampleBuilderStatusJSON));
- delete builderStatusJSON['Webkit Mac10.6 (CG)'];
+ delete builderStatusJSON['Webkit Mac10.6'];
builderStatusJSON['Webkit Linux'].cachedBuilds = [21460];
builderStatusJSON['Webkit Linux'].currentBuilds = [];
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js (104422 => 104423)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2012-01-09 00:49:44 UTC (rev 104422)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2012-01-09 01:01:39 UTC (rev 104423)
@@ -42,11 +42,6 @@
'Webkit Mac10.5 (dbg)(2)': {version: 'leopard', debug: true},
'Webkit Mac10.6': {version: 'snowleopard'},
'Webkit Mac10.6 (dbg)': {version: 'snowleopard', debug: true},
- 'Webkit Mac10.5 (CG)': {version: 'leopard', isCG: true},
- 'Webkit Mac10.5 (CG)(dbg)(1)': {version: 'leopard', isCG: true, debug: true},
- 'Webkit Mac10.5 (CG)(dbg)(2)': {version: 'leopard', isCG: true, debug: true},
- 'Webkit Mac10.6 (CG)': {version: 'snowleopard', isCG: true},
- 'Webkit Mac10.6 (CG)(dbg)': {version: 'snowleopard', isCG: true, debug: true},
};
config.kBuildersThatOnlyCompile = [
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js (104422 => 104423)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js 2012-01-09 00:49:44 UTC (rev 104422)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js 2012-01-09 01:01:39 UTC (rev 104423)
@@ -36,8 +36,6 @@
var configuration = config.kBuilders[builderName];
if (configuration.version)
this._addSpan('version', configuration.version);
- if (configuration.isCG)
- this._addSpan('graphics', 'CG');
if (configuration.is64bit)
this._addSpan('architecture', '64-bit');
this._configuration = configuration;
@@ -53,7 +51,7 @@
},
equals: function(configuration)
{
- return this._configuration.is64bit == configuration.is64bit && this._configuration.isCG == configuration.isCG && this._configuration.version == configuration.version;
+ return this._configuration.is64bit == configuration.is64bit && this._configuration.version == configuration.version;
}
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js (104422 => 104423)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2012-01-09 00:49:44 UTC (rev 104422)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2012-01-09 01:01:39 UTC (rev 104423)
@@ -97,13 +97,13 @@
'<tr class="BUILDING" style="display: none; "><td><span>BUILDING</span></td><td></td><td></td></tr>' +
'</tbody>' +
'</table>');
- grid.update({'Webkit Mac10.5 (CG)': { actual: 'IMAGE+TEXT'}});
+ grid.update({'Webkit Mac10.5': { actual: 'IMAGE+TEXT'}});
equal(grid.outerHTML, '<table class="failures">' +
'<thead><tr><td>type</td><td>release</td><td>debug</td></tr></thead>' +
'<tbody>' +
'<tr class="IMAGE+TEXT">' +
'<td><span>IMAGE+TEXT</span></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">leopard</span><span class="graphics">CG</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">leopard</span></a></td>' +
'<td></td>' +
'</tr>' +
'<tr class="TEXT">' +
@@ -114,13 +114,13 @@
'<tr class="BUILDING" style="display: none; "><td><span>BUILDING</span></td><td></td><td></td></tr>' +
'</tbody>' +
'</table>');
- grid.update({'Webkit Mac10.5 (CG)': { actual: 'IMAGE+TEXT'}});
+ grid.update({'Webkit Mac10.5': { actual: 'IMAGE+TEXT'}});
equal(grid.outerHTML, '<table class="failures">' +
'<thead><tr><td>type</td><td>release</td><td>debug</td></tr></thead>' +
'<tbody>' +
'<tr class="IMAGE+TEXT">' +
'<td><span>IMAGE+TEXT</span></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">leopard</span><span class="graphics">CG</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">leopard</span></a></td>' +
'<td></td>' +
'</tr>' +
'<tr class="TEXT">' +
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js (104422 => 104423)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2012-01-09 00:49:44 UTC (rev 104422)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2012-01-09 01:01:39 UTC (rev 104423)
@@ -240,7 +240,7 @@
'</ul>' +
'</div>');
- testFailures.updateBuilderResults({'Webkit Mac10.5 (CG)': { actual: 'BUILDING'}});
+ testFailures.updateBuilderResults({'Webkit Mac10.5': { actual: 'BUILDING'}});
equal(testFailures.innerHTML,
'<div class="how">' +
'<time class="relative">10 minutes ago</time>' +
@@ -254,7 +254,7 @@
'</tr>' +
'<tr class="BUILDING" style="">' +
'<td><span>BUILDING</span></td>' +
- '<td><a class="failing-builder" target="_blank" href="" class="version">leopard</span><span class="graphics">CG</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">leopard</span></a></td>' +
'<td></td>' +
'</tr>' +
'</tbody>' +
Modified: trunk/Tools/ChangeLog (104422 => 104423)
--- trunk/Tools/ChangeLog 2012-01-09 00:49:44 UTC (rev 104422)
+++ trunk/Tools/ChangeLog 2012-01-09 01:01:39 UTC (rev 104423)
@@ -1,3 +1,19 @@
+2012-01-08 Adam Barth <[email protected]>
+
+ Remove support for Chromium Mac CG from garden-o-matic
+ https://bugs.webkit.org/show_bug.cgi?id=75814
+
+ Reviewed by Eric Seidel.
+
+ This configuration no longer exists. This patch is mostly a matter of
+ updating config.js and removing the examples from the unit tests.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
+
2012-01-08 No'am Rosenthal <[email protected]>
[Qt] Enable CSS_FILTERS in Qt build
