Changes method of quitting iOS Simulator to be more correct.

https://bugs.webkit.org/show_bug.cgi?id=143847
<rdar://problem/20530344>

Reviewed by Darin Adler.

Fixes by addressing the app by ID rather than by name.

* Scripts/webkitdirs.pm:
(quitIOSSimulator):
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.check_sys_deps):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182937 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2f211fe7f61086ee968ef0e8fb071b9fd29901da..5a09728f4bcf205aa101ada1799c6e1db2efe50f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2015-04-16  Jake Nielsen  <jacob_nielsen@apple.com>
+
+        Changes method of quitting iOS Simulator to be more correct.
+        https://bugs.webkit.org/show_bug.cgi?id=143847
+        <rdar://problem/20530344>
+
+        Reviewed by Darin Adler.
+
+        Fixes by addressing the app by ID rather than by name.
+
+        * Scripts/webkitdirs.pm:
+        (quitIOSSimulator):
+        * Scripts/webkitpy/port/ios.py:
+        (IOSSimulatorPort.check_sys_deps):
+
 2015-04-16  Anders Carlsson  <andersca@apple.com>
 
         Deprecate _WKWebsiteDataStore in favor of WKWebsiteDataStore

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index 7346b8c930aee44058b8cfd5757527287a938cf0..a406c9391402b4eb1b1ef06364abb4b9b41ce4a2 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -2125,7 +2125,7 @@ sub relaunchIOSSimulator($)
 sub quitIOSSimulator(;$)
 {
     my ($waitForShutdownOfSimulatedDeviceUDID) = @_;
-    exitStatus(system {"osascript"} "osascript", "-e", 'tell application "iOS Simulator" to quit') == 0 or die "Failed to quit iOS Simulator: $!";
+    exitStatus(system {"osascript"} "osascript", "-e", 'tell application id "com.apple.iphonesimulator" to quit') == 0 or die "Failed to quit iOS Simulator: $!";
     if (!defined($waitForShutdownOfSimulatedDeviceUDID)) {
         return;
     }

diff --git a/Tools/Scripts/webkitpy/port/ios.py b/Tools/Scripts/webkitpy/port/ios.py
index f477410234dc06dcfe14198340188f807a305792..cac26749d3569d8f601ced5abf97e306ff48a90c 100644 (file)
--- a/Tools/Scripts/webkitpy/port/ios.py
+++ b/Tools/Scripts/webkitpy/port/ios.py
@@ -248,7 +248,7 @@ class IOSSimulatorPort(Port):
         # 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.
-        self._executive.run_command(['osascript', '-e', 'tell application "iOS Simulator" to quit'])
+        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)
 
         if not Simulator.check_simulator_device_and_erase_if_needed(self.host, testing_device.udid):