Attachment 342177 Details for Bug 186285 – Patch

[patch] Patch

patch.patch (text/plain), 14.81 KB, created by Jonathan Bedard on 2018-06-07 09:28:19 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-06-07 09:28:19 PDT

Size: 14.81 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 232582)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-06-07  Jonathan Bedard  <jbedard@apple.com>
>+
>+        Add iOS 12 and watchOS 5 to webkitpy
>+        https://bugs.webkit.org/show_bug.cgi?id=186285
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/build.webkit.org-config/wkbuild.py:
>+        * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py:
>+        Trigger the right build queues for iOS 12 on check-in.
>+        * Scripts/webkitpy/common/version_name_map.py:
>+        (VersionNameMap.__init__): Add iOS 12, tvOS 12 and watchOS 5.
>+        * Scripts/webkitpy/common/version_name_map_unittest.py:
>+        (VersionMapTestCase.test_ios_name_by_version): Test iOS 12 version-name mapping.
>+        * Scripts/webkitpy/port/ios_device_unittest.py:
>+        (IOSDeviceTest.test_layout_test_searchpath_without_apple_additions):
>+        * Scripts/webkitpy/port/ios_simulator_unittest.py:
>+        (IOSSimulatorTest.test_layout_test_searchpath_without_apple_additions):
>+
> 2018-06-07  Fujii Hironori  <Hironori.Fujii@sony.com>
> 
>         [Win][MiniBrowser] Support multiple windows properly
>Index: Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py
>===================================================================
>--- Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	(revision 232581)
>+++ Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild.py	(working copy)
>@@ -37,7 +37,7 @@ def _should_file_trigger_build(target_pl
>     # and start using it for their bots. Someone familiar with each platform
>     # will have to figure out what the right set of directories/patterns is for
>     # that platform.
>-    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-11", "ios-simulator-11"))
>+    assert(target_platform in ("mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"))
> 
>     directories = [
>         # Directories that shouldn't trigger builds on any bots.
>Index: Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py
>===================================================================
>--- Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	(revision 232581)
>+++ Tools/BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py	(working copy)
>@@ -29,8 +29,8 @@ class ShouldBuildTest(unittest.TestCase)
>         (["ChangeLog", "Source/WebCore/ChangeLog", "Source/WebKit/ChangeLog-2011-02-11"], []),
>         (["Websites/bugs.webkit.org/foo", "Source/WebCore/bar"], ["*"]),
>         (["Websites/bugs.webkit.org/foo"], []),
>-        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11"]),
>-        (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11"]),
>+        (["Source/JavaScriptCore/JavaScriptCore.xcodeproj/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>+        (["Source/JavaScriptCore/Configurations/Base.xcconfig"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>         (["Source/JavaScriptCore/JavaScriptCore.vcproj/foo", "Source/WebKit/win/WebKit2.vcproj", "Source/WebKitLegacy/win/WebKit.sln", "Tools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops"], ["win"]),
>         (["LayoutTests/platform/mac/foo", "Source/WebCore/bar"], ["*"]),
>         (["LayoutTests/foo"], ["*"]),
>@@ -40,10 +40,10 @@ class ShouldBuildTest(unittest.TestCase)
>         (["LayoutTests/platform/mac-sierra/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra"]),
>         (["LayoutTests/platform/mac-highsierra/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
>         (["LayoutTests/platform/mac-mojave/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
>-        (["LayoutTests/platform/ios-simulator/foo"], ["ios-11", "ios-simulator-11"]),
>-        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-11", "ios-simulator-11"]),
>-        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-11", "ios-simulator-11"]),
>-        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11"]),
>+        (["LayoutTests/platform/ios-simulator/foo"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>+        (["LayoutTests/platform/ios-simulator-wk1/foo"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>+        (["LayoutTests/platform/ios-simulator-wk2/foo"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>+        (["LayoutTests/platform/wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>         (["LayoutTests/platform/mac-wk2/Skipped"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
>         (["LayoutTests/platform/mac-wk1/compositing/tiling/transform-origin-tiled-expected.txt"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
>         (["LayoutTests/platform/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win"]),
>@@ -51,19 +51,19 @@ class ShouldBuildTest(unittest.TestCase)
>         (["LayoutTests/platform/win-xp/foo"], ["win"]),
>         (["LayoutTests/platform/win-wk1/foo"], ["win"]),
>         (["LayoutTests/platform/win/foo"], ["win"]),
>-        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11"]),
>-        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-11", "ios-simulator-11"]),
>+        (["LayoutTests/platform/spi/cocoa/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>+        (["LayoutTests/platform/spi/cf/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>         (["Source/WebKitLegacy/mac/WebKit.mac.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
>-        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-11", "ios-simulator-11"]),
>-        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11"]),
>-        (["Source/WebCore/ios/foo"], ["ios-11", "ios-simulator-11"]),
>+        (["Source/WebKitLegacy/ios/WebKit.iOS.exp"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>+        (["Source/Dummy/foo.exp"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>+        (["Source/WebCore/ios/foo"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>         (["Source/WebCore/mac/foo"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
>         (["Source/WebCore/win/foo"], ["win"]),
>-        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11"]),
>+        (["Source/WebCore/bridge/objc/objc_class.mm"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>         (["Source/WebCore/platform/wx/wxcode/win/foo"], []),
>-        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-11", "ios-simulator-11"]),
>+        (["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>         (["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
>-        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-11", "ios-simulator-11"]),
>+        (["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]),
>         (["Tools/BuildSlaveSupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
>     ]
> 
>@@ -71,7 +71,7 @@ class ShouldBuildTest(unittest.TestCase)
>         for files, platforms in self._should_build_tests:
>             # FIXME: We should test more platforms here once
>             # wkbuild._should_file_trigger_build is implemented for them.
>-            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-11", "ios-simulator-11"]:
>+            for platform in ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "win", "ios-11", "ios-simulator-11", "ios-12", "ios-simulator-12"]:
>                 should_build = platform in platforms or "*" in platforms
>                 self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))
> 
>Index: Tools/Scripts/webkitpy/common/version_name_map.py
>===================================================================
>--- Tools/Scripts/webkitpy/common/version_name_map.py	(revision 232581)
>+++ Tools/Scripts/webkitpy/common/version_name_map.py	(working copy)
>@@ -61,9 +61,9 @@ class VersionNameMap(object):
>                 'High Sierra': Version(10, 13),
>                 'Mojave': Version(10, 14),
>             },
>-            'ios': self._automap_to_major_version('iOS', minimum=Version(10), maximum=Version(11)),
>-            'tvos': self._automap_to_major_version('tvOS', minimum=Version(10), maximum=Version(11)),
>-            'watchos': self._automap_to_major_version('watchOS', minimum=Version(1), maximum=Version(4)),
>+            '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)),
>             '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 232581)
>+++ Tools/Scripts/webkitpy/common/version_name_map_unittest.py	(working copy)
>@@ -66,6 +66,7 @@ class VersionMapTestCase(unittest.TestCa
> 
>     def test_ios_name_by_version(self):
>         map = VersionNameMap()
>+        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'))
>         self.assertEqual('iOS 10', map.to_name(version=Version(10, 3), platform='ios'))
>Index: Tools/Scripts/webkitpy/port/ios_device_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/port/ios_device_unittest.py	(revision 232581)
>+++ Tools/Scripts/webkitpy/port/ios_device_unittest.py	(working copy)
>@@ -24,6 +24,7 @@ import time
> 
> from webkitpy.common.system.outputcapture import OutputCapture
> from webkitpy.common.system.executive_mock import MockExecutive2, ScriptError
>+from webkitpy.common.version import Version
> from webkitpy.port.ios_device import IOSDevicePort
> from webkitpy.port import ios_testcase
> from webkitpy.port import port_testcase
>@@ -100,3 +101,15 @@ class IOSDeviceTest(ios_testcase.IOSTest
>         self.assertEqual(search_path[9], '/mock-checkout/LayoutTests/platform/ios-11')
>         self.assertEqual(search_path[10], '/additional_testing_path/ios-wk1')
>         self.assertEqual(search_path[11], '/mock-checkout/LayoutTests/platform/ios-wk1')
>+
>+    def test_layout_test_searchpath_without_apple_additions(self):
>+        search_path = self.make_port(port_name='ios-device-wk2', os_version=Version(12)).default_baseline_search_path()
>+
>+        self.assertEqual(search_path[0], '/mock-checkout/LayoutTests/platform/ios-device-12-wk2')
>+        self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/ios-device-12')
>+        self.assertEqual(search_path[2], '/mock-checkout/LayoutTests/platform/ios-device-wk2')
>+        self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/ios-device')
>+        self.assertEqual(search_path[4], '/mock-checkout/LayoutTests/platform/ios-12')
>+        self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/ios-wk2')
>+        self.assertEqual(search_path[6], '/mock-checkout/LayoutTests/platform/ios')
>+        self.assertEqual(search_path[7], '/mock-checkout/LayoutTests/platform/wk2')
>Index: Tools/Scripts/webkitpy/port/ios_simulator_unittest.py
>===================================================================
>--- Tools/Scripts/webkitpy/port/ios_simulator_unittest.py	(revision 232581)
>+++ Tools/Scripts/webkitpy/port/ios_simulator_unittest.py	(working copy)
>@@ -103,3 +103,15 @@ class IOSSimulatorTest(ios_testcase.IOST
>         self.assertEqual(search_path[9], '/mock-checkout/LayoutTests/platform/ios-11')
>         self.assertEqual(search_path[10], '/additional_testing_path/ios-wk1')
>         self.assertEqual(search_path[11], '/mock-checkout/LayoutTests/platform/ios-wk1')
>+
>+    def test_layout_test_searchpath_without_apple_additions(self):
>+        search_path = self.make_port(port_name='ios-simulator-wk2', os_version=Version(12)).default_baseline_search_path()
>+
>+        self.assertEqual(search_path[0], '/mock-checkout/LayoutTests/platform/ios-simulator-12-wk2')
>+        self.assertEqual(search_path[1], '/mock-checkout/LayoutTests/platform/ios-simulator-12')
>+        self.assertEqual(search_path[2], '/mock-checkout/LayoutTests/platform/ios-simulator-wk2')
>+        self.assertEqual(search_path[3], '/mock-checkout/LayoutTests/platform/ios-simulator')
>+        self.assertEqual(search_path[4], '/mock-checkout/LayoutTests/platform/ios-12')
>+        self.assertEqual(search_path[5], '/mock-checkout/LayoutTests/platform/ios-wk2')
>+        self.assertEqual(search_path[6], '/mock-checkout/LayoutTests/platform/ios')
>+        self.assertEqual(search_path[7], '/mock-checkout/LayoutTests/platform/wk2')

Actions: View | Formatted Diff | Diff

Attachments on bug 186285: 341921 | 342177