<!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>[172117] 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/172117">172117</a></dd>
<dt>Author</dt> <dd>dfarler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-05 18:38:06 -0700 (Tue, 05 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] run-webkit-tests: defaults for --runtime and --device-type flags
https://bugs.webkit.org/show_bug.cgi?id=135441
Reviewed by Tim Horton.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(parse_args):
(_set_up_derived_options):
If using the ios-simulator platform and runtime or device-type
aren't defined, get the latest runtime from the active Xcode.app
and pick a default device type based on the desired architecture:
iPhone 5 for i386 and iPhone 5s for x86_64.
* Scripts/webkitpy/xcode/__init__.py: Added.
* Scripts/webkitpy/xcode/simulator.py: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Tools/Scripts/webkitpy/xcode/</li>
<li><a href="#trunkToolsScriptswebkitpyxcode__init__py">trunk/Tools/Scripts/webkitpy/xcode/__init__.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulatorpy">trunk/Tools/Scripts/webkitpy/xcode/simulator.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172116 => 172117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-06 01:30:27 UTC (rev 172116)
+++ trunk/Tools/ChangeLog 2014-08-06 01:38:06 UTC (rev 172117)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-08-05 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] run-webkit-tests: defaults for --runtime and --device-type flags
+ https://bugs.webkit.org/show_bug.cgi?id=135441
+
+ Reviewed by Tim Horton.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (parse_args):
+ (_set_up_derived_options):
+ If using the ios-simulator platform and runtime or device-type
+ aren't defined, get the latest runtime from the active Xcode.app
+ and pick a default device type based on the desired architecture:
+ iPhone 5 for i386 and iPhone 5s for x86_64.
+ * Scripts/webkitpy/xcode/__init__.py: Added.
+ * Scripts/webkitpy/xcode/simulator.py: Added.
+
+2014-08-05 David Farler <dfarler@apple.com>
+
</ins><span class="cx"> [iOS] simctl can hang if run quickly after shutting down CoreSimulator services
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135626
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (172116 => 172117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2014-08-06 01:30:27 UTC (rev 172116)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2014-08-06 01:38:06 UTC (rev 172117)
</span><span class="lines">@@ -285,8 +285,8 @@
</span><span class="cx"> ]))
</span><span class="cx">
</span><span class="cx"> option_group_definitions.append(("iOS Simulator Options", [
</span><del>- optparse.make_option('--runtime', help='iOS Simulator runtime identifier'),
- optparse.make_option('--device-type', help='iOS Simulator device type identifier'),
</del><ins>+ optparse.make_option('--runtime', help='iOS Simulator runtime identifier (default: latest runtime)'),
+ optparse.make_option('--device-type', help='iOS Simulator device type identifier (default: i386 -> iPhone 5, x86_64 -> iPhone 5s)'),
</ins><span class="cx"> ]))
</span><span class="cx">
</span><span class="cx"> option_group_definitions.append(("Miscellaneous Options", [
</span><span class="lines">@@ -391,7 +391,15 @@
</span><span class="cx"> if options.platform == "gtk" or options.platform == "efl":
</span><span class="cx"> options.webkit_test_runner = True
</span><span class="cx">
</span><ins>+ if options.platform == 'ios-simulator':
+ from webkitpy import xcode
+ if options.runtime is None:
+ options.runtime = xcode.simulator.get_latest_runtime()['identifier']
+ if options.device_type is None:
+ device_types = xcode.simulator.get_device_types()
+ options.device_type = device_types['iPhone 5'] if options.architecture == 'x86' else device_types['iPhone 5s']
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def run(port, options, args, logging_stream):
</span><span class="cx"> logger = logging.getLogger()
</span><span class="cx"> logger.setLevel(logging.DEBUG if options.debug_rwt_logging else logging.INFO)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcode__init__py"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/xcode/__init__.py (0 => 172117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/__init__.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/xcode/__init__.py 2014-08-06 01:38:06 UTC (rev 172117)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+import simulator
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulatorpy"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (0 => 172117)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2014-08-06 01:38:06 UTC (rev 172117)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+import subprocess
+import re
+
+"""
+Minimally wraps CoreSimulator functionality through simctl.
+
+If possible, use real CoreSimulator.framework functionality by linking to the framework itself.
+Do not use PyObjC to dlopen the framework.
+"""
+
+
+def get_runtimes(only_available=True):
+ """
+ Give a dictionary mapping
+ :return: A dictionary mapping iOS version string to runtime identifier.
+ :rtype: dict
+ """
+ runtimes = {}
+ runtime_re = re.compile(b'iOS (?P<version>[0-9]+\.[0-9]) \([0-9]+\.[0-9]+ - (?P<update>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<unavailable>[^)]+)\))?')
+ stdout = subprocess.check_output(['xcrun', '-sdk', 'iphonesimulator', 'simctl', 'list', 'runtimes'])
+ lines = iter(stdout.splitlines())
+ header = next(lines)
+ if header != '== Runtimes ==':
+ return None
+
+ for line in lines:
+ runtime_match = runtime_re.match(line)
+ if not runtime_match:
+ continue
+ runtime = runtime_match.groupdict()
+ version = tuple([int(component) for component in runtime_match.group('version').split('.')])
+ runtime = {
+ 'identifier': runtime['identifier'],
+ 'available': runtime['unavailable'] is None,
+ 'version': version,
+ }
+ if only_available and not runtime['available']:
+ continue
+
+ runtimes[version] = runtime
+
+ return runtimes
+
+
+def get_devices():
+ """
+ :return: A dictionary mapping iOS version to device hardware model, simulator UDID, and state.
+ :rtype: dict
+ """
+ devices = {}
+ version_re = re.compile('-- iOS (?P<version>[0-9]+\.[0-9]+) --')
+ devices_re = re.compile('\s*(?P<name>[^(]+ )\((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)')
+ stdout = subprocess.check_output(['xcrun', '-sdk', 'iphonesimulator', 'simctl', 'list', 'devices'])
+ lines = iter(stdout.splitlines())
+ header = next(lines)
+ version = None
+ if header != '== Devices ==':
+ return None
+
+ for line in lines:
+ version_match = version_re.match(line)
+ if version_match:
+ version = tuple([int(component) for component in version_match.group('version').split('.')])
+ continue
+ device_match = devices_re.match(line)
+ if not device_match:
+ raise RuntimeError()
+ device = device_match.groupdict()
+ device['name'] = device['name'].rstrip()
+
+ devices[version][device['udid']] = device
+
+ return devices
+
+
+def get_device_types():
+ """
+ :return: A dictionary mapping of device name -> identifier
+ :rtype: dict
+ """
+ device_types = {}
+ device_type_re = re.compile('(?P<name>[^(]+)\((?P<identifier>[^)]+)\)')
+ stdout = subprocess.check_output(['xcrun', '-sdk', 'iphonesimulator', 'simctl', 'list', 'devicetypes'])
+ lines = iter(stdout.splitlines())
+ header = next(lines)
+ if header != '== Device Types ==':
+ return None
+
+ for line in lines:
+ device_type_match = device_type_re.match(line)
+ if not device_type_match:
+ continue
+ device_type = device_type_match.groupdict()
+ device_type['name'] = device_type['name'].rstrip()
+ device_types[device_type['name']] = device_type['identifier']
+
+ return device_types
+
+
+def get_latest_runtime():
+ runtimes = get_runtimes()
+ if not runtimes:
+ return None
+ latest_version = sorted(runtimes.keys())[0]
+ return runtimes[latest_version]
</ins></span></pre>
</div>
</div>
</body>
</html>