Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js (97189 => 97190)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js 2011-10-11 22:51:46 UTC (rev 97189)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js 2011-10-11 23:04:15 UTC (rev 97190)
@@ -30,9 +30,10 @@
var kBuildingResult = 'BUILDING';
-ui.failures.Configuration = base.extends('a', {
- init: function(configuration)
+ui.failures.Builder = base.extends('a', {
+ init: function(builderName)
{
+ var configuration = config.kBuilders[builderName];
if (configuration.version)
this._addSpan('version', configuration.version);
if (configuration.isCG)
@@ -40,7 +41,9 @@
if (configuration.is64bit)
this._addSpan('architecture', '64-bit');
this._configuration = configuration;
+ this.className = 'failing-builder';
this.target = '_blank';
+ this.href = ""
},
_addSpan: function(className, text)
{
@@ -107,7 +110,7 @@
var cell = cellByBuildType(row, configuration);
if (cellContainsConfiguration(cell, configuration))
return;
- cell.appendChild(new ui.failures.Configuration(configuration)).href = ""
+ cell.appendChild(new ui.failures.Builder(builderName));
}, this);
},
purge: function()
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js (97189 => 97190)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2011-10-11 22:51:46 UTC (rev 97189)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2011-10-11 23:04:15 UTC (rev 97190)
@@ -27,27 +27,25 @@
module('ui.failures');
-test('Configuration', 8, function() {
+test('Builder', 7, function() {
raises(function() {
- new ui.failures.Configuration();
+ new ui.failures.Builder();
});
var configuration;
- configuration = new ui.failures.Configuration({});
+ configuration = new ui.failures.Builder("Webkit Linux");
deepEqual(Object.getOwnPropertyNames(configuration.__proto__).sort(), [
'_addSpan',
'equals',
'init',
]);
- equal(configuration.outerHTML, '<a target="_blank"></a>');
- configuration = new ui.failures.Configuration({is64bit: true, version: 'lucid'});
- equal(configuration.outerHTML, '<a target="_blank"><span class="version">lucid</span><span class="architecture">64-bit</span></a>');
- configuration = new ui.failures.Configuration({version: 'xp'});
- equal(configuration.outerHTML, '<a target="_blank"><span class="version">xp</span></a>');
+ equal(configuration.outerHTML, '<a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a>');
+ configuration = new ui.failures.Builder("Webkit Win");
+ equal(configuration.outerHTML, '<a class="failing-builder" target="_blank" href="" class="version">xp</span></a>');
configuration._addSpan('foo', 'bar');
- equal(configuration.outerHTML, '<a target="_blank"><span class="version">xp</span><span class="foo">bar</span></a>');
+ equal(configuration.outerHTML, '<a class="failing-builder" target="_blank" href="" class="version">xp</span><span class="foo">bar</span></a>');
ok(configuration.equals({version: 'xp'}));
- ok(!configuration.equals({version: 'lucid',is64bit: true}));
+ ok(!configuration.equals({version: 'lucid', is64bit: true}));
});
test('FailureGrid', 10, function() {
@@ -94,7 +92,7 @@
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td>BUILDING</td><td></td><td></td></tr>' +
'</tbody>' +
@@ -105,13 +103,13 @@
'<tbody>' +
'<tr class="IMAGE+TEXT">' +
'<td>IMAGE+TEXT</td>' +
- '<td><a 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><span class="graphics">CG</span></a></td>' +
'<td></td>' +
'</tr>' +
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td>BUILDING</td><td></td><td></td></tr>' +
'</tbody>' +
@@ -122,13 +120,13 @@
'<tbody>' +
'<tr class="IMAGE+TEXT">' +
'<td>IMAGE+TEXT</td>' +
- '<td><a 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><span class="graphics">CG</span></a></td>' +
'<td></td>' +
'</tr>' +
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td>BUILDING</td><td></td><td></td></tr>' +
'</tbody>' +
@@ -141,7 +139,7 @@
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td>BUILDING</td><td></td><td></td></tr>' +
'</tbody>' +
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js (97189 => 97190)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js 2011-10-11 22:51:46 UTC (rev 97189)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js 2011-10-11 23:04:15 UTC (rev 97190)
@@ -255,11 +255,8 @@
{
$(this._effects).empty().append(builderNameList.map(function(builderName) {
var effect = document.createElement('li');
- effect.className = 'builder-name';
- var link = effect.appendChild(document.createElement('a'));
- link.target = '_blank';
- link.href = ""
- link.textContent = ui.displayNameForBuilder(builderName);
+ effect.className = 'builder';
+ effect.appendChild(new ui.failures.Builder(builderName));
return effect;
}));
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js (97189 => 97190)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2011-10-11 22:51:46 UTC (rev 97189)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2011-10-11 23:04:15 UTC (rev 97190)
@@ -209,7 +209,7 @@
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="display: none; "><td>BUILDING</td><td></td><td></td></tr>' +
'</tbody>' +
@@ -250,11 +250,11 @@
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
+ '<td><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></td>' +
'</tr>' +
'<tr class="BUILDING" style="">' +
'<td>BUILDING</td>' +
- '<td><a 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><span class="graphics">CG</span></a></td>' +
'<td></td>' +
'</tr>' +
'</tbody>' +
@@ -318,7 +318,7 @@
test('BuildersFailing', 1, function() {
var builderFailing = new ui.notifications.BuildersFailing();
- builderFailing.setFailingBuilders(['WebKit Linux', 'Webkit Vista']);
+ builderFailing.setFailingBuilders(['Webkit Linux', 'Webkit Vista']);
equal(builderFailing.innerHTML,
'<div class="how">' +
'<time class="relative"></time>' +
@@ -326,8 +326,8 @@
'<div class="what">' +
'<div class="problem">Build Failed:' +
'<ul class="effects">' +
- '<li class="builder-name"><a target="_blank" href="" Linux</a></li>' +
- '<li class="builder-name"><a target="_blank" href="" +
+ '<li class="builder"><a class="failing-builder" target="_blank" href="" class="version">lucid</span><span class="architecture">64-bit</span></a></li>' +
+ '<li class="builder"><a class="failing-builder" target="_blank" href="" class="version">vista</span></a></li>' +
'</ul>' +
'</div>' +
'<ul class="causes"></ul>' +
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/failures.css (97189 => 97190)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/failures.css 2011-10-11 22:51:46 UTC (rev 97189)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/failures.css 2011-10-11 23:04:15 UTC (rev 97190)
@@ -26,3 +26,28 @@
.failures .BUILDING {
opacity: 0.5;
}
+
+a.failing-builder {
+ display: inline-block;
+ border: 1px solid Gray;
+ margin: 0 0 2px 0;
+ padding: 1px;
+ color: Black;
+ font-size: 11px;
+ text-decoration: none;
+}
+
+ a.failing-builder>span.version {
+ text-transform: uppercase;
+ background-color: #555;
+ color: White;
+ padding: 0 2px;
+ }
+
+ a.failing-builder>span.architecture {
+ padding: 0 2px;
+ }
+
+ a.failing-builder>span.graphics {
+ padding: 0 2px;
+ }
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css (97189 => 97190)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css 2011-10-11 22:51:46 UTC (rev 97189)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css 2011-10-11 23:04:15 UTC (rev 97190)
@@ -63,9 +63,9 @@
-webkit-box-flex: 1;
}
- ol.notifications>li div.what ul.effects>li.builder-name {
+ ol.notifications>li div.what ul.effects>li.builder {
display: inline;
- padding-left: 10px;
+ padding-left: 5px;
}
ol.notifications ul.causes>li, ol.notifications div.problem {
@@ -193,27 +193,3 @@
ol.notifications table.failures tbody tr td:first-child {
vertical-align: top;
}
-
- ol.notifications table.failures tbody td:nth-child(n+2)>a {
- display: inline-block;
- border: 1px solid Gray;
- margin: 0 0 2px 0;
- padding: 1px;
- color: Black;
- text-decoration: none;
- }
-
- ol.notifications table.failures tbody td:nth-child(n+2)>a>span.version {
- text-transform: uppercase;
- background-color: #555;
- color: White;
- padding: 0 2px;
- }
-
- ol.notifications table.failures tbody td:nth-child(n+2)>a>span.architecture {
- padding: 0 2px;
- }
-
- ol.notifications table.failures tbody td:nth-child(n+2)>a>span.graphics {
- padding: 0 2px;
- }
Modified: trunk/Tools/ChangeLog (97189 => 97190)
--- trunk/Tools/ChangeLog 2011-10-11 22:51:46 UTC (rev 97189)
+++ trunk/Tools/ChangeLog 2011-10-11 23:04:15 UTC (rev 97190)
@@ -1,3 +1,26 @@
+2011-10-11 Adam Barth <aba...@webkit.org>
+
+ Failing builder display in garden-o-matic should have the same visual style as the failure grid
+ https://bugs.webkit.org/show_bug.cgi?id=69876
+
+ Reviewed by Dimitri Glazkov.
+
+ This patch generalizes the view we use for failing builders in the
+ FailureGrid so that we can use it for the list of builders that aren't
+ compiling.
+
+ One downside of this patch is that it makes it harder to tell when
+ debug builders are failing (as opposed to release builders) because
+ that information isn't presented in this view. A future patch will
+ improve this aspect.
+
+ * 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.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/failures.css:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css:
+
2011-10-11 Filip Pizlo <fpi...@apple.com>
Some API tests are timing out in Release
