Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[webkitpy] Bump CURRENT_VERSION to 11.0 for Mac port
https://bugs.webkit.org/show_bug.cgi?id=218581

Reviewed by Jonathan Bedard.

* Scripts/webkitpy/port/mac.py:
(MacPort):
* Scripts/webkitpy/port/mac_unittest.py:
(MacTest):
(MacTest.test_big_sur_baseline_search_path):


Canonical link: https://commits.webkit.org/231484@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@269705 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
ryanhaddad committed Nov 12, 2020
1 parent fd3c86f commit d26aa95
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
13 changes: 13 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,16 @@
2020-11-11 Ryan Haddad <ryanhaddad@apple.com>

[webkitpy] Bump CURRENT_VERSION to 11.0 for Mac port
https://bugs.webkit.org/show_bug.cgi?id=218581

Reviewed by Jonathan Bedard.

* Scripts/webkitpy/port/mac.py:
(MacPort):
* Scripts/webkitpy/port/mac_unittest.py:
(MacTest):
(MacTest.test_big_sur_baseline_search_path):

2020-11-11 Sam Weinig <weinig@apple.com>

Remove unused ExperimentalNotificationsEnabled setting
Expand Down
4 changes: 2 additions & 2 deletions Tools/Scripts/webkitpy/port/mac.py
Expand Up @@ -46,8 +46,8 @@
class MacPort(DarwinPort):
port_name = "mac"

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
CURRENT_VERSION = Version(11, 0)
LAST_MACOSX = Version(10, 15)

SDK = 'macosx'

Expand Down
6 changes: 3 additions & 3 deletions Tools/Scripts/webkitpy/port/mac_unittest.py
Expand Up @@ -49,7 +49,7 @@ class MacTest(darwin_testcase.DarwinTest):

# 2 minor versions from the current version should always be a future version.
FUTURE_VERSION = Version.from_iterable(MacPort.CURRENT_VERSION)
FUTURE_VERSION.minor += 2
FUTURE_VERSION.major += 2


def test_version(self):
Expand Down Expand Up @@ -203,8 +203,8 @@ def test_layout_test_searchpath_with_apple_additions(self):

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[0], '/mock-checkout/LayoutTests/platform/mac-bigsur-wk1')
self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/mac-bigsur')
self.assertEqual(search_path[2], '/mock-checkout/LayoutTests/platform/mac-wk1')
self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/mac')

Expand Down

0 comments on commit d26aa95

Please sign in to comment.