Title: [237931] trunk/Tools
- Revision
- 237931
- Author
- [email protected]
- Date
- 2018-11-07 11:25:39 -0800 (Wed, 07 Nov 2018)
Log Message
Unreviewed, rolling out r237913.
Breaks running tests on Mac without iOS SDK installed
Reverted changeset:
"webkitpy: Generalize trailing SDK specifier (Part 2)"
https://bugs.webkit.org/show_bug.cgi?id=191275
https://trac.webkit.org/changeset/237913
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (237930 => 237931)
--- trunk/Tools/ChangeLog 2018-11-07 18:49:12 UTC (rev 237930)
+++ trunk/Tools/ChangeLog 2018-11-07 19:25:39 UTC (rev 237931)
@@ -1,3 +1,15 @@
+2018-11-07 Jonathan Bedard <[email protected]>
+
+ Unreviewed, rolling out r237913.
+
+ Breaks running tests on Mac without iOS SDK installed
+
+ Reverted changeset:
+
+ "webkitpy: Generalize trailing SDK specifier (Part 2)"
+ https://bugs.webkit.org/show_bug.cgi?id=191275
+ https://trac.webkit.org/changeset/237913
+
2018-11-07 Zamiul Haque <[email protected]>
Force a gregorian calendar to show for credit card expiration date inputs
Modified: trunk/Tools/Scripts/webkitpy/port/ios_device.py (237930 => 237931)
--- trunk/Tools/Scripts/webkitpy/port/ios_device.py 2018-11-07 18:49:12 UTC (rev 237930)
+++ trunk/Tools/Scripts/webkitpy/port/ios_device.py 2018-11-07 19:25:39 UTC (rev 237931)
@@ -38,7 +38,7 @@
ARCHITECTURES = ['armv7', 'armv7s', 'arm64']
DEFAULT_ARCHITECTURE = 'arm64'
VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8', 'ios-9', 'ios-10']
- SDK = apple_additions().get_sdk('iphoneos') if apple_additions() else 'iphoneos'
+ SDK = apple_additions().ios_device_SDK() if apple_additions() else 'iphoneos'
NO_ON_DEVICE_TESTING = 'On-device testing is not supported on this machine'
@memoized
Modified: trunk/Tools/Scripts/webkitpy/port/ios_simulator.py (237930 => 237931)
--- trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2018-11-07 18:49:12 UTC (rev 237930)
+++ trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2018-11-07 19:25:39 UTC (rev 237931)
@@ -24,7 +24,6 @@
from webkitpy.common.memoized import memoized
from webkitpy.common.version import Version
-from webkitpy.port.config import apple_additions
from webkitpy.port.ios import IOSPort
from webkitpy.xcode.device_type import DeviceType
from webkitpy.xcode.simulated_device import DeviceRequest, SimulatedDeviceManager
@@ -42,7 +41,7 @@
DEFAULT_DEVICE_CLASS = 'iPhone SE'
CUSTOM_DEVICE_CLASSES = ['iPad', 'iPhone 7']
- SDK = apple_additions().get_sdk('iphonesimulator') if apple_additions() else 'iphonesimulator'
+ SDK = 'iphonesimulator'
def __init__(self, host, port_name, **kwargs):
super(IOSSimulatorPort, self).__init__(host, port_name, **kwargs)
@@ -82,7 +81,7 @@
def _build_driver_flags(self):
archs = ['ARCHS=i386'] if self.architecture() == 'x86' else []
- sdk = ['--sdk', self.SDK]
+ sdk = ['--sdk', 'iphonesimulator']
return archs + sdk
def _set_device_class(self, device_class):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
