REGRESSION (r226715): don't re-check number of simulators in child processes
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Jan 2018 19:58:25 +0000 (19:58 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Jan 2018 19:58:25 +0000 (19:58 +0000)
https://bugs.webkit.org/show_bug.cgi?id=181484
<rdar://problem/36407151>

Reviewed by Aakash Jain.

* Scripts/webkitpy/port/ios_simulator.py:
(IOSSimulatorPort.__init__): Skip the number of simulators check if simulators
are already initialized.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@226726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index dcaff43993d37b4f74e336dc563a8a49f7566c7d..c94ba1af2c167e5090a6ceaf7e1491222ca3489b 100644 (file)
@@ -1,3 +1,15 @@
+2018-01-10  Jonathan Bedard  <jbedard@apple.com>
+
+        REGRESSION (r226715): don't re-check number of simulators in child processes
+        https://bugs.webkit.org/show_bug.cgi?id=181484
+        <rdar://problem/36407151>
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/webkitpy/port/ios_simulator.py:
+        (IOSSimulatorPort.__init__): Skip the number of simulators check if simulators
+        are already initialized.
+
 2018-01-10  Commit Queue  <commit-queue@webkit.org>
 
         Unreviewed, rolling out r226667 and r226673.
index 6a8cbed15a6ab128a2ace775e962db2ba82c4918..f219edbabc883db11a53aba6339be1f67d5b1e97 100644 (file)
@@ -50,7 +50,7 @@ class IOSSimulatorPort(IOSPort):
         self._device_class = optional_device_class if optional_device_class else self.DEFAULT_DEVICE_CLASS
         _log.debug('IOSSimulatorPort _device_class is %s', self._device_class)
 
-        if self.get_option('child_processes', self.default_child_processes()) > SimulatedDeviceManager.max_supported_simulators(self.host):
+        if not SimulatedDeviceManager.INITIALIZED_DEVICES and self.get_option('child_processes', self.default_child_processes()) > SimulatedDeviceManager.max_supported_simulators(self.host):
             _log.warn('The specified number of Simulated devices to be used is greater than the number supported by this machine.')
 
     def _device_for_worker_number_map(self):