Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (149603 => 149604)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2013-05-06 17:15:17 UTC (rev 149603)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js 2013-05-06 17:32:50 UTC (rev 149604)
@@ -357,7 +357,7 @@
return basePlatform + (isWK2Builder ? '_WK2' : '_WK1');
}
-function nonChromiumPlatform(builderNameUpperCase)
+function determineBuilderPlatform(builderNameUpperCase)
{
if (string.contains(builderNameUpperCase, 'WINDOWS 7'))
return 'APPLE_WIN_WIN7';
@@ -376,45 +376,15 @@
return determineWKPlatform(builderNameUpperCase, 'EFL_LINUX');
}
-function chromiumPlatform(builderNameUpperCase)
-{
- if (string.contains(builderNameUpperCase, 'MAC')) {
- if (string.contains(builderNameUpperCase, '10.7'))
- return 'CHROMIUM_LION';
- // The webkit.org 'Chromium Mac Release (Tests)' bot runs SnowLeopard.
- return 'CHROMIUM_SNOWLEOPARD';
- }
- if (string.contains(builderNameUpperCase, 'WIN7'))
- return 'CHROMIUM_WIN7';
- if (string.contains(builderNameUpperCase, 'VISTA'))
- return 'CHROMIUM_VISTA';
- if (string.contains(builderNameUpperCase, 'WIN') || string.contains(builderNameUpperCase, 'XP'))
- return 'CHROMIUM_XP';
- if (string.contains(builderNameUpperCase, 'LINUX'))
- return 'CHROMIUM_LUCID';
- if (string.contains(builderNameUpperCase, 'ANDROID'))
- return 'CHROMIUM_ANDROID';
- // The interactive bot is XP, but doesn't have an OS in it's name.
- if (string.contains(builderNameUpperCase, 'INTERACTIVE'))
- return 'CHROMIUM_XP';
-}
-
-
function platformAndBuildType(builderName)
{
if (!g_perBuilderPlatformAndBuildType[builderName]) {
var builderNameUpperCase = builderName.toUpperCase();
-
- var platform = '';
- if (g_history.isLayoutTestResults() && currentBuilderGroupName() == '@ToT - webkit.org' && !string.contains(builderNameUpperCase, 'CHROMIUM'))
- platform = nonChromiumPlatform(builderNameUpperCase);
- else
- platform = chromiumPlatform(builderNameUpperCase);
-
+ var platform = determineBuilderPlatform(builderNameUpperCase);
if (!platform)
console.error('Could not resolve platform for builder: ' + builderName);
- var buildType = string.contains(builderNameUpperCase, 'DBG') || string.contains(builderNameUpperCase, 'DEBUG') ? 'DEBUG' : 'RELEASE';
+ var buildType = string.contains(builderNameUpperCase, 'DEBUG') ? 'DEBUG' : 'RELEASE';
g_perBuilderPlatformAndBuildType[builderName] = {platform: platform, buildType: buildType};
}
return g_perBuilderPlatformAndBuildType[builderName];
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js (149603 => 149604)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2013-05-06 17:15:17 UTC (rev 149603)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js 2013-05-06 17:32:50 UTC (rev 149604)
@@ -137,7 +137,7 @@
runExpectationsTest('Apple Lion Debug WK2 (Tests)', test, 'CRASH', 'DEBUG');
});
-test('platformAndBuildType', 78, function() {
+test('platformAndBuildType', 30, function() {
var historyInstance = new history.History(flakinessConfig);
// FIXME(jparent): Change to use the flakiness_db's history object
// once it exists, rather than tracking global.
@@ -150,34 +150,6 @@
equal(buildInfo.platform, expectedPlatform, message);
equal(buildInfo.buildType, expectedBuildType, message);
}
- runPlatformAndBuildTypeTest('WebKit Win (deps)', 'CHROMIUM_XP', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Win (deps)(dbg)(1)', 'CHROMIUM_XP', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Win (deps)(dbg)(2)', 'CHROMIUM_XP', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Linux (deps)', 'CHROMIUM_LUCID', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Linux (deps)(dbg)(1)', 'CHROMIUM_LUCID', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Linux (deps)(dbg)(2)', 'CHROMIUM_LUCID', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Mac10.6 (deps)', 'CHROMIUM_SNOWLEOPARD', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Mac10.6 (deps)(dbg)(1)', 'CHROMIUM_SNOWLEOPARD', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Mac10.6 (deps)(dbg)(2)', 'CHROMIUM_SNOWLEOPARD', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Win', 'CHROMIUM_XP', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Win7', 'CHROMIUM_WIN7', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Win (dbg)(1)', 'CHROMIUM_XP', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Win (dbg)(2)', 'CHROMIUM_XP', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Linux', 'CHROMIUM_LUCID', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Linux 32', 'CHROMIUM_LUCID', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Linux (dbg)(1)', 'CHROMIUM_LUCID', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Linux (dbg)(2)', 'CHROMIUM_LUCID', 'DEBUG');
- runPlatformAndBuildTypeTest('WebKit Mac10.6', 'CHROMIUM_SNOWLEOPARD', 'RELEASE');
- runPlatformAndBuildTypeTest('WebKit Mac10.6 (dbg)', 'CHROMIUM_SNOWLEOPARD', 'DEBUG');
- runPlatformAndBuildTypeTest('XP Tests', 'CHROMIUM_XP', 'RELEASE');
- runPlatformAndBuildTypeTest('Interactive Tests (dbg)', 'CHROMIUM_XP', 'DEBUG');
-
- historyInstance.crossDashboardState.group = '@ToT - webkit.org';
- historyInstance.crossDashboardState.testType = 'layout-tests';
- runPlatformAndBuildTypeTest('Chromium Win Release (Tests)', 'CHROMIUM_XP', 'RELEASE');
- runPlatformAndBuildTypeTest('Chromium Linux Release (Tests)', 'CHROMIUM_LUCID', 'RELEASE');
- runPlatformAndBuildTypeTest('Chromium Mac Release (Tests)', 'CHROMIUM_SNOWLEOPARD', 'RELEASE');
-
// FIXME: These platforms should match whatever we use in the TestExpectations format.
runPlatformAndBuildTypeTest('Lion Release (Tests)', 'APPLE_MAC_LION_WK1', 'RELEASE');
runPlatformAndBuildTypeTest('Lion Debug (Tests)', 'APPLE_MAC_LION_WK1', 'DEBUG');
