Modified: trunk/ChangeLog (116395 => 116396)
--- trunk/ChangeLog 2012-05-08 05:45:43 UTC (rev 116395)
+++ trunk/ChangeLog 2012-05-08 05:59:34 UTC (rev 116396)
@@ -1,3 +1,12 @@
+2012-05-07 Dave Tu <[email protected]>
+
+ Adjust flakiness dashboard gpu_tests image diff URLs.
+ https://bugs.webkit.org/show_bug.cgi?id=85423
+
+ Reviewed by Ojan Vafai.
+
+ * Tools/TestResultServer/static-dashboards/flakiness_dashboard.js:
+
2012-05-07 Liam Quinn <[email protected]>
[BlackBerry] WWW-Authenticate header on 200 response pops up authentication dialog
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (116395 => 116396)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2012-05-08 05:45:43 UTC (rev 116395)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2012-05-08 05:59:34 UTC (rev 116396)
@@ -36,6 +36,7 @@
var TEST_URL_BASE_PATH_TRAC = 'http://trac.webkit.org/browser/trunk/LayoutTests/';
var TEST_URL_BASE_PATH = "http://svn.webkit.org/repository/webkit/trunk/LayoutTests/";
var TEST_RESULTS_BASE_PATH = 'http://build.chromium.org/f/chromium/layout_test_results/';
+var GPU_RESULTS_BASE_PATH = 'http://chromium-browser-gpu-tests.commondatastorage.googleapis.com/runs/'
// FIXME: These platform names should probably be changed to match the directories in LayoutTests/platform
// instead of matching the values we use in the test_expectations.txt file.
@@ -1863,6 +1864,11 @@
}
}
+function gpuResultsPath(chromeRevision, builder)
+{
+ return chromeRevision + '_' + builder.replace(/[^A-Za-z0-9]+/g, '_');
+}
+
function loadGPUResultsForBuilder(builder, test, expectationsContainer)
{
var container = document.createElement('div');
@@ -1870,21 +1876,19 @@
container.innerHTML = '<div><b>' + builder + '</b></div>';
expectationsContainer.appendChild(container);
- var baseUrl = 'http://chromium-browser-gpu-tests.commondatastorage.googleapis.com/runs/'
var failureIndex = indexesForFailures(builder, test)[0];
var buildNumber = g_resultsByBuilder[builder].buildNumbers[failureIndex];
var pathToLog = builderMaster(builder).logPath(builder, buildNumber) + pathToFailureLog(test);
var chromeRevision = g_resultsByBuilder[builder].chromeRevision[failureIndex];
- var builderName = builder.replace(/[^A-Za-z0-9 ]/g, '').replace(/ /g, '_');
- var resultsUrl = baseUrl + chromeRevision + '_' + builderName + '_/';
+ var resultsUrl = GPU_RESULTS_BASE_PATH + gpuResultsPath(chromeRevision, builder);
var filename = test.split(/\./)[1] + '.png';
appendNonWebKitResults(container, pathToLog, 'non-webkit-results');
- appendNonWebKitResults(container, resultsUrl + 'gen/' + filename, 'gpu-test-results', 'Generated');
- appendNonWebKitResults(container, resultsUrl + 'ref/' + filename, 'gpu-test-results', 'Reference');
- appendNonWebKitResults(container, resultsUrl + 'diff/' + filename, 'gpu-test-results', 'Diff');
+ appendNonWebKitResults(container, resultsUrl + '/gen/' + filename, 'gpu-test-results', 'Generated');
+ appendNonWebKitResults(container, resultsUrl + '/ref/' + filename, 'gpu-test-results', 'Reference');
+ appendNonWebKitResults(container, resultsUrl + '/diff/' + filename, 'gpu-test-results', 'Diff');
}
function loadNonWebKitResultsForBuilder(builder, test, expectationsContainer)
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js (116395 => 116396)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2012-05-08 05:45:43 UTC (rev 116395)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2012-05-08 05:59:34 UTC (rev 116396)
@@ -673,3 +673,9 @@
hidePopup();
ok(!document.querySelector('#popup'));
});
+
+test('gpuResultsPath', 3, function() {
+ equal(gpuResultsPath('777777', 'Win7 Release (ATI)'), '777777_Win7_Release_ATI_');
+ equal(gpuResultsPath('123', 'GPU Linux (dbg)(NVIDIA)'), '123_GPU_Linux_dbg_NVIDIA_');
+ equal(gpuResultsPath('12345', 'GPU Mac'), '12345_GPU_Mac');
+});
