Changeset 270054 in webkit

Timestamp:

Nov 19, 2020 4:23:12 PM (3 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Resolve baseline search path for Big Sur as default version
​https://bugs.webkit.org/show_bug.cgi?id=219176
<rdar://problem/71597951>

Reviewed by Dewei Zhu.

• Scripts/webkitpy/port/mac.py:

(MacPort.default_baseline_search_path):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-11-19  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Resolve baseline search path for Big Sur as default version
+        https://bugs.webkit.org/show_bug.cgi?id=219176
+        <rdar://problem/71597951>
+
+        Reviewed by Dewei Zhu.
+
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.default_baseline_search_path):
+
 2020-11-19  Jonathan Bedard  <jbedard@apple.com>
 

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

@@ -106 +106 @@
                 versions_to_fallback.append(Version.from_iterable(temp_version))
                 if temp_version < self.CURRENT_VERSION:
-                    if temp_version.minor < self.LAST_MACOSX.minor:
-                        temp_version.minor += 1
+                    if temp_version.major == self.LAST_MACOSX.major:
+                        if temp_version.minor < self.LAST_MACOSX.minor:
+                            temp_version.minor += 1
+                        else:
+                            temp_version = Version(11, 0)
                     else:
-                        temp_version = Version(11, 0)
+                        temp_version = Version(temp_version.major + 1)
                 else:
-                    if temp_version.minor > 0:
-                        temp_version.minor -= 1
-                    else:
-                        temp_version = Version(self.LAST_MACOSX.major, self.LAST_MACOSX.minor)
+                    temp_version = Version(temp_version.major - 1)
+
         wk_string = 'wk1'
         if self.get_option('webkit_test_runner'):