Attachment 347606 Details for Bug 188345 – WIP patch

[patch] WIP patch

a.diff (text/plain), 4.67 KB, created by Fujii Hironori on 2018-08-20 21:15:51 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2018-08-20 21:15:51 PDT

Size: 4.67 KB

patch

obsolete

>diff --git a/Tools/TestResultServer/static-dashboards/builders.jsonp b/Tools/TestResultServer/static-dashboards/builders.jsonp
>index 467c99cd833b..fd8307ba9b75 100644
>--- a/Tools/TestResultServer/static-dashboards/builders.jsonp
>+++ b/Tools/TestResultServer/static-dashboards/builders.jsonp
>@@ -23,7 +23,8 @@ LOAD_BUILDBOT_DATA([
>                     "GTK Linux 64-bit Release (Tests)", 
>                     "GTK Linux 64-bit Release Wayland (Tests)", 
>                     "WPE Linux 64-bit Release (Tests)",
>-                    "WPE Linux 64-bit Debug (Tests)"
>+                    "WPE Linux 64-bit Debug (Tests)",
>+                    "WinCairo 64-bit WKL Release (Tests)"
>                 ]
>             }
>         }, 
>diff --git a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
>index 826535e10957..b344a5a751df 100644
>--- a/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
>+++ b/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
>@@ -87,6 +87,9 @@ var PLATFORMS = {
>         subPlatforms: {
>             'LINUX': { fallbackPlatforms: ['WPE', 'WK2'] }
>         }
>+    },
>+    'WINCAIRO': {
>+        expectationsDirectory: 'wincairo',
>     }
> };
> 
>@@ -350,6 +353,9 @@ function determineBuilderPlatform(builderNameUpperCase)
>     if (string.contains(builderNameUpperCase, 'WPE LINUX'))
>         return 'WPE_LINUX';
> 
>+    if (string.contains(builderNameUpperCase, 'WINCAIRO'))
>+        return 'WINCAIRO';
>+
>     if (string.contains(builderNameUpperCase, 'MOJAVE'))
>         return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_MOJAVE');
>     if (string.contains(builderNameUpperCase, 'HIGHSIERRA'))
>diff --git a/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js b/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js
>index 3ca454539295..0f3d1710a0e6 100644
>--- a/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js
>+++ b/Tools/TestResultServer/static-dashboards/flakiness_dashboard_unittests.js
>@@ -46,7 +46,7 @@ function resetGlobals()
>     LOAD_BUILDBOT_DATA([{
>         name: 'webkit.org',
>         url: 'dummyurl',
>-        tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)']}}
>+        tests: {'layout-tests': {'builders': ['Apple Lion Release WK2 (Tests)', 'Apple Lion Debug WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)', 'WinCairo 64-bit WKL Release (Tests)']}}
>     }]);
>  
>     for (var group in LAYOUT_TESTS_BUILDER_GROUPS)
>@@ -163,6 +163,7 @@ test('platformAndBuildType', 30, function() {
>     runPlatformAndBuildTypeTest('Windows XP Debug (Tests)', 'APPLE_WIN_XP', 'DEBUG');
>     runPlatformAndBuildTypeTest('WPE Linux 64-bit Release (Tests)', 'WPE_LINUX', 'RELEASE');
>     runPlatformAndBuildTypeTest('WPE Linux 64-bit Debug (Tests)', 'WPE_LINUX', 'DEBUG');
>+    runPlatformAndBuildTypeTest('WinCairo 64-bit WKL Release (Tests)', 'WINCAIRO', 'RELEASE');
>     
>     // FIXME: Should WebKit2 be it's own platform?
>     runPlatformAndBuildTypeTest('MountainLion Release (WebKit2 Tests)', 'APPLE_MAC_MOUNTAINLION_WK2', 'RELEASE');
>diff --git a/Tools/TestResultServer/static-dashboards/loader_unittests.js b/Tools/TestResultServer/static-dashboards/loader_unittests.js
>index a050ebc2b3d7..41a4ba06fcca 100644
>--- a/Tools/TestResultServer/static-dashboards/loader_unittests.js
>+++ b/Tools/TestResultServer/static-dashboards/loader_unittests.js
>@@ -52,7 +52,7 @@ test('loading steps', 1, function() {
> // and then 2 per builder (one for ok, one for deepEqual of tests).
> test('results files loading', 9, function() {
>     resetGlobals();
>-    var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)'];
>+    var expectedLoadedBuilders =  ['Apple Lion Debug WK2 (Tests)', 'Apple Lion Release WK2 (Tests)', 'GTK Linux 64-bit Release (Tests)', 'WPE Linux 64-bit Release (Tests)', 'WinCairo 64-bit WKL Release (Tests)'];
>     var loadedBuilders = [];
>     var resourceLoader = new loader.Loader();
>     resourceLoader._loadNext = function() {
>@@ -83,7 +83,7 @@ test('expectations files loading', 1, function() {
>     resetGlobals();
>     g_history.parseCrossDashboardParameters();
>     var expectedLoadedPlatforms = ["gtk", "gtk-wk2",
>-        "mac", "mac-lion", "mac-wk2", "mac-wk2", "win", "wk2", "wpe"];
>+        "mac", "mac-lion", "mac-wk2", "mac-wk2", "win", "wk2", "wpe", "wincairo"];
>     var loadedPlatforms = [];
>     var resourceLoader = new loader.Loader();
>     resourceLoader._loadNext = function() {

Actions: View | Formatted Diff | Diff

Attachments on bug 188345: 346621 | 346622 | 346896 | 347606 | 351938