Changeset 217147 in webkit

Timestamp:

May 19, 2017, 1:47:44 PM (8 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Use simctl boot to run multiple simulators at once
​https://bugs.webkit.org/show_bug.cgi?id=172374

Reviewed by Alexey Proskuryakov.

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

(PlatformInfo.xcode_version): Return the current version of Xcode.

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

(MockPlatformInfo.xcode_version): Return version 8.0 for testing.

• Scripts/webkitpy/port/ios_simulator.py:

(IOSSimulatorPort.use_multiple_simulator_apps): Return true if we need to
run multiple Simulator.app instances.
(IOSSimulatorPort._create_simulators): Only copy the simulator app for older
versions of Xcode.
(IOSSimulatorPort._create_devices): Use 'simctl boot' directly unless using
an older version of Xcode.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo.py (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo_mock.py (modified) (1 diff)
• Scripts/webkitpy/port/ios_simulator.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-05-19  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Use simctl boot to run multiple simulators at once
+        https://bugs.webkit.org/show_bug.cgi?id=172374
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/common/system/platforminfo.py:
+        (PlatformInfo.xcode_version): Return the current version of Xcode.
+        * Scripts/webkitpy/common/system/platforminfo_mock.py:
+        (MockPlatformInfo.xcode_version): Return version 8.0 for testing.
+        * Scripts/webkitpy/port/ios_simulator.py:
+        (IOSSimulatorPort.use_multiple_simulator_apps): Return true if we need to
+        run multiple Simulator.app instances.
+        (IOSSimulatorPort._create_simulators): Only copy the simulator app for older
+        versions of Xcode.
+        (IOSSimulatorPort._create_devices): Use 'simctl boot' directly unless using
+        an older version of Xcode.
+
 2017-05-19  Wenson Hsieh  <wenson_hsieh@apple.com>
 

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

@@ -134 +134 @@
         return (line for line in output.splitlines())
 
+    def xcode_version(self):
+        if not self.is_mac():
+            raise NotImplementedError
+        return self._executive.run_command(['xcodebuild', '-version']).split()[1]
+
     def _determine_os_name(self, sys_platform):
         if sys_platform == 'darwin':

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

@@ -61 +61 @@
         return '8.1'
 
+    def xcode_version(self):
+        return '8.0'
+
     def xcode_simctl_list(self):
         return self.expected_xcode_simctl_list

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

@@ -171 +171 @@
                 _log.warning('Unable to remove Simulator' + str(i))
 
+    def use_multiple_simulator_apps(self):
+        return int(self.host.platform.xcode_version().split('.')[0]) < 9
+
     def _create_simulators(self):
         if (self.default_child_processes() < self.child_processes()):
@@ -179 +182 @@
         if self._using_dedicated_simulators():
             atexit.register(lambda: self._teardown_managed_simulators())
-            self._createSimulatorApps()
+
+            if self.use_multiple_simulator_apps():
+                self._createSimulatorApps()
 
             for i in xrange(self.child_processes()):
@@ -212 +217 @@
 
             # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
-            self._executive.run_command([
-                'open', '-g', '-b', self.SIMULATOR_BUNDLE_ID + str(i),
-                '--args', '-CurrentDeviceUDID', device_udid])
+            if self.use_multiple_simulator_apps():
+                self._executive.run_command([
+                    'open', '-g', '-b', self.SIMULATOR_BUNDLE_ID + str(i),
+                    '--args', '-CurrentDeviceUDID', device_udid])
+            else:
+                self._executive.run_command(['xcrun', 'simctl', 'boot', device_udid])
 
             if mac_os_version in ['elcapitan', 'yosemite', 'mavericks']:
                 time.sleep(2.5)
+
+        if not self.use_multiple_simulator_apps():
+            self._executive.run_command(['open', '-g', '-b', self.SIMULATOR_BUNDLE_ID])
 
         _log.info('Waiting for all iOS Simulators to finish booting.')
         for i in xrange(self.child_processes()):
             Simulator.wait_until_device_is_booted(Simulator.managed_devices[i].udid)
+        _log.info('All simulators have booted.')
 
         IOSSimulatorPort._DEVICE_MAP = {}