Title: [202070] trunk/Tools
- Revision
- 202070
- Author
- aakash_j...@apple.com
- Date
- 2016-06-14 16:28:11 -0700 (Tue, 14 Jun 2016)
Log Message
Continuous "Reentrancy avoided" error messages in run-webkit-tests if Simulator quits unexpectedly
https://bugs.webkit.org/show_bug.cgi?id=158756
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/xcode/simulator.py:
(Simulator.wait_until_device_is_booted): If checking Simulator boot state fails, verify if
the "simulator device" is still in booted state. Since we ensured that simulator device
was in booted state earlier in this method, this indicates that simulator device has shut down
unexpectedly.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202069 => 202070)
--- trunk/Tools/ChangeLog 2016-06-14 22:56:02 UTC (rev 202069)
+++ trunk/Tools/ChangeLog 2016-06-14 23:28:11 UTC (rev 202070)
@@ -1,3 +1,16 @@
+2016-06-14 Aakash Jain <aakash_j...@apple.com>
+
+ Continuous "Reentrancy avoided" error messages in run-webkit-tests if Simulator quits unexpectedly
+ https://bugs.webkit.org/show_bug.cgi?id=158756
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Simulator.wait_until_device_is_booted): If checking Simulator boot state fails, verify if
+ the "simulator device" is still in booted state. Since we ensured that simulator device
+ was in booted state earlier in this method, this indicates that simulator device has shut down
+ unexpectedly.
+
2016-06-14 David Kilzer <ddkil...@apple.com>
Follow-up fix #2: REGRESSION (r202020): El Capitan CMake Debug build broken
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (202069 => 202070)
--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2016-06-14 22:56:02 UTC (rev 202069)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2016-06-14 23:28:11 UTC (rev 202070)
@@ -283,7 +283,9 @@
if re.search("A[\s]+com.apple.springboard.services", state):
return
except subprocess.CalledProcessError:
- _log.warn("Error in checking Simulator boot status.")
+ if Simulator.device_state(udid) != Simulator.DeviceState.BOOTED:
+ raise RuntimeError('Simuator device quit unexpectedly.')
+ _log.warn("Error in checking Simulator boot status. Will retry in 1 second.")
time.sleep(1)
@staticmethod
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
