Modified: trunk/Tools/TestResultServer/static-dashboards/builders.js (104476 => 104477)
--- trunk/Tools/TestResultServer/static-dashboards/builders.js 2012-01-09 20:22:41 UTC (rev 104476)
+++ trunk/Tools/TestResultServer/static-dashboards/builders.js 2012-01-09 20:38:52 UTC (rev 104477)
@@ -93,7 +93,6 @@
['Webkit Win (deps)', BuilderGroup.DEFAULT_BUILDER],
['Webkit Linux (deps)', BuilderGroup.EXPECTATIONS_BUILDER],
['Webkit Mac10.6 (deps)'],
- ['Webkit Mac10.6 (CG)(deps)'],
];
associateBuildersWithMaster(CHROMIUM_LAYOUT_DEPS_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
@@ -111,11 +110,6 @@
['Webkit Mac10.5 (dbg)(2)'],
['Webkit Mac10.6'],
['Webkit Mac10.6 (dbg)'],
- ['Webkit Mac10.5 (CG)'],
- ['Webkit Mac10.5 (CG)(dbg)(1)'],
- ['Webkit Mac10.5 (CG)(dbg)(2)'],
- ['Webkit Mac10.6 (CG)'],
- ['Webkit Mac10.6 (CG)(dbg)']
];
associateBuildersWithMaster(CHROMIUM_LAYOUT_TOT_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
@@ -146,11 +140,6 @@
['Webkit Mac10.5 (dbg)(2) - GPU'],
['Webkit Mac10.6 - GPU'],
['Webkit Mac10.6 (dbg) - GPU'],
- ['Webkit Mac10.5 (CG) - GPU'],
- ['Webkit Mac10.5 (CG)(dbg)(1) - GPU'],
- ['Webkit Mac10.5 (CG)(dbg)(2) - GPU'],
- ['Webkit Mac10.6 (CG) - GPU'],
- ['Webkit Mac10.6 (CG)(dbg) - GPU']
];
associateBuildersWithMaster(CHROMIUM_GPU_MESA_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html (104476 => 104477)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html 2012-01-09 20:22:41 UTC (rev 104476)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html 2012-01-09 20:38:52 UTC (rev 104477)
@@ -2442,8 +2442,8 @@
g_fallbacksMap['WIN-VISTA'] = ['chromium-win-vista', 'chromium-win', 'chromium', 'win', 'mac'];
g_fallbacksMap['WIN-7'] = ['chromium-win', 'chromium', 'win', 'mac'];
g_fallbacksMap['WIN-7-GPU'] = ['chromium-gpu-win'].concat(g_fallbacksMap['WIN-7']);
-g_fallbacksMap['MAC-LEOPARD'] = ['chromium-cg-mac-leopard', 'chromium-cg-mac-snowleopard', 'chromium-cg-mac', 'chromium', 'mac-leopard', 'mac-snowleopard', 'mac'];
-g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-cg-mac-snowleopard', 'chromium-cg-mac', 'chromium', 'mac-snowleopard', 'mac'];
+g_fallbacksMap['MAC-LEOPARD'] = ['chromium-mac-leopard', 'chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac-leopard', 'mac-snowleopard', 'mac'];
+g_fallbacksMap['MAC-SNOWLEOPARD'] = ['chromium-mac-snowleopard', 'chromium-mac', 'chromium', 'mac-snowleopard', 'mac'];
g_fallbacksMap['MAC-SNOWLEOPARD-GPU'] = ['chromium-gpu-mac'].concat(g_fallbacksMap['MAC-SNOWLEOPARD']);
g_fallbacksMap['LINUX-32'] = ['chromium-linux-x86', 'chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'];
g_fallbacksMap['LINUX-64'] = ['chromium-linux', 'chromium-win', 'chromium', 'win', 'mac'];
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js (104476 => 104477)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js 2012-01-09 20:22:41 UTC (rev 104476)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js 2012-01-09 20:38:52 UTC (rev 104477)
@@ -160,8 +160,8 @@
runExpectationsTest('Webkit Win (dbg)(3)', test, 'FAIL PASS TIMEOUT', 'WONTFIX');
runExpectationsTest('Webkit Linux', test, 'FAIL PASS TIMEOUT', 'WONTFIX');
runExpectationsTest('Webkit Linux (dbg)(3)', test, 'CRASH', 'LINUX DEBUG');
- runExpectationsTest('Webkit Mac10.5 (CG)', test, 'FAIL', 'WONTFIX MAC');
- runExpectationsTest('Webkit Mac10.5 (CG)(dbg)(3)', test, 'FAIL', 'WONTFIX MAC');
+ runExpectationsTest('Webkit Mac10.5', test, 'FAIL', 'WONTFIX MAC');
+ runExpectationsTest('Webkit Mac10.5 (dbg)(3)', test, 'FAIL', 'WONTFIX MAC');
}
function testPlatformAndBuildType()
@@ -179,9 +179,9 @@
runPlatformAndBuildTypeTest('Webkit Linux (deps)', 'LUCID', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Linux (deps)(dbg)(1)', 'LUCID', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Linux (deps)(dbg)(2)', 'LUCID', 'DEBUG');
- runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(deps)', 'SNOWLEOPARD', 'RELEASE');
- runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(deps)(dbg)(1)', 'SNOWLEOPARD', 'DEBUG');
- runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(deps)(dbg)(2)', 'SNOWLEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('Webkit Mac10.6 (deps)', 'SNOWLEOPARD', 'RELEASE');
+ runPlatformAndBuildTypeTest('Webkit Mac10.6 (deps)(dbg)(1)', 'SNOWLEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('Webkit Mac10.6 (deps)(dbg)(2)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Win', 'XP', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Vista', 'VISTA', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Win7', 'WIN7', 'RELEASE');
@@ -191,11 +191,11 @@
runPlatformAndBuildTypeTest('Webkit Linux 32', 'LUCID', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Linux (dbg)(1)', 'LUCID', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Linux (dbg)(2)', 'LUCID', 'DEBUG');
- runPlatformAndBuildTypeTest('Webkit Mac10.5 (CG)', 'LEOPARD', 'RELEASE');
- runPlatformAndBuildTypeTest('Webkit Mac10.5 (CG)(dbg)(1)', 'LEOPARD', 'DEBUG');
- runPlatformAndBuildTypeTest('Webkit Mac10.5 (CG)(dbg)(2)', 'LEOPARD', 'DEBUG');
- runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)', 'SNOWLEOPARD', 'RELEASE');
- runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(dbg)', 'SNOWLEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('Webkit Mac10.5', 'LEOPARD', 'RELEASE');
+ runPlatformAndBuildTypeTest('Webkit Mac10.5 (dbg)(1)', 'LEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('Webkit Mac10.5 (dbg)(2)', 'LEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('Webkit Mac10.6', 'SNOWLEOPARD', 'RELEASE');
+ runPlatformAndBuildTypeTest('Webkit Mac10.6 (dbg)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Win - GPU', 'XP', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Vista - GPU', 'VISTA', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Win7 - GPU', 'WIN7', 'RELEASE');