Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js (112148 => 112149)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-03-26 21:43:55 UTC (rev 112148)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-03-26 21:56:01 UTC (rev 112149)
@@ -32,6 +32,8 @@
// FIXME: Where should this function go?
function rebaselineWithStatusUpdates(failureInfoList)
{
+ // FIXME: If a test is a reftest, webkit-patch rebaseline-test should error out
+ // and we should alert (modal dialog?) the user.
var statusView = new ui.StatusArea('Rebaseline');
var id = statusView.newId();
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js (112148 => 112149)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js 2012-03-26 21:43:55 UTC (rev 112148)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js 2012-03-26 21:56:01 UTC (rev 112149)
@@ -171,6 +171,15 @@
$(this).trigger('customaccordionclick');
})
+function isAnyReftest(testName, resultsByTest)
+{
+ return Object.keys(resultsByTest[testName]).map(function(builder) {
+ return resultsByTest[testName][builder];
+ }).some(function(resultNode) {
+ return resultNode.is_reftest || resultNode.is_mismatch_reftest
+ });
+}
+
ui.results.TestSelector = base.extends('div', {
init: function(delegate, resultsByTest)
{
@@ -188,9 +197,12 @@
$(linkTitle).attr('href', ui.urlForFlakinessDashboard([testName])).text(testName);
var header = document.createElement('h3');
- $(header).append(new ui.actions.List([
- new ui.actions.Rebaseline().makeDefault(),
- ])).append(nonLinkTitle).append(linkTitle);
+ if (isAnyReftest(testName, resultsByTest))
+ $(header).append('<div class="non-action-button">Reftests cannot be rebaselined. Email [email protected] if unsure how to fix this.</div>');
+ else
+ $(header).append(new ui.actions.List([new ui.actions.Rebaseline().makeDefault()]));
+
+ $(header).append(nonLinkTitle).append(linkTitle);
this.appendChild(header);
this.appendChild(this._delegate.contentForTest(testName));
++this._length; // There doesn't seem to be any good way to get this information from accordion.
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js (112148 => 112149)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js 2012-03-26 21:43:55 UTC (rev 112148)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js 2012-03-26 21:56:01 UTC (rev 112149)
@@ -44,8 +44,25 @@
"actual": "TEXT"
}
}
-}
+};
+var kExampleReftestResults = {
+ "reftest.html": {
+ "Mock Builder": {
+ "expected": "PASS",
+ "actual": "IMAGE",
+ "is_reftest": true
+ }
+ },
+ "mismatch-reftest.html": {
+ "Mock Builder": {
+ "expected": "PASS",
+ "actual": "IMAGE",
+ "is_mismatch_reftest": true
+ }
+ }
+};
+
var kExampleResultsWithTimeoutByTest = {
"fast/not-fast-test.html": {
"Mock Builder": {
@@ -53,7 +70,7 @@
"actual": "TIMEOUT"
}
}
-}
+};
test('View', 8, function() {
var delegate = {
@@ -77,6 +94,18 @@
equals($($('.builder-selector', view)[0]).tabs('option', 'selected'), 1);
});
+test('View', 2, function() {
+ var delegate = {
+ fetchResultsURLs: function(failureInfo, callback) { return; }
+ };
+
+ var view = new ui.results.View(delegate);
+ view.setResultsByTest(kExampleReftestResults);
+
+ equals($('.non-action-button', view).length, 2);
+ equals($('.action', view).length, 0);
+});
+
test('View of timeouts', 1, function() {
var delegate = {
fetchResultsURLs: function(failureInfo, callback) { callback([]); }
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css (112148 => 112149)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css 2012-03-26 21:43:55 UTC (rev 112148)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css 2012-03-26 21:56:01 UTC (rev 112149)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-.results-view ul.actions, .ui-dialog ul.actions {
+.non-action-button, .results-view ul.actions, .ui-dialog ul.actions {
float: right;
margin: 0;
padding: 5px 0px;
@@ -31,6 +31,10 @@
display: inline-block;
}
+.non-action-button {
+ padding: 5px;
+}
+
.results-view ul.actions li, .ui-dialog ul.actions li {
display: inline-block;
}
Modified: trunk/Tools/ChangeLog (112148 => 112149)
--- trunk/Tools/ChangeLog 2012-03-26 21:43:55 UTC (rev 112148)
+++ trunk/Tools/ChangeLog 2012-03-26 21:56:01 UTC (rev 112149)
@@ -1,3 +1,19 @@
+2012-03-26 Ojan Vafai <[email protected]>
+
+ garden-o-matic should special case reftests
+ https://bugs.webkit.org/show_bug.cgi?id=81812
+
+ Reviewed by Adam Barth.
+
+ On the examine page, don't show a rebaseline button for reftests.
+ We still show it on the failure summary page because tests are grouped
+ together. Long-term, we should make sure webkit-patch rebaseline-test
+ never tries to rebaseline reftests.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js:
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css:
+
2012-03-26 Dirk Pranke <[email protected]>
clean up NRWT logging/metering, be less verbose
