Changeset 263561 in webkit

Timestamp:

Jun 26, 2020 9:31:56 AM (4 years ago)

Author:

Jonathan Bedard

Message:

[Big Sur] Handle baseline search path
​https://bugs.webkit.org/show_bug.cgi?id=213639
<rdar://problem/64789480>

Rubber-stamped by Aakash Jain.

• Scripts/webkitpy/port/mac.py:

(MacPort):
(MacPort.default_baseline_search_path): Break infinite loop for major version bump.

• Scripts/webkitpy/port/mac_unittest.py:

(MacTest.test_big_sur_baseline_search_path): Test Big Sur baseline search path.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/mac.py (modified) (2 diffs)
• Scripts/webkitpy/port/mac_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-06-26  Jonathan Bedard  <jbedard@apple.com>
+
+        [Big Sur] Handle baseline search path
+        https://bugs.webkit.org/show_bug.cgi?id=213639
+        <rdar://problem/64789480>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort):
+        (MacPort.default_baseline_search_path): Break infinite loop for major version bump.
+        * Scripts/webkitpy/port/mac_unittest.py:
+        (MacTest.test_big_sur_baseline_search_path): Test Big Sur baseline search path.
+
 2020-06-26  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/mac.py

@@ -47 +47 @@
 
     CURRENT_VERSION = Version(10, 15)
+    LAST_MACOSX = Version(10, 16)  # FIXME: Once we don't need to support the seed, deprecate in favor of Catalina
 
     SDK = 'macosx'
@@ -80 +81 @@
                 versions_to_fallback.append(Version.from_iterable(temp_version))
                 if temp_version < self.CURRENT_VERSION:
-                    temp_version.minor += 1
+                    if temp_version.minor < self.LAST_MACOSX.minor:
+                        temp_version.minor += 1
+                    else:
+                        temp_version = Version(11, 0)
                 else:
-                    temp_version.minor -= 1
+                    if temp_version.minor > 0:
+                        temp_version.minor -= 1
+                    else:
+                        temp_version = self.LAST_MACOSX
         wk_string = 'wk1'
         if self.get_option('webkit_test_runner'):

trunk/Tools/Scripts/webkitpy/port/mac_unittest.py

@@ -161 +161 @@
         self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/mac-mountainlion-wk1')
 
+    def test_big_sur_baseline_search_path(self):
+        search_path = self.make_port(port_name='macos-big-sur').default_baseline_search_path()
+        self.assertEqual(search_path[0], '/mock-checkout/LayoutTests/platform/mac-catalina-wk1')
+        self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/mac-catalina')
+        self.assertEqual(search_path[2], '/mock-checkout/LayoutTests/platform/mac-wk1')
+        self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/mac')
+
     def test_factory_with_future_version(self):
         port = self.make_port(options=MockOptions(webkit_test_runner=True), os_version=MacTest.FUTURE_VERSION, os_name='mac', port_name='mac')