[webkit-changes] [225819] trunk/Tools

[commit-queue]

Title: [225819] trunk/Tools

Revision

225819

Author

commit-qu...@webkit.org

Date

2017-12-12 16:11:45 -0800 (Tue, 12 Dec 2017)

Log Message

Flakiness dashboard: Make GTK and WPE builds inherit expectations from WK2
https://bugs.webkit.org/show_bug.cgi?id=178782

Patch by Alicia Boya García <ab...@igalia.com> on 2017-12-12
Reviewed by Michael Catanzaro.

* TestResultServer/static-dashboards/flakiness_dashboard.js:

Modified Paths

• trunk/Tools/ChangeLog
• trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js

Diff

Modified: trunk/Tools/ChangeLog (225818 => 225819)

--- trunk/Tools/ChangeLog	2017-12-12 23:54:34 UTC (rev 225818)
+++ trunk/Tools/ChangeLog	2017-12-13 00:11:45 UTC (rev 225819)
@@ -1,3 +1,12 @@
+2017-12-12  Alicia Boya García  <ab...@igalia.com>
+
+        Flakiness dashboard: Make GTK and WPE builds inherit expectations from WK2
+        https://bugs.webkit.org/show_bug.cgi?id=178782
+
+        Reviewed by Michael Catanzaro.
+
+        * TestResultServer/static-dashboards/flakiness_dashboard.js:
+
 2017-12-12  Jonathan Bedard  <jbed...@apple.com>
 
         MobileMiniBrowser using the wrong toolchain

Modified: trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js (225818 => 225819)

--- trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js	2017-12-12 23:54:34 UTC (rev 225818)
+++ trunk/Tools/TestResultServer/static-dashboards/flakiness_dashboard.js	2017-12-13 00:11:45 UTC (rev 225819)
@@ -75,12 +75,7 @@
     'GTK': {
         expectationsDirectory: 'gtk',
         subPlatforms: {
-            'LINUX': {
-                subPlatforms: {
-                    'WK1': { fallbackPlatforms: ['GTK'] },
-                    'WK2': { fallbackPlatforms: ['GTK', 'WK2'], expectationsDirectory: 'gtk-wk2' }
-                }
-            }
+            'LINUX': { fallbackPlatforms: ['GTK', 'WK2'] }
         }
     },
     'WK2': {
@@ -90,7 +85,7 @@
     'WPE': {
         expectationsDirectory: 'wpe',
         subPlatforms: {
-            'LINUX': { fallbackPlatforms: ['WPE'] }
+            'LINUX': { fallbackPlatforms: ['WPE', 'WK2'] }
         }
     }
 };
@@ -350,6 +345,11 @@
     if (string.contains(builderNameUpperCase, 'WIN XP'))
         return 'APPLE_WIN_XP';
 
+    if (string.contains(builderNameUpperCase, 'GTK LINUX'))
+        return 'GTK_LINUX';
+    if (string.contains(builderNameUpperCase, 'WPE LINUX'))
+        return 'WPE_LINUX';
+
     if (string.contains(builderNameUpperCase, 'HIGHSIERRA'))
         return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_HIGHSIERRA');
     if (string.contains(builderNameUpperCase, 'SIERRA'))
@@ -362,10 +362,6 @@
         return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_LION');
     if (string.contains(builderNameUpperCase, ' IOS ') && string.contains(builderNameUpperCase, 'SIMULATOR'))
         return determineWKPlatform(builderNameUpperCase, 'APPLE_IOS_SIMULATOR');
-    if (string.contains(builderNameUpperCase, 'GTK LINUX'))
-        return determineWKPlatform(builderNameUpperCase, 'GTK_LINUX');
-    if (string.contains(builderNameUpperCase, 'WPE LINUX'))
-        return determineWKPlatform(builderNameUpperCase, 'WPE_LINUX');
 }
 
 function platformAndBuildType(builderName)

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes