Changeset 244164 in webkit

Timestamp:

Apr 10, 2019 4:04:14 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-build] PrintConfiguration should display Xcode version instead of SDKVersion
​https://bugs.webkit.org/show_bug.cgi?id=196780

Reviewed by Alexey Proskuryakov.

• BuildSlaveSupport/ews-build/steps.py:
• BuildSlaveSupport/ews-build/steps_unittest.py:

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/steps.py (modified) (1 diff)
• BuildSlaveSupport/ews-build/steps_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/steps.py

@@ -955 +955 @@
             configuration = u'OS: {} ({})'.format(os_name, os_version)
 
-        sdk_re = 'MacOSX[\s\S]*?SDKVersion:[ \t]*(.+?)\n'
-        is_ios_builder = 'iOS' in self.getProperty('buildername', '')
-        if is_ios_builder:
-            sdk_re = 'iPhoneSimulator[\s\S]*?SDKVersion:[ \t]*(.+?)\n'
-        match = re.search(sdk_re, logText)
+        xcode_re = sdk_re = 'Xcode[ \t]+?([0-9.]+?)\n'
+        match = re.search(xcode_re, logText)
         if match:
             xcode_version = match.group(1).strip()

trunk/Tools/BuildSlaveSupport/ews-build/steps_unittest.py

@@ -1292 +1292 @@
             + 0,
         )
-        self.expectOutcome(result=SUCCESS, state_string='OS: High Sierra (10.13.4), Xcode: 10.13')
+        self.expectOutcome(result=SUCCESS, state_string='OS: High Sierra (10.13.4), Xcode: 9.4.1')
         return self.runStep()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-10  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] PrintConfiguration should display Xcode version instead of SDKVersion
+        https://bugs.webkit.org/show_bug.cgi?id=196780
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        * BuildSlaveSupport/ews-build/steps_unittest.py:
+
 2019-04-10  Alex Christensen  <achristensen@webkit.org>