<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209136] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209136">209136</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2016-11-30 10:30:47 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulatorpy">trunk/Tools/Scripts/webkitpy/xcode/simulator.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (209135 => 209136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-30 18:03:23 UTC (rev 209135)
+++ trunk/Tools/ChangeLog 2016-11-30 18:30:47 UTC (rev 209136)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-11-29 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [Linux] run-benchmark should be able to execute the benchmarks with more browsers.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (209135 => 209136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2016-11-30 18:03:23 UTC (rev 209135)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2016-11-30 18:30:47 UTC (rev 209136)
</span><span class="lines">@@ -296,6 +296,8 @@
</span><span class="cx"> option_group_definitions.append(("iOS Simulator Options", [
</span><span class="cx"> optparse.make_option('--runtime', help='iOS Simulator runtime identifier (default: latest runtime)'),
</span><span class="cx"> optparse.make_option('--device-type', help='iOS Simulator device type identifier (default: i386 -> iPhone 5, x86_64 -> iPhone 5s)'),
</span><ins>+ 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."),
</ins><span class="cx"> ]))
</span><span class="cx">
</span><span class="cx"> option_group_definitions.append(("Miscellaneous Options", [
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (209135 => 209136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2016-11-30 18:03:23 UTC (rev 209135)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2016-11-30 18:30:47 UTC (rev 209136)
</span><span class="lines">@@ -103,6 +103,14 @@
</span><span class="cx"> self._device_class = optional_device_class if optional_device_class else self.DEFAULT_DEVICE_CLASS
</span><span class="cx"> _log.debug('IOSSimulatorPort _device_class is %s', self._device_class)
</span><span class="cx">
</span><ins>+ 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)
+
</ins><span class="cx"> def driver_name(self):
</span><span class="cx"> if self.get_option('driver_name'):
</span><span class="cx"> return self.get_option('driver_name')
</span><span class="lines">@@ -276,15 +284,21 @@
</span><span class="cx"> _log.warn("maximum child-processes which can be supported on this system are: {0}".format(self.default_child_processes()))
</span><span class="cx"> _log.warn("This is very likely to fail.")
</span><span class="cx">
</span><del>- self._createSimulatorApps()
</del><ins>+ if self._using_dedicated_simulators():
+ self._createSimulatorApps()
</ins><span class="cx">
</span><del>- for i in xrange(self.child_processes()):
- self._create_device(i)
</del><ins>+ for i in xrange(self.child_processes()):
+ self._create_device(i)
</ins><span class="cx">
</span><del>- 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)
</del><ins>+ 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')
</ins><span class="cx">
</span><span class="cx"> def setup_test_run(self, device_class=None):
</span><span class="cx"> mac_os_version = self.host.platform.os_version
</span><span class="lines">@@ -296,6 +310,9 @@
</span><span class="cx">
</span><span class="cx"> self._create_simulators()
</span><span class="cx">
</span><ins>+ if not self._using_dedicated_simulators():
+ return
+
</ins><span class="cx"> for i in xrange(self.child_processes()):
</span><span class="cx"> device_udid = self._testing_device(i).udid
</span><span class="cx"> _log.debug('testing device %s has udid %s', i, device_udid)
</span><span class="lines">@@ -313,6 +330,8 @@
</span><span class="cx"> Simulator.wait_until_device_is_booted(self._testing_device(i).udid)
</span><span class="cx">
</span><span class="cx"> def _quit_ios_simulator(self):
</span><ins>+ if not self._using_dedicated_simulators():
+ return
</ins><span class="cx"> _log.debug("_quit_ios_simulator killing all Simulator processes")
</span><span class="cx"> # FIXME: We should kill only the Simulators we started.
</span><span class="cx"> subprocess.call(["killall", "-9", "-m", "Simulator"])
</span><span class="lines">@@ -329,6 +348,9 @@
</span><span class="cx"> _log.warning('Unable to remove ' + fifo)
</span><span class="cx"> pass
</span><span class="cx">
</span><ins>+ if not self._using_dedicated_simulators():
+ return
+
</ins><span class="cx"> for i in xrange(self.child_processes()):
</span><span class="cx"> simulator_path = self.get_simulator_path(i)
</span><span class="cx"> device_udid = self._testing_device(i).udid
</span><span class="lines">@@ -379,6 +401,9 @@
</span><span class="cx">
</span><span class="cx"> SUBPROCESS_CRASH_REGEX = re.compile('#CRASHED - (?P<subprocess_name>\S+) \(pid (?P<subprocess_pid>\d+)\)')
</span><span class="cx">
</span><ins>+ def _using_dedicated_simulators(self):
+ return self.get_option('dedicated_simulators')
+
</ins><span class="cx"> def _create_device(self, number):
</span><span class="cx"> return Simulator.create_device(number, self.simulator_device_type(), self.simulator_runtime)
</span><span class="cx">
</span><span class="lines">@@ -392,7 +417,9 @@
</span><span class="cx"> def device_id_for_worker_number(self, number):
</span><span class="cx"> if self._printing_cmd_line:
</span><span class="cx"> return '<dummy id>'
</span><del>- return self._testing_device(number).udid
</del><ins>+ if self._using_dedicated_simulators():
+ return self._testing_device(number).udid
+ return self._current_device.udid
</ins><span class="cx">
</span><span class="cx"> def get_simulator_path(self, suffix=""):
</span><span class="cx"> return os.path.join(self.SIMULATOR_DIRECTORY, "Simulator" + str(suffix) + ".app")
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (209135 => 209136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2016-11-30 18:03:23 UTC (rev 209135)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2016-11-30 18:30:47 UTC (rev 209136)
</span><span class="lines">@@ -529,6 +529,14 @@
</span><span class="cx"> return device
</span><span class="cx"> return None
</span><span class="cx">
</span><ins>+ 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
+
</ins><span class="cx"> # FIXME: We should find an existing device with respect to its name, device type and runtime.
</span><span class="cx"> def device(self, name=None, runtime=None, should_ignore_unavailable_devices=False):
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>