<!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>[201986] 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/201986">201986</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2016-06-12 20:57:23 -0700 (Sun, 12 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>run-safari/run-webkit-app fail to quit iOS simulator after Xcode installation
https://bugs.webkit.org/show_bug.cgi?id=158651
rdar://problem/26499824
Reviewed by Daniel Bates.
This change is to make our tools more robust. Sometimes run-safari/run-webkit-app fails
to start the tests as one of the first thing these scripts do is to relaunch iOS Simulators,
and in process call quitIOSSimulator. In case the Simulator is not registered in LaunchServices
for some reason, quitIOSSimulator fails and the script stops. This change will make the scripts
still continue when they fail to quit iOS Simuator, and modify the way Simulator is opened,
so that Simulator is implicitly registered with LaunchServices while opening it.
* Scripts/webkitdirs.pm:
(relaunchIOSSimulator):
Launch iOS Simulator using complete path. Partially reverting http://trac.webkit.org/changeset/184202.
(quitIOSSimulator):
Do not die if quitting ios Simulator fails, so that relaunchIOSSimulator can still
attempt to launch the simulator.
(waitUntilIOSSimulatorDeviceIsInState):
Added a FIXME.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (201985 => 201986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-12 20:57:11 UTC (rev 201985)
+++ trunk/Tools/ChangeLog 2016-06-13 03:57:23 UTC (rev 201986)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-12 Aakash Jain <aakash_jain@apple.com>
+
+ run-safari/run-webkit-app fail to quit iOS simulator after Xcode installation
+ https://bugs.webkit.org/show_bug.cgi?id=158651
+ rdar://problem/26499824
+
+ Reviewed by Daniel Bates.
+
+ This change is to make our tools more robust. Sometimes run-safari/run-webkit-app fails
+ to start the tests as one of the first thing these scripts do is to relaunch iOS Simulators,
+ and in process call quitIOSSimulator. In case the Simulator is not registered in LaunchServices
+ for some reason, quitIOSSimulator fails and the script stops. This change will make the scripts
+ still continue when they fail to quit iOS Simuator, and modify the way Simulator is opened,
+ so that Simulator is implicitly registered with LaunchServices while opening it.
+
+ * Scripts/webkitdirs.pm:
+ (relaunchIOSSimulator):
+ Launch iOS Simulator using complete path. Partially reverting http://trac.webkit.org/changeset/184202.
+ (quitIOSSimulator):
+ Do not die if quitting ios Simulator fails, so that relaunchIOSSimulator can still
+ attempt to launch the simulator.
+ (waitUntilIOSSimulatorDeviceIsInState):
+ Added a FIXME.
+
</ins><span class="cx"> 2016-06-11 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Addressing post-review comments after r201978.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (201985 => 201986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2016-06-12 20:57:11 UTC (rev 201985)
+++ trunk/Tools/Scripts/webkitdirs.pm 2016-06-13 03:57:23 UTC (rev 201986)
</span><span class="lines">@@ -2252,6 +2252,7 @@
</span><span class="cx"> {
</span><span class="cx"> my ($deviceUDID, $waitUntilState) = @_;
</span><span class="cx"> my $device = iosSimulatorDeviceByUDID($deviceUDID);
</span><ins>+ # FIXME: We should add a maximum time limit to wait here.
</ins><span class="cx"> while ($device->{state} ne $waitUntilState) {
</span><span class="cx"> usleep(500 * 1000); # Waiting 500ms between file system polls does not make script run-safari feel sluggish.
</span><span class="cx"> $device = iosSimulatorDeviceByUDID($deviceUDID);
</span><span class="lines">@@ -2278,8 +2279,9 @@
</span><span class="cx"> quitIOSSimulator($simulatedDevice->{UDID});
</span><span class="cx">
</span><span class="cx"> # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
</span><del>- my $iosSimulatorBundleID = "com.apple.iphonesimulator";
- system("open", "-b", $iosSimulatorBundleID, "--args", "-CurrentDeviceUDID", $simulatedDevice->{UDID}) == 0 or die "Failed to open $iosSimulatorBundleID: $!";
</del><ins>+ chomp(my $developerDirectory = $ENV{DEVELOPER_DIR} || `xcode-select --print-path`);
+ my $iosSimulatorPath = File::Spec->catfile($developerDirectory, "Applications", "Simulator.app");
+ system("open", "-a", $iosSimulatorPath, "--args", "-CurrentDeviceUDID", $simulatedDevice->{UDID}) == 0 or die "Failed to open $iosSimulatorPath: $!";
</ins><span class="cx">
</span><span class="cx"> waitUntilIOSSimulatorDeviceIsInState($simulatedDevice->{UDID}, SIMULATOR_DEVICE_STATE_BOOTED);
</span><span class="cx"> }
</span><span class="lines">@@ -2288,7 +2290,11 @@
</span><span class="cx"> {
</span><span class="cx"> my ($waitForShutdownOfSimulatedDeviceUDID) = @_;
</span><span class="cx"> # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
</span><del>- exitStatus(system {"osascript"} "osascript", "-e", 'tell application id "com.apple.iphonesimulator" to quit') == 0 or die "Failed to quit iOS Simulator: $!";
</del><ins>+ if (exitStatus(system {"osascript"} "osascript", "-e", 'tell application id "com.apple.iphonesimulator" to quit')) {
+ # osascript returns a non-zero exit status if Simulator.app is not registered in LaunchServices.
+ return;
+ }
+
</ins><span class="cx"> if (!defined($waitForShutdownOfSimulatedDeviceUDID)) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>