<!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>[211457] 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/211457">211457</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-01-31 16:15:44 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Workaround for simctl install failing to report install failure
https://bugs.webkit.org/show_bug.cgi?id=167654
Reviewed by Daniel Bates.
simctl install will sometimes report success even though install has failed.
To workaround this bug, we attempt an app launch after install to ensure
install has succeeded.
* Scripts/webkitpy/xcode/simulator.py:
(Device.install_app): Attempt app launch after install, retry install if launch fails.
(Device.launch_app): Correct comment.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211456 => 211457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-01 00:01:26 UTC (rev 211456)
+++ trunk/Tools/ChangeLog 2017-02-01 00:15:44 UTC (rev 211457)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-01-31 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><ins>+ Workaround for simctl install failing to report install failure
+ https://bugs.webkit.org/show_bug.cgi?id=167654
+
+ Reviewed by Daniel Bates.
+
+ simctl install will sometimes report success even though install has failed.
+ To workaround this bug, we attempt an app launch after install to ensure
+ install has succeeded.
+
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Device.install_app): Attempt app launch after install, retry install if launch fails.
+ (Device.launch_app): Correct comment.
+
+2017-01-31 Jonathan Bedard <jbedard@apple.com>
+
</ins><span class="cx"> Unreviewed webkitpy fix after r211405.
</span><span class="cx">
</span><span class="cx"> * Scripts/webkitpy/xcode/simulator.py:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (211456 => 211457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2017-02-01 00:01:26 UTC (rev 211456)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2017-02-01 00:15:44 UTC (rev 211457)
</span><span class="lines">@@ -264,9 +264,24 @@
</span><span class="cx"> raise RuntimeError('"xcrun simctl erase" failed: device state is {}'.format(Simulator.device_state(udid)))
</span><span class="cx">
</span><span class="cx"> def install_app(self, app_path):
</span><del>- return not self._host.executive.run_command(['xcrun', 'simctl', 'install', self.udid, app_path], return_exit_code=True)
</del><ins>+ # FIXME: This is a workaround for <rdar://problem/30273973>, Racey failure of simctl install.
+ for x in xrange(3):
+ if self._host.executive.run_command(['xcrun', 'simctl', 'install', self.udid, app_path], return_exit_code=True):
+ return False
+ try:
+ bundle_id = self._host.executive.run_command([
+ '/usr/libexec/PlistBuddy',
+ '-c',
+ 'Print CFBundleIdentifier',
+ self._host.filesystem.join(app_path, 'Info.plist'),
+ ]).rstrip()
+ self._host.executive.kill_process(self.launch_app(bundle_id, [], attempts=1))
+ return True
+ except RuntimeError:
+ pass
+ return False
</ins><span class="cx">
</span><del>- def launch_app(self, bundle_id, args, env=None):
</del><ins>+ def launch_app(self, bundle_id, args, env=None, attempts=3):
</ins><span class="cx"> environment_to_use = {}
</span><span class="cx"> SIMCTL_ENV_PREFIX = 'SIMCTL_CHILD_'
</span><span class="cx"> for value in (env or {}):
</span><span class="lines">@@ -275,12 +290,12 @@
</span><span class="cx"> else:
</span><span class="cx"> environment_to_use[value] = env[value]
</span><span class="cx">
</span><del>- # FIXME: This is a workaround for <rdar://problem/30273973>, Racey failure of simctl launch.
</del><ins>+ # FIXME: This is a workaround for <rdar://problem/30172453>.
</ins><span class="cx"> def _log_debug_error(error):
</span><span class="cx"> _log.debug(error.message_with_output())
</span><span class="cx">
</span><span class="cx"> output = None
</span><del>- for x in xrange(3):
</del><ins>+ for x in xrange(attempts):
</ins><span class="cx"> output = self._host.executive.run_command(
</span><span class="cx"> ['xcrun', 'simctl', 'launch', self.udid, bundle_id] + args,
</span><span class="cx"> env=environment_to_use,
</span></span></pre>
</div>
</div>
</body>
</html>