89124 2012-06-14 13:48:43 -0700 [Chromium-Android] Should retry a few times when failed to start DumpRenderTree 2012-06-14 18:26:22 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66687 1 wangxianzhu wangxianzhu abarth dpranke jnd ojan tony webkit.review.bot zhenghao oldest_to_newest 649448 0 wangxianzhu 2012-06-14 13:48:43 -0700 On Android sometimes 'am start' fails due to temporary condition. For example: 00:49:07.657 11509 "adb shell am start -n org.chromium.native_test/.ChromeNativeTestActivity" 00:49:07.657 11509 Run adb result: Starting: Intent { cmp=org.chromium.native_test/.ChromeNativeTestActivity } android.os.DeadObjectException at android.os.BinderProxy.transact(Native Method) at android.app.ActivityManagerProxy.startActivity(ActivityManagerNative.java:1750) at com.android.commands.am.Am.runStart(Am.java:463) at com.android.commands.am.Am.run(Am.java:108) at com.android.commands.am.Am.main(Am.java:81) at com.android.internal.os.RuntimeInit.nativeFinishInit(Native Method) at com.android.internal.os.RuntimeInit.main(RuntimeInit.java:235) at dalvik.system.NativeStart.main(Native Method) Should retry a few times before giving up. 649463 1 147647 wangxianzhu 2012-06-14 13:56:45 -0700 Created attachment 147647 patch 649467 2 147649 wangxianzhu 2012-06-14 13:58:47 -0700 Created attachment 147649 patch v2 (sleep before retry) 649469 3 147649 dpranke 2012-06-14 14:02:54 -0700 Comment on attachment 147649 patch v2 (sleep before retry) View in context: https://bugs.webkit.org/attachment.cgi?id=147649&action=review r+. Leaving as cq? in case you want to make my purely optional change :). > Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:494 > + time.sleep(2) View in context: https://bugs.webkit.org/attachment.cgi?id=147647&action=review r+ ... leaving cq? in case you want to make the change I suggest (it's purely optional). > Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:493 > + raise AssertionError('Failed to start DumpRenderTree application multiple times. Give up.') You could also do: for i in range(3): if self._start_once(pixel_tests, per_test_args): return _log.error(...) time.sleep(2) raise AssertionError(...') 649474 4 147647 tony 2012-06-14 14:05:46 -0700 Comment on attachment 147647 patch View in context: https://bugs.webkit.org/attachment.cgi?id=147647&action=review > Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:489 > + while True: > + if self._start_once(pixel_tests, per_test_args): > + break Nit: while not self._start_once(pixel_tests, per_test_args): > Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:497 > self._port._run_adb_command(['logcat', '-c']) > self._port._run_adb_command(['shell', 'echo'] + self.cmd_line(pixel_tests, per_test_args) + ['>', COMMAND_LINE_FILE]) Do you want to rerun these every time? Do these ever fail? 649480 5 147649 wangxianzhu 2012-06-14 14:13:51 -0700 Comment on attachment 147649 patch v2 (sleep before retry) View in context: https://bugs.webkit.org/attachment.cgi?id=147649&action=review >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:493 >> + raise AssertionError('Failed to start DumpRenderTree application multiple times. Give up.') > > You could also do: > > for i in range(3): > if self._start_once(pixel_tests, per_test_args): > return > _log.error(...) > time.sleep(2) > raise AssertionError(...') Nice suggestion. However I'd like Tony's suggestion as we use that style elsewhere in this file :) 649487 6 147647 wangxianzhu 2012-06-14 14:19:59 -0700 Comment on attachment 147647 patch View in context: https://bugs.webkit.org/attachment.cgi?id=147647&action=review >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:489 >> + break > > Nit: while not self._start_once(pixel_tests, per_test_args): Done. >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:497 >> self._port._run_adb_command(['shell', 'echo'] + self.cmd_line(pixel_tests, per_test_args) + ['>', COMMAND_LINE_FILE]) > > Do you want to rerun these every time? Do these ever fail? 'logcat -c' which is to clear the Android log is necessary because we don't want duplicated logs during retries. Initialize command line is not necessary to do every time, but I'd keep _start_once() a complete function to start DRT. And it is logically the precondition of 'am start' and I'd keep them together. 649491 7 147653 wangxianzhu 2012-06-14 14:21:36 -0700 Created attachment 147653 patch v3 649494 8 tony 2012-06-14 14:24:41 -0700 (In reply to comment #6) > (From update of attachment 147647 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=147647&action=review > > >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:497 > >> self._port._run_adb_command(['shell', 'echo'] + self.cmd_line(pixel_tests, per_test_args) + ['>', COMMAND_LINE_FILE]) > > > > Do you want to rerun these every time? Do these ever fail? > > 'logcat -c' which is to clear the Android log is necessary because we don't want duplicated logs during retries. > Initialize command line is not necessary to do every time, but I'd keep _start_once() a complete function to start DRT. And it is logically the precondition of 'am start' and I'd keep them together. I was thinking it might be helpful to move these two commands before the while loop. It might be useful to have the logcat output for when 'am start' fails. I don't feel strongly about this. 649501 9 wangxianzhu 2012-06-14 14:30:01 -0700 (In reply to comment #8) > (In reply to comment #6) > > (From update of attachment 147647 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=147647&action=review > > > > >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:497 > > >> self._port._run_adb_command(['shell', 'echo'] + self.cmd_line(pixel_tests, per_test_args) + ['>', COMMAND_LINE_FILE]) > > > > > > Do you want to rerun these every time? Do these ever fail? > > > > 'logcat -c' which is to clear the Android log is necessary because we don't want duplicated logs during retries. > > Initialize command line is not necessary to do every time, but I'd keep _start_once() a complete function to start DRT. And it is logically the precondition of 'am start' and I'd keep them together. > > I was thinking it might be helpful to move these two commands before the while loop. It might be useful to have the logcat output for when 'am start' fails. I don't feel strongly about this. The error message of 'am start' won't be lost. Log is cleared before 'am start' to remove useless logs produced by other Android activities before this 'am start'. 649507 10 wangxianzhu 2012-06-14 14:35:25 -0700 (In reply to comment #9) > (In reply to comment #8) > > (In reply to comment #6) > > > (From update of attachment 147647 [details] [details] [details]) > > > View in context: https://bugs.webkit.org/attachment.cgi?id=147647&action=review > > > > > > >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:497 > > > >> self._port._run_adb_command(['shell', 'echo'] + self.cmd_line(pixel_tests, per_test_args) + ['>', COMMAND_LINE_FILE]) > > > > > > > > Do you want to rerun these every time? Do these ever fail? > > > > > > 'logcat -c' which is to clear the Android log is necessary because we don't want duplicated logs during retries. > > > Initialize command line is not necessary to do every time, but I'd keep _start_once() a complete function to start DRT. And it is logically the precondition of 'am start' and I'd keep them together. > > > > I was thinking it might be helpful to move these two commands before the while loop. It might be useful to have the logcat output for when 'am start' fails. I don't feel strongly about this. > > The error message of 'am start' won't be lost. Log is cleared before 'am start' to remove useless logs produced by other Android activities before this 'am start'. Correction: ... produced by other Android activities or previous _start_once() (which has already been outputted)... 649508 11 147653 wangxianzhu 2012-06-14 14:41:00 -0700 Comment on attachment 147653 patch v3 cq+. Verified with Tony offline. 649514 12 147653 wangxianzhu 2012-06-14 14:49:44 -0700 Comment on attachment 147653 patch v3 Want to add a line self.stop() to ensure clear state before retry. 649525 13 147659 wangxianzhu 2012-06-14 15:02:09 -0700 Created attachment 147659 patch for landing 649706 14 147659 webkit.review.bot 2012-06-14 18:26:17 -0700 Comment on attachment 147659 patch for landing Clearing flags on attachment: 147659 Committed r120385: <http://trac.webkit.org/changeset/120385> 649707 15 webkit.review.bot 2012-06-14 18:26:22 -0700 All reviewed patches have been landed. Closing bug. 147647 2012-06-14 13:56:45 -0700 2012-06-14 14:19:59 -0700 patch 89124 text/plain 3196 wangxianzhu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyMDM2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA2LTE0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFNob3VsZCByZXRyeSBhIGZldyB0 aW1lcyB3aGVuIGZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMjQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9p ZERyaXZlci5fc3RhcnQpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyKToKKyAgICAg ICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRfb25jZSk6CisKIDIwMTItMDYtMTQgIElh biBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBD ZXJ0YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9hbmRyb2lkLnB5CShyZXZpc2lvbiAxMjAzNDYpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkJKHdvcmtpbmcgY29w eSkKQEAgLTQ4Myw5ICs0ODMsMjMgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGNocm9t aXVtLkNocgogCiAgICAgICAgIENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRlZF9kcml2ZXIg PSBzZWxmCiAKKyAgICAgICAgcmV0cmllcyA9IDAKKyAgICAgICAgd2hpbGUgVHJ1ZToKKyAgICAg ICAgICAgIGlmIHNlbGYuX3N0YXJ0X29uY2UocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgor ICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICBfbG9nLmVycm9yKCdGYWlsZWQgdG8g c3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24uIExvZzpcbicgKyBzZWxmLl9wb3J0Ll9n ZXRfbG9nY2F0KCkpCisgICAgICAgICAgICByZXRyaWVzICs9IDEKKyAgICAgICAgICAgIGlmIHJl dHJpZXMgPj0gMzoKKyAgICAgICAgICAgICAgICByYWlzZSBBc3NlcnRpb25FcnJvcignRmFpbGVk IHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0aW9uIG11bHRpcGxlIHRpbWVzLiBHaXZl IHVwLicpCisKKyAgICBkZWYgX3N0YXJ0X29uY2Uoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0 X2FyZ3MpOgogICAgICAgICBzZWxmLl9wb3J0Ll9ydW5fYWRiX2NvbW1hbmQoWydsb2djYXQnLCAn LWMnXSkKICAgICAgICAgc2VsZi5fcG9ydC5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnZWNo byddICsgc2VsZi5jbWRfbGluZShwaXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncykgKyBbJz4nLCBD T01NQU5EX0xJTkVfRklMRV0pCi0gICAgICAgIHNlbGYuX3BvcnQuX3J1bl9hZGJfY29tbWFuZChb J3NoZWxsJywgJ2FtJywgJ3N0YXJ0JywgJy1uJywgRFJUX0FDVElWSVRZX0ZVTExfTkFNRV0pCisg ICAgICAgIHN0YXJ0X3Jlc3VsdCA9IHNlbGYuX3BvcnQuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxs JywgJ2FtJywgJ3N0YXJ0JywgJy1uJywgRFJUX0FDVElWSVRZX0ZVTExfTkFNRV0pCisgICAgICAg IGlmIHN0YXJ0X3Jlc3VsdC5maW5kKCdFeGNlcHRpb24nKSAhPSAtMToKKyAgICAgICAgICAgIF9s b2cuZXJyb3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZSBhcHBsaWNhdGlvbi4gRXhj ZXB0aW9uOlxuJyArIHN0YXJ0X3Jlc3VsdCkKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQorCiAg ICAgICAgIHNlY29uZHMgPSAwCiAgICAgICAgIHdoaWxlIChub3Qgc2VsZi5fZmlsZV9leGlzdHNf b25fZGV2aWNlKHNlbGYuX2luX2ZpZm9fcGF0aCkgb3IKICAgICAgICAgICAgICAgIG5vdCBzZWxm Ll9maWxlX2V4aXN0c19vbl9kZXZpY2Uoc2VsZi5fb3V0X2ZpZm9fcGF0aCkgb3IKQEAgLTQ5Myw4 ICs1MDcsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoY2hyb21pdW0uQ2hyCiAgICAg ICAgICAgICB0aW1lLnNsZWVwKDEpCiAgICAgICAgICAgICBzZWNvbmRzICs9IDEKICAgICAgICAg ICAgIGlmIHNlY29uZHMgPj0gRFJUX1NUQVJUX1NUT1BfVElNRU9VVF9TRUNTOgotICAgICAgICAg ICAgICAgIF9sb2cuZXJyb3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZUFwcGxpY2F0 aW9uLiBMb2c6XG4nICsgc2VsZi5fcG9ydC5fZ2V0X2xvZ2NhdCgpKQotICAgICAgICAgICAgICAg IHJhaXNlIEFzc2VydGlvbkVycm9yKCdGYWlsZWQgdG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBw bGljYXRpb24uJykKKyAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgICAgICBzaGVs bF9jbWQgPSBzZWxmLl9wb3J0Ll9hZGJfY29tbWFuZCArIFsnc2hlbGwnXQogICAgICAgICBleGVj dXRpdmUgPSBzZWxmLl9wb3J0Ll9leGVjdXRpdmUKQEAgLTUzNyw3ICs1NTAsNyBAQCBjbGFzcyBD aHJvbWl1bUFuZHJvaWREcml2ZXIoY2hyb21pdW0uQ2hyCiAgICAgICAgIGVsc2U6CiAgICAgICAg ICAgICAjIEluZm9ybSB0aGUgZGVhZGxvY2sgZGV0ZWN0b3IgdGhhdCB0aGUgc3RhcnR1cCBpcyBz dWNjZXNzZnVsIHdpdGhvdXQgZGVhZGxvY2suCiAgICAgICAgICAgICBub3JtYWxfc3RhcnR1cF9l dmVudC5zZXQoKQotICAgICAgICAgICAgcmV0dXJuCisgICAgICAgICAgICByZXR1cm4gVHJ1ZQog CiAgICAgZGVmIHJ1bl90ZXN0KHNlbGYsIGRyaXZlcl9pbnB1dCk6CiAgICAgICAgIGRyaXZlcl9v dXRwdXQgPSBjaHJvbWl1bS5DaHJvbWl1bURyaXZlci5ydW5fdGVzdChzZWxmLCBkcml2ZXJfaW5w dXQpCg== 147649 2012-06-14 13:58:47 -0700 2012-06-14 14:21:36 -0700 patch v2 (sleep before retry) 89124 text/plain 3223 wangxianzhu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyMDM2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA2LTE0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFNob3VsZCByZXRyeSBhIGZldyB0 aW1lcyB3aGVuIGZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMjQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9p ZERyaXZlci5fc3RhcnQpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyKToKKyAgICAg ICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRfb25jZSk6CisKIDIwMTItMDYtMTQgIElh biBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBD ZXJ0YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9j aHJvbWl1bV9hbmRyb2lkLnB5CShyZXZpc2lvbiAxMjAzNDYpCisrKyBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkJKHdvcmtpbmcgY29w eSkKQEAgLTQ4Myw5ICs0ODMsMjQgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGNocm9t aXVtLkNocgogCiAgICAgICAgIENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRlZF9kcml2ZXIg PSBzZWxmCiAKKyAgICAgICAgcmV0cmllcyA9IDAKKyAgICAgICAgd2hpbGUgVHJ1ZToKKyAgICAg ICAgICAgIGlmIHNlbGYuX3N0YXJ0X29uY2UocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgor ICAgICAgICAgICAgICAgIGJyZWFrCisgICAgICAgICAgICBfbG9nLmVycm9yKCdGYWlsZWQgdG8g c3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24uIExvZzpcbicgKyBzZWxmLl9wb3J0Ll9n ZXRfbG9nY2F0KCkpCisgICAgICAgICAgICByZXRyaWVzICs9IDEKKyAgICAgICAgICAgIGlmIHJl dHJpZXMgPj0gMzoKKyAgICAgICAgICAgICAgICByYWlzZSBBc3NlcnRpb25FcnJvcignRmFpbGVk IHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0aW9uIG11bHRpcGxlIHRpbWVzLiBHaXZl IHVwLicpCisgICAgICAgICAgICB0aW1lLnNsZWVwKDIpCisKKyAgICBkZWYgX3N0YXJ0X29uY2Uo c2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICBzZWxmLl9wb3J0Ll9y dW5fYWRiX2NvbW1hbmQoWydsb2djYXQnLCAnLWMnXSkKICAgICAgICAgc2VsZi5fcG9ydC5fcnVu X2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnZWNobyddICsgc2VsZi5jbWRfbGluZShwaXhlbF90ZXN0 cywgcGVyX3Rlc3RfYXJncykgKyBbJz4nLCBDT01NQU5EX0xJTkVfRklMRV0pCi0gICAgICAgIHNl bGYuX3BvcnQuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2FtJywgJ3N0YXJ0JywgJy1uJywg RFJUX0FDVElWSVRZX0ZVTExfTkFNRV0pCisgICAgICAgIHN0YXJ0X3Jlc3VsdCA9IHNlbGYuX3Bv cnQuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2FtJywgJ3N0YXJ0JywgJy1uJywgRFJUX0FD VElWSVRZX0ZVTExfTkFNRV0pCisgICAgICAgIGlmIHN0YXJ0X3Jlc3VsdC5maW5kKCdFeGNlcHRp b24nKSAhPSAtMToKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1w UmVuZGVyVHJlZSBhcHBsaWNhdGlvbi4gRXhjZXB0aW9uOlxuJyArIHN0YXJ0X3Jlc3VsdCkKKyAg ICAgICAgICAgIHJldHVybiBGYWxzZQorCiAgICAgICAgIHNlY29uZHMgPSAwCiAgICAgICAgIHdo aWxlIChub3Qgc2VsZi5fZmlsZV9leGlzdHNfb25fZGV2aWNlKHNlbGYuX2luX2ZpZm9fcGF0aCkg b3IKICAgICAgICAgICAgICAgIG5vdCBzZWxmLl9maWxlX2V4aXN0c19vbl9kZXZpY2Uoc2VsZi5f b3V0X2ZpZm9fcGF0aCkgb3IKQEAgLTQ5Myw4ICs1MDgsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJv aWREcml2ZXIoY2hyb21pdW0uQ2hyCiAgICAgICAgICAgICB0aW1lLnNsZWVwKDEpCiAgICAgICAg ICAgICBzZWNvbmRzICs9IDEKICAgICAgICAgICAgIGlmIHNlY29uZHMgPj0gRFJUX1NUQVJUX1NU T1BfVElNRU9VVF9TRUNTOgotICAgICAgICAgICAgICAgIF9sb2cuZXJyb3IoJ0ZhaWxlZCB0byBz dGFydCBEdW1wUmVuZGVyVHJlZUFwcGxpY2F0aW9uLiBMb2c6XG4nICsgc2VsZi5fcG9ydC5fZ2V0 X2xvZ2NhdCgpKQotICAgICAgICAgICAgICAgIHJhaXNlIEFzc2VydGlvbkVycm9yKCdGYWlsZWQg dG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24uJykKKyAgICAgICAgICAgICAgICBy ZXR1cm4gRmFsc2UKIAogICAgICAgICBzaGVsbF9jbWQgPSBzZWxmLl9wb3J0Ll9hZGJfY29tbWFu ZCArIFsnc2hlbGwnXQogICAgICAgICBleGVjdXRpdmUgPSBzZWxmLl9wb3J0Ll9leGVjdXRpdmUK QEAgLTUzNyw3ICs1NTEsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoY2hyb21pdW0u Q2hyCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAjIEluZm9ybSB0aGUgZGVhZGxvY2sgZGV0 ZWN0b3IgdGhhdCB0aGUgc3RhcnR1cCBpcyBzdWNjZXNzZnVsIHdpdGhvdXQgZGVhZGxvY2suCiAg ICAgICAgICAgICBub3JtYWxfc3RhcnR1cF9ldmVudC5zZXQoKQotICAgICAgICAgICAgcmV0dXJu CisgICAgICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgZGVmIHJ1bl90ZXN0KHNlbGYsIGRyaXZl cl9pbnB1dCk6CiAgICAgICAgIGRyaXZlcl9vdXRwdXQgPSBjaHJvbWl1bS5DaHJvbWl1bURyaXZl ci5ydW5fdGVzdChzZWxmLCBkcml2ZXJfaW5wdXQpCg== 147653 2012-06-14 14:21:36 -0700 2012-06-14 15:02:09 -0700 patch v3 89124 text/plain 3179 wangxianzhu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyMDM2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA2LTE0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFNob3VsZCByZXRyeSBhIGZldyB0 aW1lcyB3aGVuIGZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMjQKKworICAgICAgICBSZXZpZXdl ZCBieSBEaXJrIFByYW5rZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERy aXZlci5fc3RhcnQpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyKToKKyAgICAgICAg KENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRfb25jZSk6CisKIDIwMTItMDYtMTQgIElhbiBW b2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBDZXJ0 YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9hbmRyb2lkLnB5CShyZXZpc2lvbiAxMjAzNDYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkJKHdvcmtpbmcgY29weSkK QEAgLTQ4Myw5ICs0ODMsMjIgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGNocm9taXVt LkNocgogCiAgICAgICAgIENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRlZF9kcml2ZXIgPSBz ZWxmCiAKKyAgICAgICAgcmV0cmllcyA9IDAKKyAgICAgICAgd2hpbGUgbm90IHNlbGYuX3N0YXJ0 X29uY2UocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgorICAgICAgICAgICAgX2xvZy5lcnJv cignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0aW9uLiBMb2c6XG4nICsg c2VsZi5fcG9ydC5fZ2V0X2xvZ2NhdCgpKQorICAgICAgICAgICAgcmV0cmllcyArPSAxCisgICAg ICAgICAgICBpZiByZXRyaWVzID49IDM6CisgICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0aW9u RXJyb3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZSBhcHBsaWNhdGlvbiBtdWx0aXBs ZSB0aW1lcy4gR2l2ZSB1cC4nKQorICAgICAgICAgICAgdGltZS5zbGVlcCgyKQorCisgICAgZGVm IF9zdGFydF9vbmNlKHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKICAgICAgICAg c2VsZi5fcG9ydC5fcnVuX2FkYl9jb21tYW5kKFsnbG9nY2F0JywgJy1jJ10pCiAgICAgICAgIHNl bGYuX3BvcnQuX3J1bl9hZGJfY29tbWFuZChbJ3NoZWxsJywgJ2VjaG8nXSArIHNlbGYuY21kX2xp bmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpICsgWyc+JywgQ09NTUFORF9MSU5FX0ZJTEVd KQotICAgICAgICBzZWxmLl9wb3J0Ll9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcsICdhbScsICdz dGFydCcsICctbicsIERSVF9BQ1RJVklUWV9GVUxMX05BTUVdKQorICAgICAgICBzdGFydF9yZXN1 bHQgPSBzZWxmLl9wb3J0Ll9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcsICdhbScsICdzdGFydCcs ICctbicsIERSVF9BQ1RJVklUWV9GVUxMX05BTUVdKQorICAgICAgICBpZiBzdGFydF9yZXN1bHQu ZmluZCgnRXhjZXB0aW9uJykgIT0gLTE6CisgICAgICAgICAgICBfbG9nLmVycm9yKCdGYWlsZWQg dG8gc3RhcnQgRHVtcFJlbmRlclRyZWUgYXBwbGljYXRpb24uIEV4Y2VwdGlvbjpcbicgKyBzdGFy dF9yZXN1bHQpCisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKwogICAgICAgICBzZWNvbmRzID0g MAogICAgICAgICB3aGlsZSAobm90IHNlbGYuX2ZpbGVfZXhpc3RzX29uX2RldmljZShzZWxmLl9p bl9maWZvX3BhdGgpIG9yCiAgICAgICAgICAgICAgICBub3Qgc2VsZi5fZmlsZV9leGlzdHNfb25f ZGV2aWNlKHNlbGYuX291dF9maWZvX3BhdGgpIG9yCkBAIC00OTMsOCArNTA2LDcgQEAgY2xhc3Mg Q2hyb21pdW1BbmRyb2lkRHJpdmVyKGNocm9taXVtLkNocgogICAgICAgICAgICAgdGltZS5zbGVl cCgxKQogICAgICAgICAgICAgc2Vjb25kcyArPSAxCiAgICAgICAgICAgICBpZiBzZWNvbmRzID49 IERSVF9TVEFSVF9TVE9QX1RJTUVPVVRfU0VDUzoKLSAgICAgICAgICAgICAgICBfbG9nLmVycm9y KCdGYWlsZWQgdG8gc3RhcnQgRHVtcFJlbmRlclRyZWVBcHBsaWNhdGlvbi4gTG9nOlxuJyArIHNl bGYuX3BvcnQuX2dldF9sb2djYXQoKSkKLSAgICAgICAgICAgICAgICByYWlzZSBBc3NlcnRpb25F cnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0aW9uLicpCisgICAg ICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKICAgICAgICAgc2hlbGxfY21kID0gc2VsZi5fcG9y dC5fYWRiX2NvbW1hbmQgKyBbJ3NoZWxsJ10KICAgICAgICAgZXhlY3V0aXZlID0gc2VsZi5fcG9y dC5fZXhlY3V0aXZlCkBAIC01MzcsNyArNTQ5LDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJp dmVyKGNocm9taXVtLkNocgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgIyBJbmZvcm0gdGhl IGRlYWRsb2NrIGRldGVjdG9yIHRoYXQgdGhlIHN0YXJ0dXAgaXMgc3VjY2Vzc2Z1bCB3aXRob3V0 IGRlYWRsb2NrLgogICAgICAgICAgICAgbm9ybWFsX3N0YXJ0dXBfZXZlbnQuc2V0KCkKLSAgICAg ICAgICAgIHJldHVybgorICAgICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgIGRlZiBydW5fdGVz dChzZWxmLCBkcml2ZXJfaW5wdXQpOgogICAgICAgICBkcml2ZXJfb3V0cHV0ID0gY2hyb21pdW0u Q2hyb21pdW1Ecml2ZXIucnVuX3Rlc3Qoc2VsZiwgZHJpdmVyX2lucHV0KQo= 147659 2012-06-14 15:02:09 -0700 2012-06-14 18:26:17 -0700 patch for landing 89124a text/plain 3204 wangxianzhu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyMDM2MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDEyLTA2LTE0ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIFNob3VsZCByZXRyeSBhIGZldyB0 aW1lcyB3aGVuIGZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkxMjQKKworICAgICAgICBSZXZpZXdl ZCBieSBEaXJrIFByYW5rZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERy aXZlci5fc3RhcnQpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyKToKKyAgICAgICAg KENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRfb25jZSk6CisKIDIwMTItMDYtMTQgIElhbiBW b2xsaWNrICA8dm9sbGlja0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBDZXJ0 YWluIHNldHRpbmdzIGluIENDU2V0dGluZ3MgY291bGQgYmUgZ2xvYmFsCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bV9hbmRyb2lkLnB5CShyZXZpc2lvbiAxMjAzNDYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkJKHdvcmtpbmcgY29weSkK QEAgLTQ4Myw5ICs0ODMsMjMgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGNocm9taXVt LkNocgogCiAgICAgICAgIENocm9taXVtQW5kcm9pZERyaXZlci5fc3RhcnRlZF9kcml2ZXIgPSBz ZWxmCiAKKyAgICAgICAgcmV0cmllcyA9IDAKKyAgICAgICAgd2hpbGUgbm90IHNlbGYuX3N0YXJ0 X29uY2UocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgorICAgICAgICAgICAgX2xvZy5lcnJv cignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0aW9uLiBMb2c6XG4nICsg c2VsZi5fcG9ydC5fZ2V0X2xvZ2NhdCgpKQorICAgICAgICAgICAgcmV0cmllcyArPSAxCisgICAg ICAgICAgICBpZiByZXRyaWVzID49IDM6CisgICAgICAgICAgICAgICAgcmFpc2UgQXNzZXJ0aW9u RXJyb3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVyVHJlZSBhcHBsaWNhdGlvbiBtdWx0aXBs ZSB0aW1lcy4gR2l2ZSB1cC4nKQorICAgICAgICAgICAgc2VsZi5zdG9wKCkKKyAgICAgICAgICAg IHRpbWUuc2xlZXAoMikKKworICAgIGRlZiBfc3RhcnRfb25jZShzZWxmLCBwaXhlbF90ZXN0cywg cGVyX3Rlc3RfYXJncyk6CiAgICAgICAgIHNlbGYuX3BvcnQuX3J1bl9hZGJfY29tbWFuZChbJ2xv Z2NhdCcsICctYyddKQogICAgICAgICBzZWxmLl9wb3J0Ll9ydW5fYWRiX2NvbW1hbmQoWydzaGVs bCcsICdlY2hvJ10gKyBzZWxmLmNtZF9saW5lKHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKSAr IFsnPicsIENPTU1BTkRfTElORV9GSUxFXSkKLSAgICAgICAgc2VsZi5fcG9ydC5fcnVuX2FkYl9j b21tYW5kKFsnc2hlbGwnLCAnYW0nLCAnc3RhcnQnLCAnLW4nLCBEUlRfQUNUSVZJVFlfRlVMTF9O QU1FXSkKKyAgICAgICAgc3RhcnRfcmVzdWx0ID0gc2VsZi5fcG9ydC5fcnVuX2FkYl9jb21tYW5k KFsnc2hlbGwnLCAnYW0nLCAnc3RhcnQnLCAnLW4nLCBEUlRfQUNUSVZJVFlfRlVMTF9OQU1FXSkK KyAgICAgICAgaWYgc3RhcnRfcmVzdWx0LmZpbmQoJ0V4Y2VwdGlvbicpICE9IC0xOgorICAgICAg ICAgICAgX2xvZy5lcnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVlIGFwcGxpY2F0 aW9uLiBFeGNlcHRpb246XG4nICsgc3RhcnRfcmVzdWx0KQorICAgICAgICAgICAgcmV0dXJuIEZh bHNlCisKICAgICAgICAgc2Vjb25kcyA9IDAKICAgICAgICAgd2hpbGUgKG5vdCBzZWxmLl9maWxl X2V4aXN0c19vbl9kZXZpY2Uoc2VsZi5faW5fZmlmb19wYXRoKSBvcgogICAgICAgICAgICAgICAg bm90IHNlbGYuX2ZpbGVfZXhpc3RzX29uX2RldmljZShzZWxmLl9vdXRfZmlmb19wYXRoKSBvcgpA QCAtNDkzLDggKzUwNyw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihjaHJvbWl1bS5D aHIKICAgICAgICAgICAgIHRpbWUuc2xlZXAoMSkKICAgICAgICAgICAgIHNlY29uZHMgKz0gMQog ICAgICAgICAgICAgaWYgc2Vjb25kcyA+PSBEUlRfU1RBUlRfU1RPUF9USU1FT1VUX1NFQ1M6Ci0g ICAgICAgICAgICAgICAgX2xvZy5lcnJvcignRmFpbGVkIHRvIHN0YXJ0IER1bXBSZW5kZXJUcmVl QXBwbGljYXRpb24uIExvZzpcbicgKyBzZWxmLl9wb3J0Ll9nZXRfbG9nY2F0KCkpCi0gICAgICAg ICAgICAgICAgcmFpc2UgQXNzZXJ0aW9uRXJyb3IoJ0ZhaWxlZCB0byBzdGFydCBEdW1wUmVuZGVy VHJlZSBhcHBsaWNhdGlvbi4nKQorICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAg ICAgIHNoZWxsX2NtZCA9IHNlbGYuX3BvcnQuX2FkYl9jb21tYW5kICsgWydzaGVsbCddCiAgICAg ICAgIGV4ZWN1dGl2ZSA9IHNlbGYuX3BvcnQuX2V4ZWN1dGl2ZQpAQCAtNTM3LDcgKzU1MCw3IEBA IGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZlcihjaHJvbWl1bS5DaHIKICAgICAgICAgZWxzZToK ICAgICAgICAgICAgICMgSW5mb3JtIHRoZSBkZWFkbG9jayBkZXRlY3RvciB0aGF0IHRoZSBzdGFy dHVwIGlzIHN1Y2Nlc3NmdWwgd2l0aG91dCBkZWFkbG9jay4KICAgICAgICAgICAgIG5vcm1hbF9z dGFydHVwX2V2ZW50LnNldCgpCi0gICAgICAgICAgICByZXR1cm4KKyAgICAgICAgICAgIHJldHVy biBUcnVlCiAKICAgICBkZWYgcnVuX3Rlc3Qoc2VsZiwgZHJpdmVyX2lucHV0KToKICAgICAgICAg ZHJpdmVyX291dHB1dCA9IGNocm9taXVtLkNocm9taXVtRHJpdmVyLnJ1bl90ZXN0KHNlbGYsIGRy aXZlcl9pbnB1dCkK