Diff
Modified: trunk/Tools/ChangeLog (264522 => 264523)
--- trunk/Tools/ChangeLog 2020-07-17 18:27:17 UTC (rev 264522)
+++ trunk/Tools/ChangeLog 2020-07-17 18:31:59 UTC (rev 264523)
@@ -1,3 +1,16 @@
+2020-07-17 Jonathan Bedard <[email protected]>
+
+ [webkitpy] Simulators should opt out of emulation
+ https://bugs.webkit.org/show_bug.cgi?id=214486
+ <rdar://problem/65644439>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/webkitpy/port/server_process.py:
+ (ServerProcess.__init__): Caller may request that emulation be disabled.
+ * Scripts/webkitpy/port/simulator_process.py:
+ (SimulatorProcess.__init__): Disable emulation.
+
2020-07-17 Truitt Savell <[email protected]>
Unreviewed, reverting r264477.
Modified: trunk/Tools/Scripts/webkitpy/port/server_process.py (264522 => 264523)
--- trunk/Tools/Scripts/webkitpy/port/server_process.py 2020-07-17 18:27:17 UTC (rev 264522)
+++ trunk/Tools/Scripts/webkitpy/port/server_process.py 2020-07-17 18:31:59 UTC (rev 264523)
@@ -61,12 +61,12 @@
indefinitely. The class also handles transparently restarting processes
as necessary to keep issuing commands."""
- def __init__(self, port_obj, name, cmd, env=None, universal_newlines=False, treat_no_data_as_crash=False, target_host=None, crash_message=None):
+ def __init__(self, port_obj, name, cmd, env=None, universal_newlines=False, treat_no_data_as_crash=False, target_host=None, crash_message=None, allow_emulation=True):
self._port = port_obj
self._name = name # Should be the command name (e.g. DumpRenderTree, ImageDiff)
platform = self._port.host.platform
- if platform.is_mac() and platform.architecture() != self._port.architecture():
+ if allow_emulation and platform.is_mac() and platform.architecture() != self._port.architecture():
self._cmd = ['/usr/bin/arch', '-{}'.format(self._port.architecture())] + cmd
else:
self._cmd = cmd
Modified: trunk/Tools/Scripts/webkitpy/port/simulator_process.py (264522 => 264523)
--- trunk/Tools/Scripts/webkitpy/port/simulator_process.py 2020-07-17 18:27:17 UTC (rev 264522)
+++ trunk/Tools/Scripts/webkitpy/port/simulator_process.py 2020-07-17 18:31:59 UTC (rev 264523)
@@ -79,7 +79,7 @@
def __init__(self, port_obj, name, cmd, env=None, universal_newlines=False, treat_no_data_as_crash=False, target_host=None, crash_message=None):
env['PORT'] = str(target_host.listening_port()) # The target_host should be a device.
- super(SimulatorProcess, self).__init__(port_obj, name, cmd, env, universal_newlines, treat_no_data_as_crash, target_host, crash_message)
+ super(SimulatorProcess, self).__init__(port_obj, name, cmd, env, universal_newlines, treat_no_data_as_crash, target_host, crash_message, allow_emulation=False)
self._bundle_id = port_obj.app_identifier_from_bundle(cmd[0])
