Attachment 372150 Details for Bug 198492 – Patch

[patch] Patch

bug-198492-20190614155833.patch (text/plain), 9.78 KB, created by Jonathan Bedard on 2019-06-14 15:58:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-06-14 15:58:34 PDT

Size: 9.78 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 246447)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,27 @@
>+2019-06-14  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Add macOS Catalina, iOS 13
>+        https://bugs.webkit.org/show_bug.cgi?id=198492
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js:
>+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css:
>+        (table.queue-grid tr.platform.ios-simulator-13 img.logo):
>+        (table.queue-grid tr.platform.ios-13 img.logo):
>+        (table.queue-grid tr.platform.macos-catalina img.logo):
>+        * BuildSlaveSupport/ews-build/steps.py:
>+        (PrintConfiguration.convert_build_to_os_name):
>+        * Scripts/webkitpy/common/version_name_map.py:
>+        (VersionNameMap.__init__): Add Catalina, iOS 13.
>+        * Scripts/webkitpy/common/version_name_map_unittest.py:
>+        (VersionMapTestCase.test_mac_version_by_name):
>+        (VersionMapTestCase.test_mac_name_by_version):
>+        (VersionMapTestCase.test_ios_name_by_version):
>+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
>+        (TestExpectationParser):
>+        * TestResultServer/static-dashboards/flakiness_dashboard.js:
>+
> 2019-06-14  Youenn Fablet  <youenn@apple.com>
> 
>         import-w3c-tests should respect WEBKIT_OUTPUTDIR
>Index: Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js
>===================================================================
>--- Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	(revision 246446)
>+++ Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js	(working copy)
>@@ -25,6 +25,7 @@
> 
> Dashboard = {
>     Platform: {
>+        macOSCatalina: { name: "macos-catalina", readableName: "macOS Catalina", order: 1 },
>         macOSMojave: { name: "macos-mojave", readableName: "macOS Mojave", order: 1 },
>         macOSHighSierra: { name: "macos-highsierra", readableName: "macOS High Sierra", order: 2 },
>         iOS12Simulator: { name: "ios-simulator-12", readableName: "iOS 12 Simulator", order: 20 },
>Index: Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css
>===================================================================
>--- Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	(revision 246446)
>+++ Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css	(working copy)
>@@ -205,6 +205,16 @@ table.queue-grid tr.platform.ios-12 img.
>     content: -webkit-image-set(url(../Images/IOS12@2x.png) 2x, url(../Images/IOS12.png) 1x);
> }
> 
>+table.queue-grid tr.platform.ios-simulator-13 img.logo {
>+    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
>+    content: -webkit-image-set(url(../Images/IOS13Simulator@2x.png) 2x, url(../Images/IOS13Simulator.png) 1x);
>+}
>+
>+table.queue-grid tr.platform.ios-13 img.logo {
>+    background: linear-gradient(155deg, #b1a8ed 16%,#aa3daa 50%);
>+    content: -webkit-image-set(url(../Images/IOS13@2x.png) 2x, url(../Images/IOS13.png) 1x);
>+}
>+
> table.queue-grid tr.platform.macos-highsierra img.logo {
>     content: -webkit-image-set(url(../Images/HighSierra@2x.png) 2x, url(../Images/HighSierra.png) 1x);
> }
>@@ -213,6 +223,10 @@ table.queue-grid tr.platform.macos-mojav
>     content: -webkit-image-set(url(../Images/Mojave@2x.png) 2x, url(../Images/Mojave.png) 1x);
> }
> 
>+table.queue-grid tr.platform.macos-catalina img.logo {
>+    content: -webkit-image-set(url(../Images/Catalina@2x.png) 2x, url(../Images/Catalina.png) 1x);
>+}
>+
> table.queue-grid tr.platform.wincairo-windows-10 img.logo {
>     content: -webkit-image-set(url(../Images/Windows10@2x.png) 2x, url(../Images/Windows10.png) 1x);
> }
>Index: Tools/BuildSlaveSupport/ews-build/steps.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/steps.py	(revision 246446)
>+++ Tools/BuildSlaveSupport/ews-build/steps.py	(working copy)
>@@ -1086,6 +1086,7 @@ class PrintConfiguration(steps.ShellSequ
>             return 'Unknown'
> 
>         build_to_name_mapping = {
>+            '10.15': 'Catalina',
>             '10.14': 'Mojave',
>             '10.13': 'High Sierra',
>             '10.12': 'Sierra',
>Index: Tools/Scripts/webkitpy/common/version_name_map.py
>===================================================================
>--- Tools/Scripts/webkitpy/common/version_name_map.py	(revision 246446)
>+++ Tools/Scripts/webkitpy/common/version_name_map.py	(working copy)
>@@ -60,10 +60,11 @@ class VersionNameMap(object):
>                 'Sierra': Version(10, 12),
>                 'High Sierra': Version(10, 13),
>                 'Mojave': Version(10, 14),
>+                'Catalina': Version(10, 15),
>             },
>-            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(12)),
>-            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(12)),
>-            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(5)),
>+            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(13)),
>+            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(13)),
>+            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(6)),
>             'win': {
>                 'Win10': Version(10),
>                 '8.1': Version(6, 3),
>Index: Tools/Scripts/webkitpy/common/version_name_map_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/common/version_name_map_unittest.py	(revision 246446)
>+++ Tools/Scripts/webkitpy/common/version_name_map_unittest.py	(working copy)
>@@ -36,6 +36,8 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_mac_version_by_name(self):
>         map = VersionNameMap()
>+        self.assertEqual(('mac', Version(10, 15)), map.from_name('Catalina'))
>+        self.assertEqual(('mac', Version(10, 15)), map.from_name('catalina'))
>         self.assertEqual(('mac', Version(10, 14)), map.from_name('Mojave'))
>         self.assertEqual(('mac', Version(10, 14)), map.from_name('mojave'))
>         self.assertEqual(('mac', Version(10, 13)), map.from_name('High Sierra'))
>@@ -57,6 +59,7 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_mac_name_by_version(self):
>         map = VersionNameMap()
>+        self.assertEqual('Catalina', map.to_name(version=Version(10, 15), platform='mac'))
>         self.assertEqual('Mojave', map.to_name(version=Version(10, 14), platform='mac'))
>         self.assertEqual('High Sierra', map.to_name(version=Version(10, 13), platform='mac'))
>         self.assertEqual('High Sierra', map.to_name(version=Version(10, 13, 3), platform='mac'))
>@@ -66,6 +69,7 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_ios_name_by_version(self):
>         map = VersionNameMap()
>+        self.assertEqual('iOS 13', map.to_name(version=Version(13), platform='ios'))
>         self.assertEqual('iOS 12', map.to_name(version=Version(12), platform='ios'))
>         self.assertEqual('iOS 11', map.to_name(version=Version(11), platform='ios'))
>         self.assertEqual('iOS 10', map.to_name(version=Version(10), platform='ios'))
>Index: Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
>===================================================================
>--- Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py	(revision 246446)
>+++ Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py	(working copy)
>@@ -226,7 +226,7 @@ class TestExpectationParser(object):
>     # FIXME: Update the original modifiers and remove this once the old syntax is gone.
>     _configuration_tokens_list = [
>         'SnowLeopard', 'Lion', 'MountainLion', 'Mavericks', 'Yosemite', 'ElCapitan', # Legacy macOS
>-        'Mac', 'Sierra', 'HighSierra', 'Mojave',
>+        'Mac', 'Sierra', 'HighSierra', 'Mojave', 'Catalina',
>         'Win', 'XP', 'Vista', 'Win7',
>         'Linux',
>         'Android',
>Index: Tools/TestResultServer/static-dashboards/flakiness_dashboard.js
>===================================================================
>--- Tools/TestResultServer/static-dashboards/flakiness_dashboard.js	(revision 246446)
>+++ Tools/TestResultServer/static-dashboards/flakiness_dashboard.js	(working copy)
>@@ -61,6 +61,12 @@ var PLATFORMS = {
>                             'WK2': { fallbackPlatforms: ['APPLE_MAC_MOJAVE', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
>                         }
>                     },
>+                    'CATALINA': {
>+                        subPlatforms: {
>+                            'WK1': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC'] },
>+                            'WK2': { fallbackPlatforms: ['APPLE_MAC_CATALINA', 'APPLE_MAC', 'WK2'], expectationsDirectory: 'mac-wk2'}
>+                        }
>+                    },
>                 }
>             },
>             'WIN': {
>@@ -359,6 +365,8 @@ function determineBuilderPlatform(builde
>     if (string.contains(builderNameUpperCase, 'WINCAIRO'))
>         return 'WINCAIRO';
> 
>+    if (string.contains(builderNameUpperCase, 'CATALINA'))
>+        return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_CATALINA');
>     if (string.contains(builderNameUpperCase, 'MOJAVE'))
>         return determineWKPlatform(builderNameUpperCase, 'APPLE_MAC_MOJAVE');
>     if (string.contains(builderNameUpperCase, 'HIGHSIERRA'))
>@@ -712,6 +720,7 @@ function getParsedExpectations(data)
>             'Sierra': 'SIERRA',
>             'HighSierra': 'HIGHSIERRA',
>             'Mojave': 'MOJAVE',
>+            'Catalina': 'CATALINA',
>             'Win7': 'WIN7',
>             'Win10': 'WIN10',
>             'XP': 'XP',

Actions: View | Formatted Diff | Diff

Attachments on bug 198492: 371205 | 372150 | 372151 | 372152 | 372153