Title: [224845] trunk/Tools
- Revision
- 224845
- Author
- jbed...@apple.com
- Date
- 2017-11-14 14:19:46 -0800 (Tue, 14 Nov 2017)
Log Message
webkitpy: Use more verbose version info from simctl
https://bugs.webkit.org/show_bug.cgi?id=179687
<rdar://problem/35539392>
Reviewed by Tim Horton.
* Scripts/webkitpy/xcode/simulator.py:
(Simulator): Address FIXME, use more verbose version.
(Simulator._parse_runtimes): 'Internal' no longer stands along, check os for this
string instead.
* Scripts/webkitpy/xcode/simulator_unittest.py: Mock simctl output specifies iOS
8.4.1, not iOS 8.4.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (224844 => 224845)
--- trunk/Tools/ChangeLog 2017-11-14 21:55:57 UTC (rev 224844)
+++ trunk/Tools/ChangeLog 2017-11-14 22:19:46 UTC (rev 224845)
@@ -1,3 +1,18 @@
+2017-11-14 Jonathan Bedard <jbed...@apple.com>
+
+ webkitpy: Use more verbose version info from simctl
+ https://bugs.webkit.org/show_bug.cgi?id=179687
+ <rdar://problem/35539392>
+
+ Reviewed by Tim Horton.
+
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Simulator): Address FIXME, use more verbose version.
+ (Simulator._parse_runtimes): 'Internal' no longer stands along, check os for this
+ string instead.
+ * Scripts/webkitpy/xcode/simulator_unittest.py: Mock simctl output specifies iOS
+ 8.4.1, not iOS 8.4.
+
2017-11-14 Daniel Bates <daba...@apple.com>
Update comment in FeatureDefines.xcconfig to reflect location of Visual Studio property files
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (224844 => 224845)
--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2017-11-14 21:55:57 UTC (rev 224844)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2017-11-14 22:19:46 UTC (rev 224845)
@@ -173,11 +173,9 @@
Represents the iOS Simulator infrastructure under the currently select Xcode.app bundle.
"""
device_type_re = re.compile('(?P<name>.+)\((?P<identifier>[^)]+)\)')
- # FIXME: runtime_re parses the version from the runtime name, but that does not contain the full version number
- # (it can omit the revision). We should instead parse the version from the number contained in parentheses.
- runtime_re = re.compile('(i|watch|tv)OS (?P<version>\d+\.\d)(?P<internal> Internal)? \(\d+\.\d+(\.\d+)? - (?P<build_version>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<availability>[^)]+)\))?')
- new_runtime_re = re.compile('(i|watch|tv)OS (?P<version>\d+\.\d)(?P<internal> Internal)? \(\d+\.\d+(\.\d+)? - (?P<build_version>[^)]+)\) - (?P<identifier>[^)]+)( \((?P<availability>[^)]+)\))?')
- unavailable_version_re = re.compile('-- Unavailable: (?P<identifier>[^ ]+) --')
+ runtime_re = re.compile('(?P<os>.+) \((?P<version>\d+\.\d+(\.\d+)?) - (?P<build_version>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<availability>[^)]+)\))?')
+ new_runtime_re = re.compile('(?P<os>.+) \((?P<version>\d+\.\d+(\.\d+)?) - (?P<build_version>[^)]+)\) - (?P<identifier>[^)]+)( \((?P<availability>[^)]+)\))?')
+ unavailable_version_re = re.compile('-- (Unavailable: )?(?P<identifier>[^ ]+) --')
version_re = re.compile('-- (i|watch|tv)OS (?P<version>\d+\.\d+)(?P<internal> Internal)? --')
devices_re = re.compile(
'\s*(?P<name>.+) \((?P<udid>[A-Z0-9\-]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?')
@@ -338,7 +336,7 @@
runtime = Runtime(version=Version(runtime_match.group('version')),
identifier=runtime_match.group('identifier'),
available=runtime_match.group('availability') is None,
- is_internal_runtime=bool(runtime_match.group('internal')))
+ is_internal_runtime=('Internal' in runtime_match.group('os')))
self.runtimes.append(runtime)
self._parse_devices(lines)
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py (224844 => 224845)
--- trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2017-11-14 21:55:57 UTC (rev 224844)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2017-11-14 22:19:46 UTC (rev 224845)
@@ -215,7 +215,7 @@
self.assertEqual('com.apple.CoreSimulator.SimRuntime.iOS-8-4', runtime_ios_8_4.identifier)
self.assertEqual(True, runtime_ios_8_4.available)
self.assertEqual(False, runtime_ios_8_4.is_internal_runtime)
- self.assertEqual(Version([8, 4]), runtime_ios_8_4.version)
+ self.assertEqual(Version([8, 4, 1]), runtime_ios_8_4.version)
self.assertEqual(0, len(runtime_ios_8_4.devices))
runtime_tvos_9 = simulator.runtimes[3]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
