Changeset 112149 in webkit
- Timestamp:
- Mar 26, 2012 2:56:01 PM (12 years ago)
- Location:
- trunk/Tools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js
r111793 r112149 33 33 function rebaselineWithStatusUpdates(failureInfoList) 34 34 { 35 // FIXME: If a test is a reftest, webkit-patch rebaseline-test should error out 36 // and we should alert (modal dialog?) the user. 35 37 var statusView = new ui.StatusArea('Rebaseline'); 36 38 var id = statusView.newId(); -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js
r111917 r112149 172 172 }) 173 173 174 function isAnyReftest(testName, resultsByTest) 175 { 176 return Object.keys(resultsByTest[testName]).map(function(builder) { 177 return resultsByTest[testName][builder]; 178 }).some(function(resultNode) { 179 return resultNode.is_reftest || resultNode.is_mismatch_reftest 180 }); 181 } 182 174 183 ui.results.TestSelector = base.extends('div', { 175 184 init: function(delegate, resultsByTest) … … 189 198 190 199 var header = document.createElement('h3'); 191 $(header).append(new ui.actions.List([ 192 new ui.actions.Rebaseline().makeDefault(), 193 ])).append(nonLinkTitle).append(linkTitle); 200 if (isAnyReftest(testName, resultsByTest)) 201 $(header).append('<div class="non-action-button">Reftests cannot be rebaselined. Email webkit-gardening@chromium.org if unsure how to fix this.</div>'); 202 else 203 $(header).append(new ui.actions.List([new ui.actions.Rebaseline().makeDefault()])); 204 205 $(header).append(nonLinkTitle).append(linkTitle); 194 206 this.appendChild(header); 195 207 this.appendChild(this._delegate.contentForTest(testName)); -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results_unittests.js
r101074 r112149 45 45 } 46 46 } 47 } 47 }; 48 49 var kExampleReftestResults = { 50 "reftest.html": { 51 "Mock Builder": { 52 "expected": "PASS", 53 "actual": "IMAGE", 54 "is_reftest": true 55 } 56 }, 57 "mismatch-reftest.html": { 58 "Mock Builder": { 59 "expected": "PASS", 60 "actual": "IMAGE", 61 "is_mismatch_reftest": true 62 } 63 } 64 }; 48 65 49 66 var kExampleResultsWithTimeoutByTest = { … … 54 71 } 55 72 } 56 } 73 }; 57 74 58 75 test('View', 8, function() { … … 78 95 }); 79 96 97 test('View', 2, function() { 98 var delegate = { 99 fetchResultsURLs: function(failureInfo, callback) { return; } 100 }; 101 102 var view = new ui.results.View(delegate); 103 view.setResultsByTest(kExampleReftestResults); 104 105 equals($('.non-action-button', view).length, 2); 106 equals($('.action', view).length, 0); 107 }); 108 80 109 test('View of timeouts', 1, function() { 81 110 var delegate = { -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css
r111793 r112149 24 24 */ 25 25 26 . results-view ul.actions, .ui-dialog ul.actions {26 .non-action-button, .results-view ul.actions, .ui-dialog ul.actions { 27 27 float: right; 28 28 margin: 0; … … 30 30 list-style: none; 31 31 display: inline-block; 32 } 33 34 .non-action-button { 35 padding: 5px; 32 36 } 33 37 -
trunk/Tools/ChangeLog
r112140 r112149 1 2012-03-26 Ojan Vafai <ojan@chromium.org> 2 3 garden-o-matic should special case reftests 4 https://bugs.webkit.org/show_bug.cgi?id=81812 5 6 Reviewed by Adam Barth. 7 8 On the examine page, don't show a rebaseline button for reftests. 9 We still show it on the failure summary page because tests are grouped 10 together. Long-term, we should make sure webkit-patch rebaseline-test 11 never tries to rebaseline reftests. 12 13 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js: 14 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/ui/results.js: 15 * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/styles/results.css: 16 1 17 2012-03-26 Dirk Pranke <dpranke@chromium.org> 2 18
Note: See TracChangeset
for help on using the changeset viewer.