Changeset 261722 in webkit

Timestamp:

May 14, 2020 4:38:22 PM (4 years ago)

Author:

Jonathan Bedard

Message:

run-webkit-tests shouldn't need Xcode to run Mac tests
​https://bugs.webkit.org/show_bug.cgi?id=211903
<rdar://problem/63205839>

Reviewed by Stephanie Lewis.

• Scripts/webkitpy/common/system/platforminfo.py:

(PlatformInfo):
(PlatformInfo.xcode_sdk_version): Memoize SDK version retrieval.
(PlatformInfo.xcode_version): Only run xcodebuild if macosx SDK is present.
(PlatformInfo.available_sdks): Ditto.

• Scripts/webkitpy/common/system/platforminfo_unittest.py:

(TestPlatformInfo.test_available_sdks):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/platforminfo.py (modified) (3 diffs)
• Scripts/webkitpy/common/system/platforminfo_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-05-14  Jonathan Bedard  <jbedard@apple.com>
+
+        run-webkit-tests shouldn't need Xcode to run Mac tests
+        https://bugs.webkit.org/show_bug.cgi?id=211903
+        <rdar://problem/63205839>
+
+        Reviewed by Stephanie Lewis.
+
+        * Scripts/webkitpy/common/system/platforminfo.py:
+        (PlatformInfo):
+        (PlatformInfo.xcode_sdk_version): Memoize SDK version retrieval.
+        (PlatformInfo.xcode_version): Only run xcodebuild if macosx SDK is present.
+        (PlatformInfo.available_sdks): Ditto.
+        * Scripts/webkitpy/common/system/platforminfo_unittest.py:
+        (TestPlatformInfo.test_available_sdks):
+
 2020-05-14  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py

@@ -32 +32 @@
 import sys
 
+from webkitpy.common.memoized import memoized
 from webkitpy.common.version import Version
 from webkitpy.common.version_name_map import PUBLIC_TABLE, INTERNAL_TABLE, VersionNameMap
@@ -160 +161 @@
         return None
 
+    @memoized
     def xcode_sdk_version(self, sdk_name):
         if self.is_mac():
@@ -174 +176 @@
         return (line for line in output.splitlines())
 
+    @memoized
     def xcode_version(self):
-        if not self.is_mac():
+        if not self.xcode_sdk_version('macosx'):
             raise NotImplementedError
         return Version.from_string(self._executive.run_command(['xcodebuild', '-version']).split()[1])
 
+    @memoized
     def available_sdks(self):
-        if not self.is_mac():
+        if not self.xcode_sdk_version('macosx'):
             return []
 

trunk/Tools/Scripts/webkitpy/common/system/platforminfo_unittest.py

@@ -161 +161 @@
 
     def test_available_sdks(self):
+        sdk_version_output = '10.16\n'
+        info = self.make_info(fake_sys('darwin'), fake_platform('10.14.0'), fake_executive(sdk_version_output))
+        info.xcode_sdk_version('macosx')
+
         show_sdks_output = """iOS SDKs:
     iOS 12.0                          -sdk iphoneos12.0
@@ -178 +182 @@
     Simulator - watchOS 5.0 Internal    -sdk watchsimulator5.0.type
 """
-        info = self.make_info(fake_sys('darwin'), fake_platform('10.14.0'), fake_executive(show_sdks_output))
+        info._executive = fake_executive(show_sdks_output)
         self.assertEqual(info.available_sdks(), [
             'iphoneos',