Title: [184202] trunk/Tools
- Revision
- 184202
- Author
- [email protected]
- Date
- 2015-05-12 07:31:05 -0700 (Tue, 12 May 2015)
Log Message
Switch to launching iOS Simulator using bundle ID
<rdar://problem/20916096>
This is required to fix the layout tests on internal bots.
* Scripts/webkitdirs.pm:
(relaunchIOSSimulator): Switch to use bundle ID to launch iOS
Simulator. Add FIXME.
(quitIOSSimulator): Add FIXME.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.setup_test_run): Switch to use bundle ID to
launch iOS Simulator. Add FIXME.
(IOSSimulatorPort.check_sys_deps): Add FIXME.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (184201 => 184202)
--- trunk/Tools/ChangeLog 2015-05-12 14:22:52 UTC (rev 184201)
+++ trunk/Tools/ChangeLog 2015-05-12 14:31:05 UTC (rev 184202)
@@ -1,3 +1,19 @@
+2015-05-12 David Kilzer <[email protected]>
+
+ Switch to launching iOS Simulator using bundle ID
+ <rdar://problem/20916096>
+
+ This is required to fix the layout tests on internal bots.
+
+ * Scripts/webkitdirs.pm:
+ (relaunchIOSSimulator): Switch to use bundle ID to launch iOS
+ Simulator. Add FIXME.
+ (quitIOSSimulator): Add FIXME.
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.setup_test_run): Switch to use bundle ID to
+ launch iOS Simulator. Add FIXME.
+ (IOSSimulatorPort.check_sys_deps): Add FIXME.
+
2015-05-12 Per Arne Vollan <[email protected]>
Fix run-_javascript_core-tests step on the WinCairo bot
Modified: trunk/Tools/Scripts/webkitdirs.pm (184201 => 184202)
--- trunk/Tools/Scripts/webkitdirs.pm 2015-05-12 14:22:52 UTC (rev 184201)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-05-12 14:31:05 UTC (rev 184202)
@@ -2115,16 +2115,17 @@
my ($simulatedDevice) = @_;
quitIOSSimulator($simulatedDevice->{UDID});
- chomp(my $developerDirectory = $ENV{DEVELOPER_DIR} || `xcode-select --print-path`);
- my $iosSimulatorPath = File::Spec->catfile($developerDirectory, "Applications", "iOS Simulator.app");
+ # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
+ my $iosSimulatorBundleID = "com.apple.iphonesimulator";
+ system("open", "-b", $iosSimulatorBundleID, "--args", "-CurrentDeviceUDID", $simulatedDevice->{UDID}) == 0 or die "Failed to open $iosSimulatorBundleID: $!";
- system("open", "-a", $iosSimulatorPath, "--args", "-CurrentDeviceUDID", $simulatedDevice->{UDID}) == 0 or die "Failed to open $iosSimulatorPath: $!";
waitUntilIOSSimulatorDeviceIsInState($simulatedDevice->{UDID}, SIMULATOR_DEVICE_STATE_BOOTED);
}
sub quitIOSSimulator(;$)
{
my ($waitForShutdownOfSimulatedDeviceUDID) = @_;
+ # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting 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;
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (184201 => 184202)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-05-12 14:22:52 UTC (rev 184201)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-05-12 14:31:05 UTC (rev 184202)
@@ -197,8 +197,9 @@
def setup_test_run(self):
device_udid = self.testing_device.udid
+ # FIXME: <rdar://problem/20916140> Switch to using CoreSimulator.framework for launching and quitting iOS Simulator
self._executive.run_command([
- 'open', '-a', os.path.join(self.developer_dir, 'Applications', 'iOS Simulator.app'),
+ 'open', '-b', 'com.apple.iphonesimulator',
'--args', '-CurrentDeviceUDID', device_udid])
Simulator.wait_until_device_is_in_state(device_udid, Simulator.DeviceState.BOOTED)
@@ -241,6 +242,7 @@
# 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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
