Changeset 225819 in webkit

Timestamp:

Dec 12, 2017 4:11:45 PM (6 years ago)

Author:

commit-queue@webkit.org

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 <​aboya@igalia.com> on 2017-12-12
Reviewed by Michael Catanzaro.

• TestResultServer/static-dashboards/flakiness_dashboard.js:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestResultServer/static-dashboards/flakiness_dashboard.js (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-12-12  Alicia Boya García  <aboya@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  <jbedard@apple.com>
 

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

@@ -76 +76 @@
         expectationsDirectory: 'gtk',
         subPlatforms: {
-            'LINUX': {
-                subPlatforms: {
-                    'WK1': { fallbackPlatforms: ['GTK'] },
-                    'WK2': { fallbackPlatforms: ['GTK', 'WK2'], expectationsDirectory: 'gtk-wk2' }
-                }
-            }
+            'LINUX': { fallbackPlatforms: ['GTK', 'WK2'] }
         }
     },
@@ -91 +86 @@
         expectationsDirectory: 'wpe',
         subPlatforms: {
-            'LINUX': { fallbackPlatforms: ['WPE'] }
+            'LINUX': { fallbackPlatforms: ['WPE', 'WK2'] }
         }
     }
@@ -351 +346 @@
         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');
@@ -363 +363 @@
     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');
 }