[ews-build] PrintConfiguration should display Xcode version instead of SDKVersion
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Apr 2019 23:04:14 +0000 (23:04 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 10 Apr 2019 23:04:14 +0000 (23:04 +0000)
https://bugs.webkit.org/show_bug.cgi?id=196780

Reviewed by Alexey Proskuryakov.

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

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

Tools/BuildSlaveSupport/ews-build/steps.py
Tools/BuildSlaveSupport/ews-build/steps_unittest.py
Tools/ChangeLog

index ba2209a..54b72e9 100644 (file)
@@ -954,11 +954,8 @@ class PrintConfiguration(steps.ShellSequence):
             os_name = self.convert_build_to_os_name(os_version)
             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()
             configuration += u', Xcode: {}'.format(xcode_version)
index 4d34b7c..3e53dfe 100644 (file)
@@ -1291,7 +1291,7 @@ Xcode 9.4.1
 Build version 9F2000''')
             + 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()
 
     def test_failure(self):
index 2484c6f..a1a89ea 100644 (file)
@@ -1,3 +1,13 @@
+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>
 
         Add SPI WKNavigationResponse._downloadAttribute