- Revision
- 178641
- Author
- [email protected]
- Date
- 2015-01-18 23:15:38 -0800 (Sun, 18 Jan 2015)
Log Message
iOS EWS queue name should be consistent
<http://webkit.org/b/140585>
Reviewed by Daniel Bates.
* Scripts/webkitpy/common/config/ews.json: Rename 'ios-device'
to 'ios'.
* Scripts/webkitpy/common/config/ports.py: Ditto.
(DeprecatedPort.port):
(IOSPort):
* Scripts/webkitpy/port/ios.py: Ditto.
(IOSPort):
* Scripts/webkitpy/port/factory.py:
(PortFactory): Re-order PORT_CLASSES so ios.IOSSimulatorPort
appears before ios.IOSPort. If this is not done,
`run-webkit-tests --ios-simulator` will get the wrong Port class
(IOSPort instead of IOSSimulatorPort) due to the way that
PortFactory.get() uses prefix matching of <Port>.port_name to
find the correct class to use.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (178640 => 178641)
--- trunk/Tools/ChangeLog 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/ChangeLog 2015-01-19 07:15:38 UTC (rev 178641)
@@ -1,3 +1,26 @@
+2015-01-18 David Kilzer <[email protected]>
+
+ iOS EWS queue name should be consistent
+ <http://webkit.org/b/140585>
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/common/config/ews.json: Rename 'ios-device'
+ to 'ios'.
+ * Scripts/webkitpy/common/config/ports.py: Ditto.
+ (DeprecatedPort.port):
+ (IOSPort):
+ * Scripts/webkitpy/port/ios.py: Ditto.
+ (IOSPort):
+
+ * Scripts/webkitpy/port/factory.py:
+ (PortFactory): Re-order PORT_CLASSES so ios.IOSSimulatorPort
+ appears before ios.IOSPort. If this is not done,
+ `run-webkit-tests --ios-simulator` will get the wrong Port class
+ (IOSPort instead of IOSSimulatorPort) due to the way that
+ PortFactory.get() uses prefix matching of <Port>.port_name to
+ find the correct class to use.
+
2015-01-18 Alexey Proskuryakov <[email protected]>
build.webkit.org/dashboard: OS X EWS is now on Mavericks
Modified: trunk/Tools/Scripts/webkitpy/common/config/ews.json (178640 => 178641)
--- trunk/Tools/Scripts/webkitpy/common/config/ews.json 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/common/config/ews.json 2015-01-19 07:15:38 UTC (rev 178641)
@@ -15,7 +15,7 @@
"port": "win"
},
"iOS EWS": {
- "port": "ios-device",
+ "port": "ios",
"architecture": "armv7"
},
"Mac EWS": {
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (178640 => 178641)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2015-01-19 07:15:38 UTC (rev 178641)
@@ -64,7 +64,7 @@
def port(port_name):
ports = {
"gtk-wk2": GtkWK2Port,
- "ios-device": IOSPort,
+ "ios": IOSPort,
"mac": MacPort,
"mac-wk2": MacWK2Port,
"win": WinPort,
@@ -121,7 +121,7 @@
class IOSPort(DeprecatedPort):
- port_flag_name = "ios-device"
+ port_flag_name = "ios"
def build_webkit_command(self, build_style=None):
command = super(IOSPort, self).build_webkit_command(build_style=build_style)
Modified: trunk/Tools/Scripts/webkitpy/port/factory.py (178640 => 178641)
--- trunk/Tools/Scripts/webkitpy/port/factory.py 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/port/factory.py 2015-01-19 07:15:38 UTC (rev 178641)
@@ -80,11 +80,19 @@
class PortFactory(object):
+ # Order matters. For port classes that have a port_name with a
+ # common prefix, the more specific port class should be listed
+ # first. For example, 'ios.IOSSimulatorPort' (port_name='ios-simulator')
+ # should be listed before 'ios.IOSPort' (port_name='ios'). If this
+ # rule is not followed, then `webkit-patch --ios-simulator` will try
+ # to use IOSPort instead of IOSSimulatorPort because 'ios'
+ # (IOSPort.port_name) is a prefix of 'ios-simulator' (port_name
+ # derived from '--ios-simulator' command-line switch), for example.
PORT_CLASSES = (
'efl.EflPort',
'gtk.GtkPort',
+ 'ios.IOSSimulatorPort',
'ios.IOSPort',
- 'ios.IOSSimulatorPort',
'mac.MacPort',
'mock_drt.MockDRTPort',
'test.TestPort',
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (178640 => 178641)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-19 07:07:23 UTC (rev 178640)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-19 07:15:38 UTC (rev 178641)
@@ -43,10 +43,10 @@
class IOSPort(ApplePort):
- port_name = "ios-device"
+ port_name = "ios"
ARCHITECTURES = ['armv7', 'armv7s', 'arm64']
- VERSION_FALLBACK_ORDER = ['ios-device-7', 'ios-device-8']
+ VERSION_FALLBACK_ORDER = ['ios-7', 'ios-8']
@classmethod
def determine_full_port_name(cls, host, options, port_name):
