Diff
Modified: trunk/Tools/ChangeLog (91585 => 91586)
--- trunk/Tools/ChangeLog 2011-07-22 19:15:23 UTC (rev 91585)
+++ trunk/Tools/ChangeLog 2011-07-22 19:16:25 UTC (rev 91586)
@@ -1,3 +1,12 @@
+2011-07-21 Ojan Vafai <[email protected]>
+
+ hook in the rest of the bots to the dashboard now they run NRWT
+ https://bugs.webkit.org/show_bug.cgi?id=64985
+
+ Reviewed by Adam Barth.
+
+ * TestResultServer/static-dashboards/builders.js:
+
2011-07-22 Alexey Proskuryakov <[email protected]>
Adding Tim Horton to contributor list for Bugzilla auto-completion. He is CC'ed quite frequently.
Modified: trunk/Tools/TestResultServer/static-dashboards/builders.js (91585 => 91586)
--- trunk/Tools/TestResultServer/static-dashboards/builders.js 2011-07-22 19:15:23 UTC (rev 91585)
+++ trunk/Tools/TestResultServer/static-dashboards/builders.js 2011-07-22 19:16:25 UTC (rev 91586)
@@ -123,7 +123,14 @@
var WEBKIT_TOT_BUILDERS = [
['Chromium Win Release (Tests)', BuilderGroup.DEFAULT_BUILDER],
['Chromium Linux Release (Tests)', BuilderGroup.EXPECTATIONS_BUILDER],
- ['Chromium Mac Release (Tests)']
+ ['Chromium Mac Release (Tests)'],
+ ['Leopard Intel Debug (Tests)'],
+ ['SnowLeopard Intel Release (Tests)'],
+ ['SnowLeopard Intel Debug (Tests)'],
+ ['GTK Linux 32-bit Release'],
+ ['GTK Linux 32-bit Debug'],
+ ['GTK Linux 64-bit Debug'],
+ ['Qt Linux Release']
];
associateBuildersWithMaster(WEBKIT_TOT_BUILDERS, WEBKIT_BUILDER_MASTER);
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html (91585 => 91586)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html 2011-07-22 19:15:23 UTC (rev 91585)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.html 2011-07-22 19:16:25 UTC (rev 91586)
@@ -319,7 +319,9 @@
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 PLATFORMS = ['SNOWLEOPARD', 'LEOPARD', 'XP', 'VISTA', 'WIN7', 'LUCID'];
+// 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.
+var PLATFORMS = ['SNOWLEOPARD', 'LEOPARD', 'XP', 'VISTA', 'WIN7', 'LUCID', 'APPLE_LEOPARD', 'APPLE_SNOWLEOPARD', 'APPLE_XP', 'APPLE_WIN7', 'GTK_LINUX', 'QT_LINUX'];
var PLATFORM_UNIONS = {
'MAC': ['LEOPARD', 'SNOWLEOPARD'],
'WIN': ['XP', 'VISTA', 'WIN7'],
@@ -523,33 +525,55 @@
}
}
+function nonChromiumPlatform(builderNameUpperCase)
+{
+ if (stringContains(builderNameUpperCase, 'SNOWLEOPARD'))
+ return 'APPLE_SNOWLEOPARD';
+ if (stringContains(builderNameUpperCase, 'LEOPARD'))
+ return 'APPLE_LEOPARD';
+ if (stringContains(builderNameUpperCase, 'WINDOWS 7'))
+ return 'APPLE_WIN7';
+ if (stringContains(builderNameUpperCase, 'WINDOWS XP'))
+ return 'APPLE_XP';
+ if (stringContains(builderNameUpperCase, 'GTK LINUX'))
+ return 'GTK_LINUX';
+ if (stringContains(builderNameUpperCase, 'QT LINUX'))
+ return 'QT_LINUX';
+}
+
+function chromiumPlatform(builderNameUpperCase)
+{
+ if (stringContains(builderNameUpperCase, 'MAC')) {
+ if (stringContains(builderNameUpperCase, '10.5'))
+ return 'LEOPARD';
+ return 'SNOWLEOPARD';
+ }
+ if (stringContains(builderNameUpperCase, 'WIN7'))
+ return 'WIN7';
+ if (stringContains(builderNameUpperCase, 'VISTA'))
+ return 'VISTA';
+ if (stringContains(builderNameUpperCase, 'WIN') || stringContains(builderNameUpperCase, 'XP'))
+ return 'XP';
+ if (stringContains(builderNameUpperCase, 'LINUX'))
+ return 'LUCID';
+}
+
+
function platformAndBuildType(builderName)
{
if (!g_perBuilderPlatformAndBuildType[builderName]) {
- // If the build name does not contain a platform
- // or build type, assume Windows Release.
- var currentBuildUppercase = builderName.toUpperCase();
+ var builderNameUpperCase = builderName.toUpperCase();
- var platform;
- if (stringContains(currentBuildUppercase, 'MAC')) {
- if (stringContains(currentBuildUppercase, '10.5'))
- platform = 'LEOPARD';
- else
- platform = 'SNOWLEOPARD';
- } else if (stringContains(currentBuildUppercase, 'WIN7'))
- platform = 'WIN7';
- else if (stringContains(currentBuildUppercase, 'VISTA'))
- platform = 'VISTA';
- else if (stringContains(currentBuildUppercase, 'WIN') || stringContains(currentBuildUppercase, 'XP'))
- platform = 'XP';
- else if (stringContains(currentBuildUppercase, 'LINUX'))
- platform = 'LUCID';
- else {
- platform = '';
- console.log('Could not resolve platform for builder: ' + builderName);
- }
+ var platform = '';
+ if (g_currentState.group == '@ToT - webkit.org' && !stringContains(builderNameUpperCase, 'CHROMIUM'))
+ platform = nonChromiumPlatform(builderNameUpperCase);
+ else
+ platform = chromiumPlatform(builderNameUpperCase);
- var buildType = stringContains(currentBuildUppercase, 'DBG') ? 'DEBUG' : 'RELEASE';
+ if (!platform)
+ console.error('Could not resolve platform for builder: ' + builderName);
+
+ var buildType = stringContains(builderNameUpperCase, 'DBG') || stringContains(builderNameUpperCase, 'DEBUG') ? 'DEBUG' : 'RELEASE';
g_perBuilderPlatformAndBuildType[builderName] = {platform: platform, buildType: buildType};
}
return g_perBuilderPlatformAndBuildType[builderName];
Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js (91585 => 91586)
--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js 2011-07-22 19:15:23 UTC (rev 91585)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js 2011-07-22 19:16:25 UTC (rev 91586)
@@ -176,9 +176,6 @@
runPlatformAndBuildTypeTest('Webkit Mac10.5 (dbg)(2)', 'LEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.6', 'SNOWLEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (dbg)', 'SNOWLEOPARD', 'DEBUG');
- runPlatformAndBuildTypeTest('Chromium Win Release (Tests)', 'XP', 'RELEASE');
- runPlatformAndBuildTypeTest('Chromium Linux Release (Tests)', 'LUCID', 'RELEASE');
- runPlatformAndBuildTypeTest('Chromium Mac Release (Tests)', 'SNOWLEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Win - GPU', 'XP', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Vista - GPU', 'VISTA', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Win7 - GPU', 'WIN7', 'RELEASE');
@@ -210,6 +207,29 @@
runPlatformAndBuildTypeTest('GPU Win7 Tests (dbg)(2) - GPU', 'WIN7', 'DEBUG');
runPlatformAndBuildTypeTest('GPU Linux Tests x64 - GPU', 'LUCID', 'RELEASE');
runPlatformAndBuildTypeTest('XP Tests', 'XP', 'RELEASE');
+
+ g_currentState.group = '@ToT - webkit.org';
+ runPlatformAndBuildTypeTest('Chromium Win Release (Tests)', 'XP', 'RELEASE');
+ runPlatformAndBuildTypeTest('Chromium Linux Release (Tests)', 'LUCID', 'RELEASE');
+ runPlatformAndBuildTypeTest('Chromium Mac Release (Tests)', 'SNOWLEOPARD', 'RELEASE');
+
+ // FIXME: These platforms should match whatever we use in the test_expectations.txt format.
+ runPlatformAndBuildTypeTest('Leopard Intel Release (Tests)', 'APPLE_LEOPARD', 'RELEASE');
+ runPlatformAndBuildTypeTest('Leopard Intel Debug (Tests)', 'APPLE_LEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('SnowLeopard Intel Release (Tests)', 'APPLE_SNOWLEOPARD', 'RELEASE');
+ runPlatformAndBuildTypeTest('SnowLeopard Intel Leaks', 'APPLE_SNOWLEOPARD', 'RELEASE');
+ runPlatformAndBuildTypeTest('SnowLeopard Intel Debug (Tests)', 'APPLE_SNOWLEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('GTK Linux 32-bit Release', 'GTK_LINUX', 'RELEASE');
+ runPlatformAndBuildTypeTest('GTK Linux 32-bit Debug', 'GTK_LINUX', 'DEBUG');
+ runPlatformAndBuildTypeTest('GTK Linux 64-bit Debug', 'GTK_LINUX', 'DEBUG');
+ runPlatformAndBuildTypeTest('Qt Linux Release', 'QT_LINUX', 'RELEASE');
+ runPlatformAndBuildTypeTest('Windows 7 Release (Tests)', 'APPLE_WIN7', 'RELEASE');
+ runPlatformAndBuildTypeTest('Windows XP Debug (Tests)', 'APPLE_XP', 'DEBUG');
+
+ // FIXME: Should WebKit2 be it's own platform?
+ runPlatformAndBuildTypeTest('SnowLeopard Intel Release (WebKit2 Tests)', 'APPLE_SNOWLEOPARD', 'RELEASE');
+ runPlatformAndBuildTypeTest('SnowLeopard Intel Debug (WebKit2 Tests)', 'APPLE_SNOWLEOPARD', 'DEBUG');
+ runPlatformAndBuildTypeTest('Windows 7 Release (WebKit2 Tests)', 'APPLE_WIN7', 'RELEASE');
}
function testRealModifiers()
