<!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>[277675] 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/277675">277675</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-05-18 13:58:33 -0700 (Tue, 18 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[webkitpy] Forward booted simulators to children processes
https://bugs.webkit.org/show_bug.cgi?id=225933
<rdar://problem/78169900>

Rubber-stamped by Aakash Jain.

* Scripts/webkitpy/api_tests/runner.py:
(setup_shard): Set DeviceManager global variable from parent process.
(Runner.command_for_port): Use Port's device manager instead of simulated device manager.
(Runner.run): Pass DeviceManager details to children processes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyapi_testsrunnerpy">trunk/Tools/Scripts/webkitpy/api_tests/runner.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277674 => 277675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-18 20:49:25 UTC (rev 277674)
+++ trunk/Tools/ChangeLog       2021-05-18 20:58:33 UTC (rev 277675)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2021-05-18  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Forward booted simulators to children processes
+        https://bugs.webkit.org/show_bug.cgi?id=225933
+        <rdar://problem/78169900>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/api_tests/runner.py:
+        (setup_shard): Set DeviceManager global variable from parent process.
+        (Runner.command_for_port): Use Port's device manager instead of simulated device manager.
+        (Runner.run): Pass DeviceManager details to children processes.
+
</ins><span class="cx"> 2021-05-18  Aakash Jain  <aakash_jain@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [ews] Style fixes in steps_unittest.py
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyapi_testsrunnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/api_tests/runner.py (277674 => 277675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/api_tests/runner.py 2021-05-18 20:49:25 UTC (rev 277674)
+++ trunk/Tools/Scripts/webkitpy/api_tests/runner.py    2021-05-18 20:58:33 UTC (rev 277675)
</span><span class="lines">@@ -29,12 +29,15 @@
</span><span class="cx"> 
</span><span class="cx"> from webkitpy.common.iteration_compatibility import iteritems
</span><span class="cx"> from webkitpy.port.server_process import ServerProcess, _log as server_process_logger
</span><del>-from webkitpy.xcode.simulated_device import SimulatedDeviceManager
</del><span class="cx"> 
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-def setup_shard(port=None):
</del><ins>+def setup_shard(port=None, devices=None):
+    devices = devices or dict()
+    port.DEVICE_MANAGER.AVAILABLE_DEVICES = devices.get('available_devices', [])
+    port.DEVICE_MANAGER.INITIALIZED_DEVICES = devices.get('initialized_devices', None)
+
</ins><span class="cx">     return _Worker.setup(port=port)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -86,8 +89,8 @@
</span><span class="cx">         if (port.get_option('force')):
</span><span class="cx">             args.append('--gtest_also_run_disabled_tests=1')
</span><span class="cx">         if 'simulator' in port.port_name:
</span><del>-            assert SimulatedDeviceManager.INITIALIZED_DEVICES
-            return ['/usr/bin/xcrun', 'simctl', 'spawn', SimulatedDeviceManager.INITIALIZED_DEVICES[0].udid] + args
</del><ins>+            assert port.DEVICE_MANAGER.INITIALIZED_DEVICES
+            return ['/usr/bin/xcrun', 'simctl', 'spawn', port.DEVICE_MANAGER.INITIALIZED_DEVICES[0].udid] + args
</ins><span class="cx">         elif 'device' in port.port_name:
</span><span class="cx">             raise RuntimeError('Running api tests on {} is not supported'.format(port.port_name))
</span><span class="cx">         elif port.host.platform.is_win():
</span><span class="lines">@@ -122,8 +125,10 @@
</span><span class="cx"> 
</span><span class="cx">             with TaskPool(
</span><span class="cx">                 workers=self._num_workers,
</span><del>-                setup=setup_shard, setupkwargs=dict(port=self.port),
-                teardown=teardown_shard,
</del><ins>+                setup=setup_shard, setupkwargs=dict(port=self.port, devices=dict(
+                    available_devices=self.port.DEVICE_MANAGER.AVAILABLE_DEVICES,
+                    initialized_devices=self.port.DEVICE_MANAGER.INITIALIZED_DEVICES,
+                )), teardown=teardown_shard,
</ins><span class="cx">             ) as pool:
</span><span class="cx">                 for name, tests in iteritems(shards):
</span><span class="cx">                     pool.do(run_shard, name, *tests)
</span></span></pre>
</div>
</div>

</body>
</html>