test-webkitpy fails on Mac without iphoneos SDK

https://bugs.webkit.org/show_bug.cgi?id=141255
<rdar://problem/19619691>

Reviewed by David Kilzer and Alexey Proskuryakov.

Fixes an issue where test-webkitpy fails on a Mac without the iOS SDK. We should
should not require the iphoneos SDK to be installed to run the webkitpy tests.

* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo.xcode_sdk_version): Added; return the version of the specified SDK, if
installed. We take advantage of the behavior that xcrun --show-sdk-version only writes
to standard output if the SDK is installed to return the empty string if the SDK is
not installed.
* Scripts/webkitpy/common/system/platforminfo_mock.py:
(MockPlatformInfo.xcode_sdk_version): Added.
* Scripts/webkitpy/port/ios.py:
(IOSPort.determine_full_port_name): Modified to call PlatformInfo.xcode_sdk_version()
to get the version of the iphoneos SDK, if installed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@179622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 863eafec86a2f8608790c349db30fda97828b0ca..b47b03d9efb96a0bd0915455f89d310b49c95a4d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,25 @@
+2015-02-04  Daniel Bates  <dabates@apple.com>
+
+        test-webkitpy fails on Mac without iphoneos SDK
+        https://bugs.webkit.org/show_bug.cgi?id=141255
+        <rdar://problem/19619691>
+
+        Reviewed by David Kilzer and Alexey Proskuryakov.
+
+        Fixes an issue where test-webkitpy fails on a Mac without the iOS SDK. We should
+        should not require the iphoneos SDK to be installed to run the webkitpy tests.
+
+        * Scripts/webkitpy/common/system/platforminfo.py:
+        (PlatformInfo.xcode_sdk_version): Added; return the version of the specified SDK, if
+        installed. We take advantage of the behavior that xcrun --show-sdk-version only writes
+        to standard output if the SDK is installed to return the empty string if the SDK is
+        not installed.
+        * Scripts/webkitpy/common/system/platforminfo_mock.py:
+        (MockPlatformInfo.xcode_sdk_version): Added.
+        * Scripts/webkitpy/port/ios.py:
+        (IOSPort.determine_full_port_name): Modified to call PlatformInfo.xcode_sdk_version()
+        to get the version of the iphoneos SDK, if installed.
+
 2015-02-04  Alexey Proskuryakov  <ap@apple.com>
 
         run-webkit-tests doesn't always capture ASan violation reports

diff --git a/Tools/Scripts/webkitpy/common/system/platforminfo.py b/Tools/Scripts/webkitpy/common/system/platforminfo.py
index a26125c8aff791b14d7f7636fb2df64401eda6c7..92d62a8feaf9759643085277cb482ab495d96638 100644 (file)
--- a/Tools/Scripts/webkitpy/common/system/platforminfo.py
+++ b/Tools/Scripts/webkitpy/common/system/platforminfo.py
@@ -29,6 +29,7 @@
 import re
 import sys
 
+from webkitpy.common.system.executive import Executive
 
 class PlatformInfo(object):
     """This class provides a consistent (and mockable) interpretation of
@@ -118,6 +119,12 @@ class PlatformInfo(object):
         except:
             return sys.maxint
 
+    def xcode_sdk_version(self, sdk_name):
+        if self.is_mac():
+            # Assumes that xcrun does not write to standard output on failure (e.g. SDK does not exist).
+            return self._executive.run_command(["xcrun", "--sdk", sdk_name, "--show-sdk-version"], return_stderr=False, error_handler=Executive.ignore_error).rstrip()
+        return ''
+
     def _determine_os_name(self, sys_platform):
         if sys_platform == 'darwin':
             return 'mac'

diff --git a/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py b/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py
index bc72810cfc6913a3667a8da582a18d5f55101d48..21a692265e0d5c16cb1d82289e712a679e7be885 100644 (file)
--- a/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py
+++ b/Tools/Scripts/webkitpy/common/system/platforminfo_mock.py
@@ -55,3 +55,6 @@ class MockPlatformInfo(object):
 
     def terminal_width(self):
         return 80
+
+    def xcode_sdk_version(self, sdk_name):
+        return '8.1'

diff --git a/Tools/Scripts/webkitpy/port/ios.py b/Tools/Scripts/webkitpy/port/ios.py
index d57cd43d329f5f3f719b1a0934cd0821e4a69f37..23c2b992174441cca80d84d56eba1ae54bfd3b8e 100644 (file)
--- a/Tools/Scripts/webkitpy/port/ios.py
+++ b/Tools/Scripts/webkitpy/port/ios.py
@@ -52,16 +52,11 @@ class IOSPort(ApplePort):
     @classmethod
     def determine_full_port_name(cls, host, options, port_name):
         if port_name == cls.port_name:
-            sdk_version = '8.0'
-            # FIXME: We should move the call to xcrun to the PlatformInfo object so that
-            # we can use MockPlatformInfo to set an expectation when running the unit tests.
-            if os.path.isfile('/usr/bin/xcrun'):
-                sdk_command_output = subprocess.check_output(['/usr/bin/xcrun', '--sdk', 'iphoneos', '--show-sdk-version'], stderr=None).rstrip()
-                if sdk_command_output:
-                    sdk_version = sdk_command_output
-
-            port_name = port_name + '-' + re.match('^([0-9]+)', sdk_version).group(1)
-
+            iphoneos_sdk_version = host.platform.xcode_sdk_version('iphoneos')
+            if not iphoneos_sdk_version:
+                raise Exception("Ensure that the Xcode command line tools and the iphoneos SDK are installed.")
+            major_version_number = iphoneos_sdk_version.split('.')[0]
+            port_name = port_name + '-' + major_version_number
         return port_name
 
     def __init__(self, *args, **kwargs):