Changeset 285772 in webkit

Timestamp:

Nov 12, 2021, 8:45:28 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Symlink daemons into simulator runtime root
​https://bugs.webkit.org/show_bug.cgi?id=233080
<rdar://problem/85362551>

Reviewed by Brady Eidson.

• Scripts/webkitpy/api_tests/manager.py:

(Manager._initialize_devices): Symlink daemons in the WebKit.framework into
simulator runtime root.

• Scripts/webkitpy/common/system/filesystem.py:

(FileSystem.symlink):

• Scripts/webkitpy/common/system/filesystem_mock.py:

(MockFileSystem.symlink):

• Scripts/webkitpy/port/darwin.py:

(DarwinPort.path_to_daemons):

• Scripts/webkitpy/xcode/simulated_device.py:

(SimulatedDeviceManager.Runtime.init): Add root.
(SimulatedDeviceManager._create_device_with_runtime): Pass runtime.
(SimulatedDevice.init): Link to runtime.

• Scripts/webkitpy/xcode/simulated_device_unittest.py:

Canonical link: ​https://commits.webkit.org/244216@main

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/api_tests/manager.py (modified) (1 diff)
• Scripts/webkitpy/common/system/filesystem.py (modified) (1 diff)
• Scripts/webkitpy/common/system/filesystem_mock.py (modified) (1 diff)
• Scripts/webkitpy/port/darwin.py (modified) (1 diff)
• Scripts/webkitpy/xcode/simulated_device.py (modified) (4 diffs)
• Scripts/webkitpy/xcode/simulated_device_unittest.py (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-12  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Symlink daemons into simulator runtime root
+        https://bugs.webkit.org/show_bug.cgi?id=233080
+        <rdar://problem/85362551>
+
+        Reviewed by Brady Eidson.
+
+        * Scripts/webkitpy/api_tests/manager.py:
+        (Manager._initialize_devices): Symlink daemons in the WebKit.framework into
+        simulator runtime root.
+        * Scripts/webkitpy/common/system/filesystem.py:
+        (FileSystem.symlink):
+        * Scripts/webkitpy/common/system/filesystem_mock.py:
+        (MockFileSystem.symlink):
+        * Scripts/webkitpy/port/darwin.py:
+        (DarwinPort.path_to_daemons):
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDeviceManager.Runtime.__init__): Add root.
+        (SimulatedDeviceManager._create_device_with_runtime): Pass runtime.
+        (SimulatedDevice.__init__): Link to runtime.
+        * Scripts/webkitpy/xcode/simulated_device_unittest.py:
+
 2021-11-12  Darin Adler  <darin@apple.com>
 

trunk/Tools/Scripts/webkitpy/api_tests/manager.py

@@ -153 +153 @@
         if 'simulator' in self._port.port_name:
             SimulatedDeviceManager.initialize_devices(DeviceRequest(self._port.DEVICE_TYPE, allow_incomplete_match=True), self.host, simulator_ui=False)
+
+            # A Daemons executable path must be located within the runtime root.
+            roots = {
+                device.platform_device.runtime.root for device in SimulatedDeviceManager.INITIALIZED_DEVICES
+                if device.platform_device.runtime and device.platform_device.runtime.root
+            }
+            fs = self._port.host.filesystem
+            for root in roots:
+                _log.debug("Linking Daemons into runtime root '{}'".format(root))
+                for file in fs.files_under(self._port.path_to_daemons()):
+                    target = fs.join(root, 'usr', 'local', 'bin', 'webkit-testing', fs.basename(file))
+                    fs.maybe_make_directory(fs.dirname(target))
+                    if fs.isfile(target):
+                        fs.remove(target)
+                    fs.symlink(file, target)
+
         elif 'device' in self._port.port_name:
             raise RuntimeError('Running api tests on {} is not supported'.format(self._port.port_name))

trunk/Tools/Scripts/webkitpy/common/system/filesystem.py

@@ -340 +340 @@
         else:
             self.copyfile(source, destination)
+
+    def symlink(self, *args, **kwargs):
+        os.symlink(*args, **kwargs)

trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py

@@ -437 +437 @@
         self.move(source, destination)
 
+    def symlink(self, src, dst):
+        self.move(src, dst)
+
 
 class WritableBinaryFileObject(object):

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

@@ -82 +82 @@
     def _path_to_webcore_library(self):
         return self._build_path('WebCore.framework/Versions/A/WebCore')
+
+    def path_to_daemons(self):
+        return self._build_path('WebKit.framework/Daemons')
 
     def show_results_html_file(self, results_filename):

trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py

@@ -61 +61 @@
             self.identifier = runtime_dict['identifier']
             self.name = runtime_dict['name']
+            self.root = runtime_dict.get('runtimeRoot')
 
     AVAILABLE_RUNTIMES = []
@@ -124 +125 @@
             device_type=device_type,
             build_version=runtime.build_version,
+            runtime=runtime,
         ))
         SimulatedDeviceManager.AVAILABLE_DEVICES.append(result)
@@ -545 +547 @@
     }
 
-    def __init__(self, name, udid, host, device_type, build_version):
+    def __init__(self, name, udid, host, device_type, build_version, runtime):
         assert device_type.software_version
 
@@ -552 +554 @@
         self.device_type = device_type
         self.build_version = build_version
+        self.runtime = runtime
         self._state = SimulatedDevice.DeviceState.SHUTTING_DOWN
 

trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py

@@ -169 +169 @@
      "name" : "iOS 9.3",
      "identifier" : "com.apple.CoreSimulator.SimRuntime.iOS-9-3",
-     "version" : "9.3"
+     "version" : "9.3",
+     "runtimeRoot" : "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 9.3.simruntime/Contents/Resources/RuntimeRoot"
    },
    {
@@ -176 +177 @@
      "name" : "iOS 11.0",
      "identifier" : "com.apple.CoreSimulator.SimRuntime.iOS-11-0",
-     "version" : "11.0.1"
+     "version" : "11.0.1",
+     "runtimeRoot" : "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 11.0.1.simruntime/Contents/Resources/RuntimeRoot"
    },
    {
@@ -183 +185 @@
      "name" : "tvOS 11.0",
      "identifier" : "com.apple.CoreSimulator.SimRuntime.tvOS-11-0",
-     "version" : "11.0"
+     "version" : "11.0",
+     "runtimeRoot" : "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/tvOS 11.simruntime/Contents/Resources/RuntimeRoot"
    },
    {
@@ -190 +193 @@
      "name" : "watchOS 4.0",
      "identifier" : "com.apple.CoreSimulator.SimRuntime.watchOS-4-0",
-     "version" : "4.0"
+     "version" : "4.0",
+     "runtimeRoot" : "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/watchOS 4.simruntime/Contents/Resources/RuntimeRoot"
    },
    {
@@ -197 +201 @@
      "name" : "iOS 12.0",
      "identifier" : "com.apple.CoreSimulator.SimRuntime.iOS-12-0",
-     "version" : "12.0"
+     "version" : "12.0",
+     "runtimeRoot" : "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Library/Developer/CoreSimulator/Profiles/Runtimes/iOS 12.simruntime/Contents/Resources/RuntimeRoot"
    }
  ],