<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188943] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188943">188943</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2015-08-25 20:41:32 -0700 (Tue, 25 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] run-webkit-tests fails if watchOS SDK is installed
https://bugs.webkit.org/show_bug.cgi?id=148453
Reviewed by David Kilzer.
* Scripts/webkitpy/xcode/simulator.py:
(Simulator): Taught Simulator how to parse watchOS runtimes and devices.
* Scripts/webkitpy/xcode/simulator_unittest.py: Added tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulatorpy">trunk/Tools/Scripts/webkitpy/xcode/simulator.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulator_unittestpy">trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188942 => 188943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-26 02:01:42 UTC (rev 188942)
+++ trunk/Tools/ChangeLog 2015-08-26 03:41:32 UTC (rev 188943)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-08-25 Andy Estes <aestes@apple.com>
+
+ [iOS] run-webkit-tests fails if watchOS SDK is installed
+ https://bugs.webkit.org/show_bug.cgi?id=148453
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Simulator): Taught Simulator how to parse watchOS runtimes and devices.
+ * Scripts/webkitpy/xcode/simulator_unittest.py: Added tests.
+
</ins><span class="cx"> 2015-08-25 Aakash Jain <aakash_jain@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS Simulator layout-tests fail to start while cleaning a directory structure if simulator is already running
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (188942 => 188943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-08-26 02:01:42 UTC (rev 188942)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-08-26 03:41:32 UTC (rev 188943)
</span><span class="lines">@@ -240,9 +240,9 @@
</span><span class="cx"> """
</span><span class="cx"> device_type_re = re.compile('(?P<name>[^(]+)\((?P<identifier>[^)]+)\)')
</span><span class="cx"> runtime_re = re.compile(
</span><del>- 'iOS (?P<version>[0-9]+\.[0-9])(?P<internal> Internal)? \([0-9]+\.[0-9]+ - (?P<build_version>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<availability>[^)]+)\))?')
</del><ins>+ '(i|watch)OS (?P<version>[0-9]+\.[0-9])(?P<internal> Internal)? \([0-9]+\.[0-9]+ - (?P<build_version>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<availability>[^)]+)\))?')
</ins><span class="cx"> unavailable_version_re = re.compile('-- Unavailable: (?P<identifier>[^ ]+) --')
</span><del>- version_re = re.compile('-- iOS (?P<version>[0-9]+\.[0-9]+)(?P<internal> Internal)? --')
</del><ins>+ version_re = re.compile('-- (i|watch)OS (?P<version>[0-9]+\.[0-9]+)(?P<internal> Internal)? --')
</ins><span class="cx"> devices_re = re.compile(
</span><span class="cx"> '\s*(?P<name>[^(]+ )\((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?')
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulator_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py (188942 => 188943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-08-26 02:01:42 UTC (rev 188942)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-08-26 03:41:32 UTC (rev 188943)
</span><span class="lines">@@ -46,9 +46,12 @@
</span><span class="cx"> iPad 2 (com.apple.CoreSimulator.SimDeviceType.iPad-2)
</span><span class="cx"> iPad Retina (com.apple.CoreSimulator.SimDeviceType.iPad-Retina)
</span><span class="cx"> iPad Air (com.apple.CoreSimulator.SimDeviceType.iPad-Air)
</span><ins>+Apple Watch - 38mm (com.apple.CoreSimulator.SimDeviceType.Apple-Watch-38mm)
+Apple Watch - 42mm (com.apple.CoreSimulator.SimDeviceType.Apple-Watch-42mm)
</ins><span class="cx"> == Runtimes ==
</span><span class="cx"> iOS 8.0 (8.0 - 12A465) (com.apple.CoreSimulator.SimRuntime.iOS-8-0)
</span><span class="cx"> iOS 8.0 Internal (8.0 - Unknown) (com.apple.CoreSimulator.SimRuntime.iOS-8-0-Internal) (unavailable, runtime path not found)
</span><ins>+watchOS 2.0 (2.0 - 13S343) (com.apple.CoreSimulator.SimRuntime.watchOS-2-0)
</ins><span class="cx"> == Devices ==
</span><span class="cx"> -- iOS 8.0 --
</span><span class="cx"> iPhone 4s (68D9A792-E3A9-462B-B211-762C6A5D3779) (Shutdown)
</span><span class="lines">@@ -61,9 +64,12 @@
</span><span class="cx"> iPad Retina (733FC71E-22F4-4077-BF79-25C27EA881FC) (Shutdown)
</span><span class="cx"> iPad Air (67266841-82F3-4545-AED6-568B117E41A8) (Shutdown)
</span><span class="cx"> -- iOS 8.0 Internal --
</span><ins>+-- watchOS 2.0 --
+ Apple Watch - 38mm (00138CD2-D30C-4380-A30E-A70B88E1A3C5) (Shutdown)
+ Apple Watch - 42mm (186AD85E-9BE5-4734-BC33-DF50484AAFF0) (Shutdown)
</ins><span class="cx"> ''')
</span><span class="cx"> simulator = Simulator(host=self._host)
</span><del>- self.assertEqual(8, len(simulator.device_types))
</del><ins>+ self.assertEqual(10, len(simulator.device_types))
</ins><span class="cx">
</span><span class="cx"> device_type_iphone_4s = simulator.device_types[0]
</span><span class="cx"> self.assertEqual('iPhone 4s', device_type_iphone_4s.name)
</span><span class="lines">@@ -97,8 +103,16 @@
</span><span class="cx"> self.assertEqual('iPad Air', device_type_ipad_air.name)
</span><span class="cx"> self.assertEqual('com.apple.CoreSimulator.SimDeviceType.iPad-Air', device_type_ipad_air.identifier)
</span><span class="cx">
</span><del>- self.assertEqual(2, len(simulator.runtimes))
</del><ins>+ device_type_apple_watch_38mm = simulator.device_types[8]
+ self.assertEqual('Apple Watch - 38mm', device_type_apple_watch_38mm.name)
+ self.assertEqual('com.apple.CoreSimulator.SimDeviceType.Apple-Watch-38mm', device_type_apple_watch_38mm.identifier)
</ins><span class="cx">
</span><ins>+ device_type_apple_watch_42mm = simulator.device_types[9]
+ self.assertEqual('Apple Watch - 42mm', device_type_apple_watch_42mm.name)
+ self.assertEqual('com.apple.CoreSimulator.SimDeviceType.Apple-Watch-42mm', device_type_apple_watch_42mm.identifier)
+
+ self.assertEqual(3, len(simulator.runtimes))
+
</ins><span class="cx"> runtime_ios_8 = simulator.runtimes[0]
</span><span class="cx"> self.assertEqual('com.apple.CoreSimulator.SimRuntime.iOS-8-0', runtime_ios_8.identifier)
</span><span class="cx"> self.assertEqual(True, runtime_ios_8.available)
</span><span class="lines">@@ -167,6 +181,25 @@
</span><span class="cx"> self.assertEqual(tuple([8, 0]), runtime_ios_8_internal.version)
</span><span class="cx"> self.assertEqual(0, len(runtime_ios_8_internal.devices))
</span><span class="cx">
</span><ins>+ runtime_watchos_2 = simulator.runtimes[2]
+ self.assertEqual('com.apple.CoreSimulator.SimRuntime.watchOS-2-0', runtime_watchos_2.identifier)
+ self.assertEqual(True, runtime_watchos_2.available)
+ self.assertEqual(False, runtime_watchos_2.is_internal_runtime)
+ self.assertEqual(tuple([2, 0]), runtime_watchos_2.version)
+ self.assertEqual(2, len(runtime_watchos_2.devices))
+
+ device_apple_watch_38mm = runtime_watchos_2.devices[0]
+ self.assertEqual('Apple Watch - 38mm', device_apple_watch_38mm.name)
+ self.assertEqual('00138CD2-D30C-4380-A30E-A70B88E1A3C5', device_apple_watch_38mm.udid)
+ self.assertEqual(True, device_apple_watch_38mm.available)
+ self.assertEqual(runtime_watchos_2, device_apple_watch_38mm.runtime)
+
+ device_apple_watch_42mm = runtime_watchos_2.devices[1]
+ self.assertEqual('Apple Watch - 42mm', device_apple_watch_42mm.name)
+ self.assertEqual('186AD85E-9BE5-4734-BC33-DF50484AAFF0', device_apple_watch_42mm.udid)
+ self.assertEqual(True, device_apple_watch_42mm.available)
+ self.assertEqual(runtime_watchos_2, device_apple_watch_42mm.runtime)
+
</ins><span class="cx"> def test_invalid_device_types_header(self):
</span><span class="cx"> """ Tests that an invalid Device Types header throws an exception """
</span><span class="cx"> self._set_expected_xcrun_simctl_list('''XX Device Types XX
</span></span></pre>
</div>
</div>
</body>
</html>