Changeset 209136 in webkit

Timestamp:

Nov 30, 2016 10:30:47 AM (7 years ago)

Author:

Jonathan Bedard

Message:

Make it possible to use an existing simulator instance for one-off testing
​https://bugs.webkit.org/show_bug.cgi?id=164568
<rdar://problem/29189133>

Reviewed by Daniel Bates.

With this patch, if a simulator is currently running on the machine and
'--dedicated-simulators' is not passed into the application, only one simulator
instance will be used, and this instance will be the existing instance.
If no simulator is running or '--dedicated-simulators' is passed to the script,
previous behavior will be used.

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):

• Scripts/webkitpy/port/ios.py:

(IOSSimulatorPort.init): Logic for enabling usage of currently running simulator.
(IOSSimulatorPort._create_simulators): Only create simulators when needed, don't reset already running simulators.
(IOSSimulatorPort.setup_test_run): Don't open already running simulators.
(IOSSimulatorPort._quit_ios_simulator): Only quit simulators if we manage them.
(IOSSimulatorPort.clean_up_test_run): Only clean up simulators if we manage them.
(IOSSimulatorPort._using_dedicated_simulators): True if simulators need to be managed, false if using an existing instance.
(IOSSimulatorPort.device_id_for_worker_number): Access currently running simulator if not managing devices.

• Scripts/webkitpy/xcode/simulator.py:

(Simulator.current_device): Get currently running device.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/port/ios.py (modified) (7 diffs)
• Scripts/webkitpy/xcode/simulator.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-11-30  Jonathan Bedard  <jbedard@apple.com>
+
+        Make it possible to use an existing simulator instance for one-off testing
+        https://bugs.webkit.org/show_bug.cgi?id=164568
+        <rdar://problem/29189133>
+
+        Reviewed by Daniel Bates.
+
+        With this patch, if a simulator is currently running on the machine and
+        '--dedicated-simulators' is not passed into the application, only one simulator
+        instance will be used, and this instance will be the existing instance.
+        If no simulator is running or '--dedicated-simulators' is passed to the script,
+        previous behavior will be used.
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (parse_args):
+        * Scripts/webkitpy/port/ios.py:
+        (IOSSimulatorPort.__init__): Logic for enabling usage of currently running simulator.
+        (IOSSimulatorPort._create_simulators): Only create simulators when needed, don't reset already running simulators.
+        (IOSSimulatorPort.setup_test_run): Don't open already running simulators.
+        (IOSSimulatorPort._quit_ios_simulator): Only quit simulators if we manage them.
+        (IOSSimulatorPort.clean_up_test_run): Only clean up simulators if we manage them. 
+        (IOSSimulatorPort._using_dedicated_simulators): True if simulators need to be managed, false if using an existing instance.
+        (IOSSimulatorPort.device_id_for_worker_number): Access currently running simulator if not managing devices.
+        * Scripts/webkitpy/xcode/simulator.py:
+        (Simulator.current_device): Get currently running device.
+
 2016-11-29  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -297 +297 @@
         optparse.make_option('--runtime', help='iOS Simulator runtime identifier (default: latest runtime)'),
         optparse.make_option('--device-type', help='iOS Simulator device type identifier (default: i386 -> iPhone 5, x86_64 -> iPhone 5s)'),
+        optparse.make_option('--dedicated-simulators', action="store_true", default=False,
+            help="If set, dedicated iOS simulators will always be created.  If not set, the script will attempt to use any currently running simulator."),
     ]))
 

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

@@ -104 +104 @@
         _log.debug('IOSSimulatorPort _device_class is %s', self._device_class)
 
+        self._current_device = Simulator().current_device()
+        if not self._current_device:
+            self.set_option('dedicated_simulators', True)
+        if not self.get_option('dedicated_simulators'):
+            if self.get_option('child_processes') > 1:
+                _log.warn('Cannot have more than one child process when using a running simulator.  Setting child_processes to 1.')
+            self.set_option('child_processes', 1)
+
     def driver_name(self):
         if self.get_option('driver_name'):
@@ -277 +285 @@
                 _log.warn("This is very likely to fail.")
 
-        self._createSimulatorApps()
-
-        for i in xrange(self.child_processes()):
-            self._create_device(i)
-
-        for i in xrange(self.child_processes()):
-            device_udid = self._testing_device(i).udid
-            Simulator.wait_until_device_is_in_state(device_udid, Simulator.DeviceState.SHUTDOWN)
-            Simulator.reset_device(device_udid)
+        if self._using_dedicated_simulators():
+            self._createSimulatorApps()
+
+            for i in xrange(self.child_processes()):
+                self._create_device(i)
+
+            for i in xrange(self.child_processes()):
+                device_udid = self._testing_device(i).udid
+                Simulator.wait_until_device_is_in_state(device_udid, Simulator.DeviceState.SHUTDOWN)
+                Simulator.reset_device(device_udid)
+        else:
+            assert(self._current_device)
+            if self._current_device.name != self.simulator_device_type().name:
+                _log.warn("Expected simulator of type '" + self.simulator_device_type().name + "' but found simulator of type '" + self._current_device.name + "'")
+                _log.warn('The next block of tests may fail due to device mis-match')
 
     def setup_test_run(self, device_class=None):
@@ -296 +310 @@
 
         self._create_simulators()
+
+        if not self._using_dedicated_simulators():
+            return
 
         for i in xrange(self.child_processes()):
@@ -314 +331 @@
 
     def _quit_ios_simulator(self):
+        if not self._using_dedicated_simulators():
+            return
         _log.debug("_quit_ios_simulator killing all Simulator processes")
         # FIXME: We should kill only the Simulators we started.
@@ -329 +348 @@
                 _log.warning('Unable to remove ' + fifo)
                 pass
+
+        if not self._using_dedicated_simulators():
+            return
 
         for i in xrange(self.child_processes()):
@@ -380 +402 @@
     SUBPROCESS_CRASH_REGEX = re.compile('#CRASHED - (?P<subprocess_name>\S+) \(pid (?P<subprocess_pid>\d+)\)')
 
+    def _using_dedicated_simulators(self):
+        return self.get_option('dedicated_simulators')
+
     def _create_device(self, number):
         return Simulator.create_device(number, self.simulator_device_type(), self.simulator_runtime)
@@ -393 +418 @@
         if self._printing_cmd_line:
             return '<dummy id>'
-        return self._testing_device(number).udid
+        if self._using_dedicated_simulators():
+            return self._testing_device(number).udid
+        return self._current_device.udid
 
     def get_simulator_path(self, suffix=""):

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

@@ -530 +530 @@
         return None
 
+    def current_device(self):
+        # FIXME: Find the simulator device that was booted by Simulator.app. For now, pick some booted simulator device, which
+        # may have been booted using the simctl command line tool.
+        for device in self.devices:
+            if device.state == Simulator.DeviceState.BOOTED:
+                return device
+        return None
+
     # FIXME: We should find an existing device with respect to its name, device type and runtime.
     def device(self, name=None, runtime=None, should_ignore_unavailable_devices=False):