Title: [284072] trunk/Tools
- Revision
- 284072
- Author
- jbed...@apple.com
- Date
- 2021-10-12 18:09:27 -0700 (Tue, 12 Oct 2021)
Log Message
[AppleSilicon] Support native simulator testing
https://bugs.webkit.org/show_bug.cgi?id=231639
<rdar://problem/84170151>
Reviewed by Tim Horton.
* Scripts/webkitpy/port/ios_simulator.py:
(IOSSimulatorPort): Add arm64 as possible architecture.
(IOSSimulatorPort.architecture): Return the native system's architecture.
* Scripts/webkitpy/port/watch_simulator.py:
(WatchSimulatorPort): Add arm64_32.
(WatchSimulatorPort.architecture): Return the native system's 32 bit architecture.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (284071 => 284072)
--- trunk/Tools/ChangeLog 2021-10-13 01:06:18 UTC (rev 284071)
+++ trunk/Tools/ChangeLog 2021-10-13 01:09:27 UTC (rev 284072)
@@ -1,3 +1,18 @@
+2021-10-12 Jonathan Bedard <jbed...@apple.com>
+
+ [AppleSilicon] Support native simulator testing
+ https://bugs.webkit.org/show_bug.cgi?id=231639
+ <rdar://problem/84170151>
+
+ Reviewed by Tim Horton.
+
+ * Scripts/webkitpy/port/ios_simulator.py:
+ (IOSSimulatorPort): Add arm64 as possible architecture.
+ (IOSSimulatorPort.architecture): Return the native system's architecture.
+ * Scripts/webkitpy/port/watch_simulator.py:
+ (WatchSimulatorPort): Add arm64_32.
+ (WatchSimulatorPort.architecture): Return the native system's 32 bit architecture.
+
2021-10-12 Garrett Davidson <garrett_david...@apple.com>
Adopt platform UI for WebAuthn
Modified: trunk/Tools/Scripts/webkitpy/port/ios_simulator.py (284071 => 284072)
--- trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2021-10-13 01:06:18 UTC (rev 284071)
+++ trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2021-10-13 01:09:27 UTC (rev 284072)
@@ -38,7 +38,7 @@
port_name = "ios-simulator"
FUTURE_VERSION = 'future'
- ARCHITECTURES = ['x86_64', 'i386']
+ ARCHITECTURES = ['x86_64', 'i386', 'arm64']
DEFAULT_ARCHITECTURE = 'x86_64'
DEVICE_MANAGER = SimulatedDeviceManager
@@ -50,6 +50,12 @@
]
SDK = apple_additions().get_sdk('iphonesimulator') if apple_additions() else 'iphonesimulator'
+ def architecture(self):
+ result = self.get_option('architecture') or self.host.platform.architecture()
+ if result == 'arm64e':
+ return 'arm64'
+ return result
+
@staticmethod
def _version_from_name(name):
if len(name.split('-')) > 2 and name.split('-')[2].isdigit():
Modified: trunk/Tools/Scripts/webkitpy/port/watch_simulator.py (284071 => 284072)
--- trunk/Tools/Scripts/webkitpy/port/watch_simulator.py 2021-10-13 01:06:18 UTC (rev 284071)
+++ trunk/Tools/Scripts/webkitpy/port/watch_simulator.py 2021-10-13 01:09:27 UTC (rev 284072)
@@ -36,7 +36,7 @@
class WatchSimulatorPort(WatchPort):
port_name = 'watchos-simulator'
- ARCHITECTURES = ['i386']
+ ARCHITECTURES = ['i386', 'arm64_32']
DEFAULT_ARCHITECTURE = 'i386'
DEVICE_MANAGER = SimulatedDeviceManager
@@ -45,6 +45,9 @@
SDK = apple_additions().get_sdk('watchsimulator') if apple_additions() else 'watchsimulator'
def architecture(self):
+ result = self.get_option('architecture') or self.host.platform.architecture()
+ if result in ('arm64', 'arm64e'):
+ return 'arm64_32'
return self.DEFAULT_ARCHITECTURE
# This supports the mapping of a port name such as watchos-simulator-5 to the construction of a port
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
