Changeset 180378 in webkit
- Timestamp:
- Feb 19, 2015 6:36:30 PM (9 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r180355 r180378 1 2015-02-19 Daniel Bates <dabates@apple.com> 2 3 REGRESSION (r180239): run-webkit-test fails to boot simulator device that was booted by previous test run 4 https://bugs.webkit.org/show_bug.cgi?id=141815 5 <rdar://problem/19893933> 6 7 Reviewed by Simon Fraser. 8 9 Fixes an issue where run-webkit-tests would fail to boot the WebKit Tester simulator device if it 10 was booted by iOS Simulator in a previous run of run-webkit-test. 11 12 * Scripts/webkitpy/port/ios.py: 13 (IOSSimulatorPort.check_sys_deps): Added logic moved from IOSSimulatorPort.setup_test_run(). 14 (IOSSimulatorPort.setup_test_run): Moved logic to quit the iOS Simulator app and wait for the 15 testing device to be in the shutdown state from here to IOSSimulatorPort.check_sys_deps(). 16 1 17 2015-02-19 David Kilzer <ddkilzer@apple.com> 2 18 -
trunk/Tools/Scripts/webkitpy/port/ios.py
r180239 r180378 203 203 204 204 def setup_test_run(self): 205 self._executive.run_command(['osascript', '-e', 'tell application "iOS Simulator" to quit'])206 205 device_udid = self.testing_device.udid 207 Simulator.wait_until_device_is_in_state(device_udid, Simulator.DeviceState.SHUTDOWN)208 206 self._executive.run_command([ 209 207 'open', '-a', os.path.join(self.developer_dir, 'Applications', 'iOS Simulator.app'), … … 241 239 return False 242 240 testing_device = self.testing_device # May create a new simulator device 241 242 # testing_device will fail to boot if it is already booted. We assume that if testing_device 243 # is booted that it was booted by the iOS Simulator app (as opposed to simctl). So, quit the 244 # iOS Simulator app to shutdown testing_device. 245 self._executive.run_command(['osascript', '-e', 'tell application "iOS Simulator" to quit']) 246 Simulator.wait_until_device_is_in_state(testing_device.udid, Simulator.DeviceState.SHUTDOWN) 247 243 248 if not Simulator.check_simulator_device_and_erase_if_needed(self.host, testing_device.udid): 244 249 _log.error('Unable to boot the simulator device with UDID {0}.'.format(testing_device.udid))
Note: See TracChangeset
for help on using the changeset viewer.