Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -71,7 +71,7 @@
});
});
-test("rebaseline", 7, function() {
+test("rebaseline", 6, function() {
var simulator = new NetworkSimulator();
var requestedURLs = [];
@@ -82,7 +82,8 @@
};
simulator.ajax = function(options)
{
- ok(options.url.indexOf('/ping') != -1);
+ if (options.url.indexOf('/ping') != -1)
+ ok(false, 'Recieved non-ping ajax request.');
simulator.scheduleCallback(options.success);
};
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -42,11 +42,11 @@
'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'},
- '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},
+ '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/garden-o-matic.js (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -31,7 +31,6 @@
var g_buildersFailing = null;
var g_unexpectedFailuresController = null;
-var g_failuresController = null;
var g_failingBuilders = null;
@@ -77,9 +76,6 @@
var unexpectedFailuresView = new ui.notifications.Stream();
g_unexpectedFailuresController = new controllers.UnexpectedFailures(model.state, unexpectedFailuresView, onebarController);
- var failuresView = new ui.notifications.Stream();
- g_failuresController = new controllers.Failures(model.state, failuresView, onebarController);
-
g_info = new ui.notifications.Stream();
g_failingBuilders = new controllers.FailingBuilders(g_info);
@@ -93,9 +89,6 @@
summary.appendChild(g_info);
summary.appendChild(unexpectedFailuresView);
- var failures = onebar.failures();
- failures.appendChild(failuresView);
-
update();
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -33,10 +33,12 @@
ui.failures.Configuration = base.extends('a', {
init: function(configuration)
{
+ if (configuration.version)
+ this._addSpan('version', configuration.version);
+ if (configuration.isCG)
+ this._addSpan('graphics', 'CG');
if (configuration.is64bit)
this._addSpan('architecture', '64-bit');
- if (configuration.version)
- this._addSpan('version', configuration.version);
this._configuration = configuration;
this.target = '_blank';
},
@@ -48,7 +50,7 @@
},
equals: function(configuration)
{
- return this._configuration.is64bit == configuration.is64bit && this._configuration.version == configuration.version;
+ return this._configuration.is64bit == configuration.is64bit && this._configuration.isCG == configuration.isCG && this._configuration.version == configuration.version;
}
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/failures_unittests.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -41,7 +41,7 @@
]);
equal(configuration.outerHTML, '<a target="_blank"></a>');
configuration = new ui.failures.Configuration({is64bit: true, version: 'lucid'});
- equal(configuration.outerHTML, '<a target="_blank"><span class="architecture">64-bit</span><span class="version">lucid</span></a>');
+ 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>');
configuration._addSpan('foo', 'bar');
@@ -93,7 +93,7 @@
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="architecture">64-bit</span><span class="version">lucid</span></a></td>' +
+ '<td><a 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>' +
@@ -104,13 +104,13 @@
'<tbody>' +
'<tr class="IMAGE+TEXT">' +
'<td>IMAGE+TEXT</td>' +
- '<td><a target="_blank" href="" class="version">leopard</span></a></td>' +
+ '<td><a 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="architecture">64-bit</span><span class="version">lucid</span></a></td>' +
+ '<td><a 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>' +
@@ -121,13 +121,13 @@
'<tbody>' +
'<tr class="IMAGE+TEXT">' +
'<td>IMAGE+TEXT</td>' +
- '<td><a target="_blank" href="" class="version">leopard</span></a></td>' +
+ '<td><a 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="architecture">64-bit</span><span class="version">lucid</span></a></td>' +
+ '<td><a 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 (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -100,10 +100,6 @@
{
this._description = this.appendChild(document.createElement('div'));
this._description.className = 'description';
- this.appendChild(new ui.actions.List([
- new ui.actions.Blame(),
- new ui.actions.Rollout(),
- ]));
}
});
@@ -159,7 +155,6 @@
this._problem.appendChild(new ui.actions.List([
new ui.actions.Examine().makeDefault(),
new ui.actions.Rebaseline(),
- new ui.actions.UpdateExpectations(),
]));
this._testNameList = [];
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -93,11 +93,7 @@
'<span class="author">author</span>' +
'<span class="reviewer">reviewer</span>' +
'</span>' +
- '</div>' +
- '<ul class="actions">' +
- '<li><button class="action" title="Blames this failure on this revision.">Blame</button></li>' +
- '<li><button class="action" title="Rolls out this revision.">Roll out</button></li>' +
- '</ul>');
+ '</div>');
});
test('FailingTestsSummary', 12, function() {
@@ -117,7 +113,6 @@
'<ul class="actions">' +
'<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
'<li><button class="action">Rebaseline</button></li>' +
- '<li><button class="action">Mark as Expected</button></li>' +
'</ul>' +
'</div>' +
'<ul class="causes"></ul>' +
@@ -140,7 +135,6 @@
'<ul class="actions">' +
'<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
'<li><button class="action">Rebaseline</button></li>' +
- '<li><button class="action">Mark as Expected</button></li>' +
'</ul>' +
'</div>' +
'<ul class="causes"></ul>' +
@@ -164,7 +158,6 @@
'<ul class="actions">' +
'<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
'<li><button class="action">Rebaseline</button></li>' +
- '<li><button class="action">Mark as Expected</button></li>' +
'</ul>' +
'</div>' +
'<ul class="causes"></ul>' +
@@ -190,7 +183,6 @@
'<ul class="actions">' +
'<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
'<li><button class="action">Rebaseline</button></li>' +
- '<li><button class="action">Mark as Expected</button></li>' +
'</ul>' +
'</div>' +
'<ul class="causes">' +
@@ -203,10 +195,6 @@
'<span class="reviewer">reviewer</span>' +
'</span>' +
'</div>' +
- '<ul class="actions">' +
- '<li><button class="action" title="Blames this failure on this revision.">Blame</button></li>' +
- '<li><button class="action" title="Rolls out this revision.">Roll out</button></li>' +
- '</ul>' +
'</li>' +
'</ul>' +
'</div>');
@@ -221,7 +209,7 @@
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="architecture">64-bit</span><span class="version">lucid</span></a></td>' +
+ '<td><a 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>' +
@@ -236,7 +224,6 @@
'<ul class="actions">' +
'<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
'<li><button class="action">Rebaseline</button></li>' +
- '<li><button class="action">Mark as Expected</button></li>' +
'</ul>' +
'</div>' +
'<ul class="causes">' +
@@ -249,10 +236,6 @@
'<span class="reviewer">reviewer</span>' +
'</span>' +
'</div>' +
- '<ul class="actions">' +
- '<li><button class="action" title="Blames this failure on this revision.">Blame</button></li>' +
- '<li><button class="action" title="Rolls out this revision.">Roll out</button></li>' +
- '</ul>' +
'</li>' +
'</ul>' +
'</div>');
@@ -267,11 +250,11 @@
'<tr class="TEXT">' +
'<td>TEXT</td>' +
'<td></td>' +
- '<td><a target="_blank" href="" class="architecture">64-bit</span><span class="version">lucid</span></a></td>' +
+ '<td><a 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></a></td>' +
+ '<td><a target="_blank" href="" class="version">leopard</span><span class="graphics">CG</span></a></td>' +
'<td></td>' +
'</tr>' +
'</tbody>' +
@@ -286,7 +269,6 @@
'<ul class="actions">' +
'<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
'<li><button class="action">Rebaseline</button></li>' +
- '<li><button class="action">Mark as Expected</button></li>' +
'</ul>' +
'</div>' +
'<ul class="causes">' +
@@ -299,10 +281,6 @@
'<span class="reviewer">reviewer</span>' +
'</span>' +
'</div>' +
- '<ul class="actions">' +
- '<li><button class="action" title="Blames this failure on this revision.">Blame</button></li>' +
- '<li><button class="action" title="Rolls out this revision.">Roll out</button></li>' +
- '</ul>' +
'</li>' +
'</ul>' +
'</div>');
@@ -332,7 +310,6 @@
'<ul class="actions">' +
'<li><button class="action default" title="Examine these failures in detail.">Examine</button></li>' +
'<li><button class="action">Rebaseline</button></li>' +
- '<li><button class="action">Mark as Expected</button></li>' +
'</ul>' +
'</div>' +
'<ul class="causes"></ul>' +
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.js 2011-10-02 17:18:28 UTC (rev 96473)
@@ -59,21 +59,15 @@
'<ul>' +
'<li><a href="" +
'<li><a href="" +
- '<li><a href="" +
- '<li><a href="" +
'</ul>' +
'<div id="summary"></div>' +
- '<div id="results"></div>' +
- '<div id="commits">Coming soon...</div>' +
- '<div id="failures"></div>';
+ '<div id="results"></div>';
this._tabNames = [
'summary',
'results',
- 'commits',
- 'failures',
]
this._tabs = $(this).tabs({
- disabled: [1, 2, 3],
+ disabled: [1],
});
},
attach: function()
@@ -92,10 +86,6 @@
{
return this.tabNamed('results');
},
- failures: function()
- {
- return this.tabNamed('failures');
- },
select: function(tabName)
{
var tabIndex = this._tabNames.indexOf(tabName);
@@ -162,7 +152,7 @@
{
this.addMessage(message);
this.appendChild(new ui.actions.List([new ui.actions.Close()]));
- $(this).bind('close', statusView.close.bind(statusView));
+ $(this).bind('close', this.close.bind(this));
}
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css (96472 => 96473)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css 2011-10-02 17:18:28 UTC (rev 96473)
@@ -47,7 +47,7 @@
}
ol.notifications div.how {
- width: 300px;
+ width: 350px;
}
ol.notifications time {
@@ -105,16 +105,15 @@
}
ol.notifications>li ul.causes>li>div.description>a {
- padding: 0 20px 0 10px;
+ padding: 5px 10px 5px 10px;
+ margin: -5px 10px -2px 0;
border-radius: 4px;
+ display: inline-block;
}
ol.notifications>li ul.causes>li:hover>div.description>a {
background-color: #555;
- padding: 5px 10px 5px 10px;
- margin: -5px 10px -1px 0;
color: White;
- display: inline-block;
}
ol.notifications>li ul.causes>li:hover>div.description>a::after {
@@ -171,7 +170,7 @@
border-collapse: collapse;
table-layout: fixed;
font-size: 11px;
- width: 300px;
+ width: 350px;
}
ol.notifications table.failures thead tr td:first-child {
@@ -182,8 +181,12 @@
border-top: 1px solid #eee;
}
+ ol.notifications table.failures tbody td:first-child {
+ width: 20%;
+ }
+
ol.notifications table.failures tbody td {
- width: 33%;
+ width: 40%;
padding: 2px;
}
@@ -208,5 +211,9 @@
}
ol.notifications table.failures tbody td:nth-child(n+2)>a>span.architecture {
- padding: 0 3px 0 0;
+ padding: 0 2px;
}
+
+ ol.notifications table.failures tbody td:nth-child(n+2)>a>span.graphics {
+ padding: 0 2px;
+ }
Modified: trunk/Tools/ChangeLog (96472 => 96473)
--- trunk/Tools/ChangeLog 2011-10-02 15:25:49 UTC (rev 96472)
+++ trunk/Tools/ChangeLog 2011-10-02 17:18:28 UTC (rev 96473)
@@ -1,3 +1,25 @@
+2011-10-02 Adam Barth <[email protected]>
+
+ Rip out half-backed garden-o-matic features in preparation for wider use
+ https://bugs.webkit.org/show_bug.cgi?id=69226
+
+ This patch rips out a bunch of half-baked features and cleans up a
+ bunch of small nits with the core set of features. We're going to ask
+ more folks to start using the tool, and having a bunch of half-baked
+ features around is distracting. We can add these features back under a
+ flag and interate on them after we've got the core functionality
+ nailed.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/garden-o-matic.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui.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.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/notifications_unittests.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/notifications.css:
+
2011-10-01 Brent Fulgham <[email protected]>
Correct post-build step for WinCairo test runs.
