Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js (137663 => 137664)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-12-13 23:21:54 UTC (rev 137663)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-12-13 23:27:42 UTC (rev 137664)
@@ -30,45 +30,26 @@
var kCheckoutUnavailableMessage = 'Failed! Garden-o-matic needs a local server to modify your working copy. Please run "webkit-patch garden-o-matic" start the local server.';
// FIXME: Where should this function go?
-function rebaselineWithStatusUpdates(failureInfoList, resultsByTest)
+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();
var testNames = base.uniquifyArray(failureInfoList.map(function(failureInfo) { return failureInfo.testName; }));
+ var testName = testNames.length == 1 ? testNames[0] : testNames.length + ' tests';
+ statusView.addMessage(id, 'Performing rebaseline of ' + testName + '...');
- var failuresToRebaseline = [];
- testNames.forEach(function(testName) {
- if (isAnyReftest(testName, resultsByTest))
- statusView.addMessage(id, testName + ' is a ref test, skipping');
- else {
- failuresToRebaseline.push(testName);
- statusView.addMessage(id, 'Rebaselining ' + testName + '...');
- }
+ checkout.rebaseline(failureInfoList, function() {
+ statusView.addFinalMessage(id, 'Rebaseline done! Please land with "webkit-patch land-cowhand".');
+ }, function(failureInfo) {
+ statusView.addMessage(id, failureInfo.testName + ' on ' + ui.displayNameForBuilder(failureInfo.builderName));
+ }, function() {
+ statusView.addFinalMessage(id, kCheckoutUnavailableMessage);
});
-
- if (failuresToRebaseline.length) {
- checkout.rebaseline(failuresToRebaseline, function() {
- statusView.addFinalMessage(id, 'Rebaseline done! Please land with "webkit-patch land-cowhand".');
- }, function(failureInfo) {
- statusView.addMessage(id, failureInfo.testName + ' on ' + ui.displayNameForBuilder(failureInfo.builderName));
- }, function() {
- statusView.addFinalMessage(id, kCheckoutUnavailableMessage);
- });
- } else
- statusView.addFinalMessage(id, 'No tests left to rebaseline!')
}
-// FIXME: This is duplicated from ui/results.js :(.
-function isAnyReftest(testName, resultsByTest)
-{
- return Object.keys(resultsByTest[testName]).map(function(builder) {
- return resultsByTest[testName][builder];
- }).some(function(resultNode) {
- return resultNode.reftest_type && resultNode.reftest_type.length;
- });
-}
-
// FIXME: Where should this function go?
function updateExpectationsWithStatusUpdates(failureInfoList)
{
@@ -117,7 +98,7 @@
},
onRebaseline: function()
{
- rebaselineWithStatusUpdates(this._failureInfoList(), this._resultsByTest);
+ rebaselineWithStatusUpdates(this._failureInfoList());
this._view.nextTest();
},
onUpdateExpectations: function()
@@ -225,14 +206,7 @@
},
onRebaseline: function(failures)
{
- var testNameList = failures.testNameList();
- var failuresByTest = base.filterDictionary(
- this._resultsFilter(this._model.resultsByBuilder),
- function(key) {
- return testNameList.indexOf(key) != -1;
- });
-
- rebaselineWithStatusUpdates(this._toFailureInfoList(failures), failuresByTest);
+ rebaselineWithStatusUpdates(this._toFailureInfoList(failures));
},
onUpdateExpectations: function(failures)
{
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js (137663 => 137664)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js 2012-12-13 23:21:54 UTC (rev 137663)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js 2012-12-13 23:27:42 UTC (rev 137664)
@@ -187,7 +187,7 @@
return Object.keys(resultsByTest[testName]).map(function(builder) {
return resultsByTest[testName][builder];
}).some(function(resultNode) {
- return resultNode.reftest_type && resultNode.reftest_type.length;
+ return resultNode.is_reftest || resultNode.is_mismatch_reftest
});
}
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js (137663 => 137664)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js 2012-12-13 23:21:54 UTC (rev 137663)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js 2012-12-13 23:27:42 UTC (rev 137664)
@@ -68,14 +68,14 @@
"Mock Builder": {
"expected": "PASS",
"actual": "IMAGE",
- "reftest_type": ["=="]
+ "is_reftest": true
}
},
"mismatch-reftest.html": {
"Mock Builder": {
"expected": "PASS",
"actual": "IMAGE",
- "reftest_type": ["!="]
+ "is_mismatch_reftest": true
}
}
};
Modified: trunk/Tools/ChangeLog (137663 => 137664)
--- trunk/Tools/ChangeLog 2012-12-13 23:21:54 UTC (rev 137663)
+++ trunk/Tools/ChangeLog 2012-12-13 23:27:42 UTC (rev 137664)
@@ -1,3 +1,20 @@
+2012-12-13 Dirk Pranke <dpra...@chromium.org>
+
+ Revert r137407 - it didn't actually work right.
+ https://bugs.webkit.org/show_bug.cgi?id=101976
+
+ Unreviewed, build fix.
+
+ Turns out that rebaselining was completely broken with this change :(
+ We're passing in a list of test names rather than the list of
+ failureInfo objects.
+
+ * 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/scripts/ui/results_unittests.js:
+
2012-12-13 Antoine Labour <pi...@chromium.org>
[chromium] Small fixes for WebPluginContainer::setWebLayer
