<!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>[188942] 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/188942">188942</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-25 19:01:42 -0700 (Tue, 25 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS Simulator layout-tests fail to start while cleaning a directory structure if simulator is already running
https://bugs.webkit.org/show_bug.cgi?id=148197
rdar://problem/22334382
Patch by Aakash Jain <aakash_jain@apple.com> on 2015-08-25
Reviewed by Daniel Bates.
* BuildSlaveSupport/kill-old-processes: Add Simulator to the list of processes to kill (for iOS builders).
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort): Converted bundle id com.apple.iphonesimulator to a variable SIMULATOR_BUNDLE_ID.
(IOSSimulatorPort._quitIOSSimulator): Common function to quit iOS Simulator.
(IOSSimulatorPort.clean_up_test_run): Quit the simulator during the cleanup.
(IOSSimulatorPort.check_sys_deps): No need to quit the simulator here as its now being quit in reset_preferences().
(IOSSimulatorPort.reset_preferences): Quit the simulator before trying to delete associated data directory.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportkilloldprocesses">trunk/Tools/BuildSlaveSupport/kill-old-processes</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportkilloldprocesses"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/kill-old-processes (188941 => 188942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/kill-old-processes 2015-08-26 01:35:30 UTC (rev 188941)
+++ trunk/Tools/BuildSlaveSupport/kill-old-processes 2015-08-26 02:01:42 UTC (rev 188942)
</span><span class="lines">@@ -85,6 +85,7 @@
</span><span class="cx"> "WebKitTestRunner",
</span><span class="cx"> "WebProcess",
</span><span class="cx"> "xcodebuild",
</span><ins>+ "Simulator" # FIXME: Consider moving iOS-specific tasks to their own list.
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> taskToKillUnix = [
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188941 => 188942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-26 01:35:30 UTC (rev 188941)
+++ trunk/Tools/ChangeLog 2015-08-26 02:01:42 UTC (rev 188942)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-08-25 Aakash Jain <aakash_jain@apple.com>
+
+ iOS Simulator layout-tests fail to start while cleaning a directory structure if simulator is already running
+ https://bugs.webkit.org/show_bug.cgi?id=148197
+ rdar://problem/22334382
+
+ Reviewed by Daniel Bates.
+
+ * BuildSlaveSupport/kill-old-processes: Add Simulator to the list of processes to kill (for iOS builders).
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort): Converted bundle id com.apple.iphonesimulator to a variable SIMULATOR_BUNDLE_ID.
+ (IOSSimulatorPort._quitIOSSimulator): Common function to quit iOS Simulator.
+ (IOSSimulatorPort.clean_up_test_run): Quit the simulator during the cleanup.
+ (IOSSimulatorPort.check_sys_deps): No need to quit the simulator here as its now being quit in reset_preferences().
+ (IOSSimulatorPort.reset_preferences): Quit the simulator before trying to delete associated data directory.
+
</ins><span class="cx"> 2015-08-25 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr style check rule
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (188941 => 188942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-08-26 01:35:30 UTC (rev 188941)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-08-26 02:01:42 UTC (rev 188942)
</span><span class="lines">@@ -77,6 +77,8 @@
</span><span class="cx">
</span><span class="cx"> DEFAULT_ARCHITECTURE = 'x86_64'
</span><span class="cx">
</span><ins>+ SIMULATOR_BUNDLE_ID = 'com.apple.iphonesimulator'
+
</ins><span class="cx"> relay_name = 'LayoutTestRelay'
</span><span class="cx">
</span><span class="cx"> def __init__(self, *args, **kwargs):
</span><span class="lines">@@ -199,7 +201,7 @@
</span><span class="cx"> device_udid = self.testing_device.udid
</span><span class="cx"> # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
</span><span class="cx"> self._executive.run_command([
</span><del>- 'open', '-b', 'com.apple.iphonesimulator',
</del><ins>+ 'open', '-b', self.SIMULATOR_BUNDLE_ID,
</ins><span class="cx"> '--args', '-CurrentDeviceUDID', device_udid])
</span><span class="cx"> Simulator.wait_until_device_is_in_state(device_udid, Simulator.DeviceState.BOOTED)
</span><span class="cx">
</span><span class="lines">@@ -208,8 +210,13 @@
</span><span class="cx"> _log.debug('Waiting {seconds} seconds for iOS Simulator to finish booting ...'.format(seconds=boot_delay))
</span><span class="cx"> time.sleep(boot_delay)
</span><span class="cx">
</span><ins>+ def _quit_ios_simulator(self):
+ # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
+ self._executive.run_command(['osascript', '-e', 'tell application id "{0}" to quit'.format(self.SIMULATOR_BUNDLE_ID)])
+
</ins><span class="cx"> def clean_up_test_run(self):
</span><span class="cx"> super(IOSSimulatorPort, self).clean_up_test_run()
</span><ins>+ self._quit_ios_simulator()
</ins><span class="cx"> fifos = [path for path in os.listdir('/tmp') if re.search('org.webkit.(DumpRenderTree|WebKitTestRunner).*_(IN|OUT|ERROR)', path)]
</span><span class="cx"> for fifo in fifos:
</span><span class="cx"> try:
</span><span class="lines">@@ -239,13 +246,6 @@
</span><span class="cx"> return False
</span><span class="cx"> testing_device = self.testing_device # May create a new simulator device
</span><span class="cx">
</span><del>- # testing_device will fail to boot if it is already booted. We assume that if testing_device
- # is booted that it was booted by the iOS Simulator app (as opposed to simctl). So, quit the
- # iOS Simulator app to shutdown testing_device.
- # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
- self._executive.run_command(['osascript', '-e', 'tell application id "com.apple.iphonesimulator" to quit'])
- Simulator.wait_until_device_is_in_state(testing_device.udid, Simulator.DeviceState.SHUTDOWN)
-
</del><span class="cx"> if not Simulator.check_simulator_device_and_erase_if_needed(self.host, testing_device.udid):
</span><span class="cx"> _log.error('Unable to boot the simulator device with UDID {0}.'.format(testing_device.udid))
</span><span class="cx"> return False
</span><span class="lines">@@ -378,6 +378,11 @@
</span><span class="cx"> return self._image_differ.diff_image(expected_contents, actual_contents, tolerance)
</span><span class="cx">
</span><span class="cx"> def reset_preferences(self):
</span><ins>+ # We assume that if testing_device is booted that it was booted by the iOS Simulator app
+ # (as opposed to simctl). So, quit the iOS Simulator app to shutdown testing_device.
+ self._quit_ios_simulator()
+ Simulator.wait_until_device_is_in_state(self.testing_device.udid, Simulator.DeviceState.SHUTDOWN)
+
</ins><span class="cx"> data_path = os.path.join(self.testing_device.path, 'data')
</span><span class="cx"> if os.path.isdir(data_path):
</span><span class="cx"> shutil.rmtree(data_path)
</span></span></pre>
</div>
</div>
</body>
</html>