Remove additional simulator checks before running layout-tests
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Dec 2015 20:44:55 +0000 (20:44 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 10 Dec 2015 20:44:55 +0000 (20:44 +0000)
https://bugs.webkit.org/show_bug.cgi?id=152146

Patch by Aakash Jain <aakash_jain@apple.com> 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.

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

Tools/ChangeLog
Tools/Scripts/webkitpy/port/ios.py
Tools/Scripts/webkitpy/xcode/simulator.py

index c24271d..8dfaa70 100644 (file)
@@ -1,3 +1,16 @@
+2015-12-10  Aakash Jain  <aakash_jain@apple.com>
+
+        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  <aakash_jain@apple.com>
 
         Run atleast one simulator even if max process limit is low
index ae02e4d..81af15c 100644 (file)
@@ -282,13 +282,6 @@ class IOSSimulatorPort(Port):
         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):
index 283858a..805f0ad 100644 (file)
@@ -299,24 +299,6 @@ class Simulator(object):
     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)