Title: [178623] trunk/Tools
- Revision
- 178623
- Author
- [email protected]
- Date
- 2015-01-17 02:08:28 -0800 (Sat, 17 Jan 2015)
Log Message
Attempt to fix webkitpy tests on GTK Linux ports
* Scripts/webkitpy/port/ios.py:
(IOSPort.determine_full_port_name): Set a sensible default if
not running on a Mac platform or if no iOS SDK is installed.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (178622 => 178623)
--- trunk/Tools/ChangeLog 2015-01-17 08:42:20 UTC (rev 178622)
+++ trunk/Tools/ChangeLog 2015-01-17 10:08:28 UTC (rev 178623)
@@ -1,3 +1,11 @@
+2015-01-17 David Kilzer <[email protected]>
+
+ Attempt to fix webkitpy tests on GTK Linux ports
+
+ * Scripts/webkitpy/port/ios.py:
+ (IOSPort.determine_full_port_name): Set a sensible default if
+ not running on a Mac platform or if no iOS SDK is installed.
+
2015-01-17 Jake Nielsen <[email protected]>
Create iOS-EWS client queue
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (178622 => 178623)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-17 08:42:20 UTC (rev 178622)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-17 10:08:28 UTC (rev 178623)
@@ -51,13 +51,15 @@
@classmethod
def determine_full_port_name(cls, host, options, port_name):
if port_name == cls.port_name:
- sdk_command_process = subprocess.Popen('xcrun --sdk iphoneos --show-sdk-version', stdout=subprocess.PIPE, stderr=None, shell=True)
- sdk_command_stdout = sdk_command_process.communicate()[0].strip()
+ sdk_version = '8.0'
+ if host.platform.is_mac():
+ sdk_command_process = subprocess.Popen('xcrun --sdk iphoneos --show-sdk-version', stdout=subprocess.PIPE, stderr=None, shell=True)
+ sdk_command_output = sdk_command_process.communicate()[0].strip()
+ if sdk_command_output:
+ sdk_version = sdk_command_output
- assert sdk_command_stdout, "Xcode is not installed, and hence we cannot construct an iOS port object!"
+ port_name = port_name + '-' + re.match('^([0-9]+).*', sdk_version).group(1)
- port_name = port_name + '-' + re.match('^([0-9]+).*', sdk_command_stdout).group(1)
-
return port_name
def __init__(self, *args, **kwargs):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
