OLD | NEW |
1 // Copyright (C) 2012 Google Inc. All rights reserved. | 1 // Copyright (C) 2012 Google Inc. All rights reserved. |
2 // | 2 // |
3 // Redistribution and use in source and binary forms, with or without | 3 // Redistribution and use in source and binary forms, with or without |
4 // modification, are permitted provided that the following conditions are | 4 // modification, are permitted provided that the following conditions are |
5 // met: | 5 // met: |
6 // | 6 // |
7 // * Redistributions of source code must retain the above copyright | 7 // * Redistributions of source code must retain the above copyright |
8 // notice, this list of conditions and the following disclaimer. | 8 // notice, this list of conditions and the following disclaimer. |
9 // * Redistributions in binary form must reproduce the above | 9 // * Redistributions in binary form must reproduce the above |
10 // copyright notice, this list of conditions and the following disclaimer | 10 // copyright notice, this list of conditions and the following disclaimer |
(...skipping 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1114 | 1114 |
1115 function loadExpectationsLayoutTests(test, expectationsContainer) | 1115 function loadExpectationsLayoutTests(test, expectationsContainer) |
1116 { | 1116 { |
1117 // Map from file extension to container div for expectations of that type. | 1117 // Map from file extension to container div for expectations of that type. |
1118 var expectationsContainers = {}; | 1118 var expectationsContainers = {}; |
1119 loadTestAndReferenceFiles(expectationsContainers, expectationsContainer, tes
t); | 1119 loadTestAndReferenceFiles(expectationsContainers, expectationsContainer, tes
t); |
1120 | 1120 |
1121 var testWithoutSuffix = test.substring(0, test.lastIndexOf('.')); | 1121 var testWithoutSuffix = test.substring(0, test.lastIndexOf('.')); |
1122 | 1122 |
1123 for (var builder in currentBuilders()) { | 1123 for (var builder in currentBuilders()) { |
1124 // FIXME: The duplicate "layout-test-results" is due to crbug.com/285572
. | 1124 var actualResultsBase = TEST_RESULTS_BASE_PATH + currentBuilders()[build
er] + '/results/layout-test-results/'; |
1125 var actualResultsBase = TEST_RESULTS_BASE_PATH + currentBuilders()[build
er] + '/results/layout-test-results/layout-test-results/'; | |
1126 ACTUAL_RESULT_SUFFIXES.forEach(function(suffix) {{ | 1125 ACTUAL_RESULT_SUFFIXES.forEach(function(suffix) {{ |
1127 addExpectationItem(expectationsContainers, expectationsContainer, ac
tualResultsBase + testWithoutSuffix + '-' + suffix, builder); | 1126 addExpectationItem(expectationsContainers, expectationsContainer, ac
tualResultsBase + testWithoutSuffix + '-' + suffix, builder); |
1128 }}) | 1127 }}) |
1129 } | 1128 } |
1130 | 1129 |
1131 // Add a clearing element so floated elements don't bleed out of their | 1130 // Add a clearing element so floated elements don't bleed out of their |
1132 // containing block. | 1131 // containing block. |
1133 var br = document.createElement('br'); | 1132 var br = document.createElement('br'); |
1134 br.style.clear = 'both'; | 1133 br.style.clear = 'both'; |
1135 expectationsContainer.appendChild(br); | 1134 expectationsContainer.appendChild(br); |
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1381 // escape key | 1380 // escape key |
1382 hideLegend(); | 1381 hideLegend(); |
1383 ui.popup.hide(); | 1382 ui.popup.hide(); |
1384 } | 1383 } |
1385 }, false); | 1384 }, false); |
1386 | 1385 |
1387 window.addEventListener('load', function() { | 1386 window.addEventListener('load', function() { |
1388 resourceLoader = new loader.Loader(); | 1387 resourceLoader = new loader.Loader(); |
1389 resourceLoader.load(); | 1388 resourceLoader.load(); |
1390 }, false); | 1389 }, false); |
OLD | NEW |