<!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>[168547] 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/168547">168547</a></dd>
<dt>Author</dt> <dd>dfarler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-09 13:25:02 -0700 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>com.apple.iphonesimulator.startSession needs to pass "RuntimeIdentifier"
https://bugs.webkit.org/show_bug.cgi?id=132718
Reviewed by David Kilzer.
The simulator may not be able to look up runtimes by SDK paths
and instead will map SDK versions to runtimes instead. In
com.apple.iphonesimulator.startSession notifications,
'runtimeIdentifier' (SDK version string) is preferred over
'sdkRoot' (SDK path) anyway. Include the 'runtimeIdentifier' key
when creating a new DRT or WKTR simulator session.
IPhoneSimulatorNotification.pm filters out keys for this
notification's userInfo with a hard-coded list. There's no harm
in including extra key-value pairs in an NSNotification userInfo
dictionary anyway and the simulator may again change its
userInfo schema for this notification.
* DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm:
(postStartSessionNotification):
* Scripts/old-run-webkit-tests:
(installAndLaunchDumpToolAppUsingNotification):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationlibIPhoneSimulatorNotificationpm">trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm</a></li>
<li><a href="#trunkToolsScriptsoldrunwebkittests">trunk/Tools/Scripts/old-run-webkit-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168546 => 168547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-09 20:16:41 UTC (rev 168546)
+++ trunk/Tools/ChangeLog 2014-05-09 20:25:02 UTC (rev 168547)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-05-09 David Farler <dfarler@apple.com>
+
+ com.apple.iphonesimulator.startSession needs to pass "RuntimeIdentifier"
+ https://bugs.webkit.org/show_bug.cgi?id=132718
+
+ Reviewed by David Kilzer.
+
+ The simulator may not be able to look up runtimes by SDK paths
+ and instead will map SDK versions to runtimes instead. In
+ com.apple.iphonesimulator.startSession notifications,
+ 'runtimeIdentifier' (SDK version string) is preferred over
+ 'sdkRoot' (SDK path) anyway. Include the 'runtimeIdentifier' key
+ when creating a new DRT or WKTR simulator session.
+
+ IPhoneSimulatorNotification.pm filters out keys for this
+ notification's userInfo with a hard-coded list. There's no harm
+ in including extra key-value pairs in an NSNotification userInfo
+ dictionary anyway and the simulator may again change its
+ userInfo schema for this notification.
+
+ * DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm:
+ (postStartSessionNotification):
+ * Scripts/old-run-webkit-tests:
+ (installAndLaunchDumpToolAppUsingNotification):
+
</ins><span class="cx"> 2014-05-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Another build fix.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosPerlSupportIPhoneSimulatorNotificationlibIPhoneSimulatorNotificationpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm (168546 => 168547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm 2014-05-09 20:16:41 UTC (rev 168546)
+++ trunk/Tools/DumpRenderTree/ios/PerlSupport/IPhoneSimulatorNotification/lib/IPhoneSimulatorNotification.pm 2014-05-09 20:25:02 UTC (rev 168547)
</span><span class="lines">@@ -199,13 +199,9 @@
</span><span class="cx"> my $self = shift;
</span><span class="cx"> my $dict = shift;
</span><span class="cx">
</span><del>- my $userInfo = NSMutableDictionary->dictionaryWithCapacity_(4);
- for my $property (qw(applicationArguments applicationEnvironment applicationIdentifier applicationPath deviceFamily deviceInfo productType sessionOwner sessionUUID sdkRoot version waitForDebugger)) {
- if (exists $dict->{$property}) {
- my $key = NSString->stringWithCString_($property);
- my $value = $dict->{$property};
- $userInfo->setObject_forKey_($value, $key);
- }
</del><ins>+ my $userInfo = NSMutableDictionary->dictionaryWithCapacity_(scalar(keys($dict)) + 1);
+ foreach my $key (keys($dict)) {
+ $userInfo->setObject_forKey_($dict->{$key}, $key);
</ins><span class="cx"> }
</span><span class="cx"> $userInfo->setObject_forKey_(NSNumber->numberWithInt_(1), NSString->stringWithCString_("version"));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsoldrunwebkittests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/old-run-webkit-tests (168546 => 168547)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/old-run-webkit-tests 2014-05-09 20:16:41 UTC (rev 168546)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2014-05-09 20:25:02 UTC (rev 168547)
</span><span class="lines">@@ -1392,12 +1392,15 @@
</span><span class="cx"> $applicationPath = "$productDir/DumpRenderTree.app";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ chomp(my $sdkVersion = `xcrun --sdk iphonesimulator --show-sdk-version`);
+
</ins><span class="cx"> my $dict = {
</span><span class="cx"> applicationArguments => &$makeNSArrayFromArray($args),
</span><span class="cx"> applicationEnvironment => &$makeNSDictionaryFromHash($cleanEnv),
</span><span class="cx"> applicationIdentifier => NSString->stringWithCString_($identifier),
</span><span class="cx"> applicationPath => NSString->stringWithCString_($applicationPath),
</span><span class="cx"> deviceInfo => NSString->stringWithCString_($deviceName),
</span><ins>+ runtimeIdentifier => NSString->stringWithCString_($sdkVersion),
</ins><span class="cx"> sessionOwner => NSString->stringWithCString_($programName),
</span><span class="cx"> sessionUUID => NSString->stringWithCString_(simulatorSessionUUID()),
</span><span class="cx"> sdkRoot => NSString->stringWithCString_($sdkRoot),
</span></span></pre>
</div>
</div>
</body>
</html>