Title: [193923] trunk/Tools
- Revision
- 193923
- Author
- [email protected]
- Date
- 2015-12-10 12:44:55 -0800 (Thu, 10 Dec 2015)
Log Message
Remove additional simulator checks before running layout-tests
https://bugs.webkit.org/show_bug.cgi?id=152146
Patch by Aakash Jain <[email protected]> on 2015-12-10
Reviewed by Darin Adler.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.check_sys_deps): Removed additional simulators verifications.
* Scripts/webkitpy/xcode/simulator.py:
(Simulator._boot_and_shutdown_simulator_device): Deleted.
(Simulator.check_simulator_device_and_erase_if_needed): Deleted.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (193922 => 193923)
--- trunk/Tools/ChangeLog 2015-12-10 20:22:18 UTC (rev 193922)
+++ trunk/Tools/ChangeLog 2015-12-10 20:44:55 UTC (rev 193923)
@@ -1,3 +1,16 @@
+2015-12-10 Aakash Jain <[email protected]>
+
+ Remove additional simulator checks before running layout-tests
+ https://bugs.webkit.org/show_bug.cgi?id=152146
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.check_sys_deps): Removed additional simulators verifications.
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Simulator._boot_and_shutdown_simulator_device): Deleted.
+ (Simulator.check_simulator_device_and_erase_if_needed): Deleted.
+
2015-12-09 Aakash Jain <[email protected]>
Run atleast one simulator even if max process limit is low
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (193922 => 193923)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-12-10 20:22:18 UTC (rev 193922)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-12-10 20:44:55 UTC (rev 193923)
@@ -282,13 +282,6 @@
for i in xrange(self.child_processes()):
# FIXME: This creates the devices sequentially, doing this in parallel can improve performance.
testing_device = self.testing_device(i)
- _log.debug('Verifying Simulator{0} with UDID {1}.'.format(i, testing_device.udid))
-
- # FIXME: This is very slow, especially for mulitple simulators, we probably do not need
- # this checking as we are re-creating new simulator apps and devices in every run.
- if not Simulator.check_simulator_device_and_erase_if_needed(self.host, testing_device.udid):
- _log.error('Unable to boot the simulator device with UDID {0}.'.format(testing_device.udid))
- return False
return super(IOSSimulatorPort, self).check_sys_deps(needs_http)
def check_for_leaks(self, process_name, process_pid):
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (193922 => 193923)
--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-12-10 20:22:18 UTC (rev 193922)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-12-10 20:44:55 UTC (rev 193923)
@@ -299,24 +299,6 @@
def device_directory(udid):
return os.path.realpath(os.path.expanduser(os.path.join('~/Library/Developer/CoreSimulator/Devices', udid)))
- @staticmethod
- def _boot_and_shutdown_simulator_device(host, udid):
- exit_code = host.executive.run_command(['xcrun', 'simctl', 'boot', udid], return_exit_code=True)
- if exit_code:
- return exit_code
- exit_code = host.executive.run_command(['xcrun', 'simctl', 'shutdown', udid], return_exit_code=True)
- return exit_code
-
- @staticmethod
- def check_simulator_device_and_erase_if_needed(host, udid):
- exit_code = Simulator._boot_and_shutdown_simulator_device(host, udid)
- if not exit_code:
- return True # Can boot device
- # Try erasing the simulator device to restore it to a known good state.
- if not host.executive.run_command(['xcrun', 'simctl', 'erase', udid], return_exit_code=True):
- return Simulator._boot_and_shutdown_simulator_device(host, udid) == 0 # Can boot device
- return False # Cannot boot or erase device
-
def delete_device(self, udid):
Device.delete(udid)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
