38298 2010-04-28 17:46:10 -0700 new-run-webkit-tests can deadlock with Chromium's TestShell 2010-04-29 05:01:30 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 38300 1 eric webkit-unassigned abarth commit-queue dpranke eric jorlow ojan tony webkit.review.bot oldest_to_newest 218719 0 eric 2010-04-28 17:46:10 -0700 new-run-webkit-tests can deadlock with Chromium's TestShell TestShell waits in fgets for a new URL from NRWT. NRWT waits in .readline() for a line which looks like #EOF. If TestShell never sends an #EOF, or hangs itself before sending the #EOF, then the two will deadlock. See attached samples. 218721 1 54645 eric 2010-04-28 17:47:00 -0700 Created attachment 54645 Sample from new-run-webkit-tests when hung waiting on two TestShells 218722 2 54646 eric 2010-04-28 17:48:25 -0700 Created attachment 54646 sample from first TestShell 218723 3 54647 eric 2010-04-28 17:48:43 -0700 Created attachment 54647 sample from second TestShell 218725 4 eric 2010-04-28 17:49:27 -0700 I'm not sure what exact conditions caused this deadlock, but it's clear from reading the code it's possible. We may have had this for a long time, or it's possible (but unlikely) that this recently regressed. 218824 5 eric 2010-04-28 22:13:05 -0700 The hang in TestShell happens at this fgets: http://src.chromium.org/cgi-bin/gitweb.cgi?p=chromium.git;a=blob;f=webkit/tools/test_shell/test_shell_main.cc;h=37c26bcff0bc9475f051cc0025b688109ed816ca;hb=HEAD#l316 If for any reason the first char of: filenameBuffer is 0 we can hang: 324 if (!*filenameBuffer) 325 continue; This started happening more with my unicode changes, because we started sending unicode bytestreams to test_shell on some systems by mistake. If the first byte left in the buffer is ever 00, then it hangs forever. That could happen if IO got interupted due to process switching, etc. 218825 6 eric 2010-04-28 22:13:48 -0700 I have a fix for the added frequency. Note, this is STILL a bug in test_shell/NRWT that they can deadlock like this. It's been this way forever. But it should occur less often now. 218826 7 54674 eric 2010-04-28 22:16:08 -0700 Created attachment 54674 Patch 218827 8 webkit.review.bot 2010-04-28 22:21:52 -0700 Attachment 54674 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style', '--no-squash']" exit_code: 1 WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py:77: expected 1 blank line, found 0 [pep8/E301] [5] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 218832 9 eric 2010-04-28 22:36:40 -0700 pep8.py doesn't like my inline function definition, but I wasn't sure what it really wanted either. 218833 10 54674 abarth 2010-04-28 22:37:17 -0700 Comment on attachment 54674 Patch Bow down before our stylebot overlords. 218834 11 eric 2010-04-28 22:38:42 -0700 Stylebot is wrong. PEP8 says nothing about inline methods: http://www.python.org/dev/peps/pep-0008/ See the "blank lines" section. pep8 is treating this like a "method in a class" which is wrong, this is a method in a method in a class, which is not covered in pep8. 218835 12 54674 abarth 2010-04-28 22:39:30 -0700 Comment on attachment 54674 Patch I'm suspicious, but ok. 218836 13 54674 eric 2010-04-28 22:39:50 -0700 Comment on attachment 54674 Patch Thank you for the review. If you have a suggested style fix, I'm happy to make one. But I think adding blank lines around the inline function is silly in this case, and certainly not covered by pep8. 218954 14 54674 commit-queue 2010-04-29 04:29:18 -0700 Comment on attachment 54674 Patch Clearing flags on attachment: 54674 Committed r58503: <http://trac.webkit.org/changeset/58503> 218955 15 commit-queue 2010-04-29 04:29:25 -0700 All reviewed patches have been landed. Closing bug. 218965 16 webkit.review.bot 2010-04-29 05:01:30 -0700 http://trac.webkit.org/changeset/58503 might have broken Qt Linux Release 54645 2010-04-28 17:47:00 -0700 2010-04-28 17:47:00 -0700 Sample from new-run-webkit-tests when hung waiting on two TestShells NRWT waiting on TS.txt text/plain 3675 eric IyBUaHJlYWQ6IC0xMzQwMDUxNDU2CkZpbGU6ICIvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9Q eXRob24uZnJhbWV3b3JrL1ZlcnNpb25zLzIuNS9saWIvcHl0aG9uMi41L3RocmVhZGluZy5weSIs IGxpbmUgNDYwLCBpbiBfX2Jvb3RzdHJhcAogIHNlbGYucnVuKCkKRmlsZTogIi9Vc2Vycy9lc2Vp ZGVsL1Byb2plY3RzL2Nocm9tZS9zcmMvdGhpcmRfcGFydHkvV2ViS2l0L1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3Ry ZWVfdGhyZWFkLnB5IiwgbGluZSAyNTgsIGluIHJ1bgogIHNlbGYuX3J1bih0ZXN0X3J1bm5lcj1O b25lLCByZXN1bHRfc3VtbWFyeT1Ob25lKQpGaWxlOiAiL1VzZXJzL2VzZWlkZWwvUHJvamVjdHMv Y2hyb21lL3NyYy90aGlyZF9wYXJ0eS9XZWJLaXQvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQucHki LCBsaW5lIDMzMCwgaW4gX3J1bgogIHJlc3VsdCA9IHNlbGYuX3J1bl90ZXN0KHRlc3RfaW5mbykK RmlsZTogIi9Vc2Vycy9lc2VpZGVsL1Byb2plY3RzL2Nocm9tZS9zcmMvdGhpcmRfcGFydHkvV2Vi S2l0L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNr YWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5IiwgbGluZSA0MzIsIGluIF9ydW5fdGVzdAog IHNlbGYuX2RyaXZlci5ydW5fdGVzdCh0ZXN0X2luZm8udXJpLCB0ZXN0X2luZm8udGltZW91dCwg aW1hZ2VfaGFzaCkKRmlsZTogIi9Vc2Vycy9lc2VpZGVsL1Byb2plY3RzL2Nocm9tZS9zcmMvdGhp cmRfcGFydHkvV2ViS2l0L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvY2hyb21pdW0ucHkiLCBsaW5lIDM4NCwgaW4gcnVuX3Rlc3QKICAobGluZSwgY3Jhc2gp ID0gc2VsZi5fd3JpdGVfY29tbWFuZF9hbmRfcmVhZF9saW5lKGlucHV0PU5vbmUpCkZpbGU6ICIv VXNlcnMvZXNlaWRlbC9Qcm9qZWN0cy9jaHJvbWUvc3JjL3RoaXJkX3BhcnR5L1dlYktpdC9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5Iiwg bGluZSAzMjIsIGluIF93cml0ZV9jb21tYW5kX2FuZF9yZWFkX2xpbmUKICBsaW5lID0gc2VsZi5f cHJvYy5zdGRvdXQucmVhZGxpbmUoKQoKIyBUaHJlYWQ6IC0xMzQxNjQ4ODk2CkZpbGU6ICIvU3lz dGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy9QeXRob24uZnJhbWV3b3JrL1ZlcnNpb25zLzIuNS9saWIv cHl0aG9uMi41L3RocmVhZGluZy5weSIsIGxpbmUgNDYwLCBpbiBfX2Jvb3RzdHJhcAogIHNlbGYu cnVuKCkKRmlsZTogIi9Vc2Vycy9lc2VpZGVsL1Byb2plY3RzL2Nocm9tZS9zcmMvdGhpcmRfcGFy dHkvV2ViS2l0L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91 dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5IiwgbGluZSAyNTgsIGluIHJ1bgog IHNlbGYuX3J1bih0ZXN0X3J1bm5lcj1Ob25lLCByZXN1bHRfc3VtbWFyeT1Ob25lKQpGaWxlOiAi L1VzZXJzL2VzZWlkZWwvUHJvamVjdHMvY2hyb21lL3NyYy90aGlyZF9wYXJ0eS9XZWJLaXQvV2Vi S2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvZHVt cF9yZW5kZXJfdHJlZV90aHJlYWQucHkiLCBsaW5lIDMzMCwgaW4gX3J1bgogIHJlc3VsdCA9IHNl bGYuX3J1bl90ZXN0KHRlc3RfaW5mbykKRmlsZTogIi9Vc2Vycy9lc2VpZGVsL1Byb2plY3RzL2No cm9tZS9zcmMvdGhpcmRfcGFydHkvV2ViS2l0L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2R1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLnB5Iiwg bGluZSA0MzIsIGluIF9ydW5fdGVzdAogIHNlbGYuX2RyaXZlci5ydW5fdGVzdCh0ZXN0X2luZm8u dXJpLCB0ZXN0X2luZm8udGltZW91dCwgaW1hZ2VfaGFzaCkKRmlsZTogIi9Vc2Vycy9lc2VpZGVs L1Byb2plY3RzL2Nocm9tZS9zcmMvdGhpcmRfcGFydHkvV2ViS2l0L1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkiLCBsaW5lIDM4NCwgaW4g cnVuX3Rlc3QKICAobGluZSwgY3Jhc2gpID0gc2VsZi5fd3JpdGVfY29tbWFuZF9hbmRfcmVhZF9s aW5lKGlucHV0PU5vbmUpCkZpbGU6ICIvVXNlcnMvZXNlaWRlbC9Qcm9qZWN0cy9jaHJvbWUvc3Jj L3RoaXJkX3BhcnR5L1dlYktpdC9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2Nocm9taXVtLnB5IiwgbGluZSAzMjIsIGluIF93cml0ZV9jb21tYW5kX2FuZF9y ZWFkX2xpbmUKICBsaW5lID0gc2VsZi5fcHJvYy5zdGRvdXQucmVhZGxpbmUoKQoKIyBUaHJlYWQ6 IC0xNjAxMzIxMTg0CkZpbGU6ICIvVXNlcnMvZXNlaWRlbC9Qcm9qZWN0cy9jaHJvbWUvc3JjL3Ro aXJkX3BhcnR5L1dlYktpdC9XZWJLaXRUb29scy9TY3JpcHRzL25ldy1ydW4td2Via2l0LXRlc3Rz IiwgbGluZSA1MiwgaW4gPG1vZHVsZT4KICBzeXMuZXhpdChydW5fd2Via2l0X3Rlc3RzLm1haW4o b3B0aW9ucywgYXJncykpCkZpbGU6ICIvVXNlcnMvZXNlaWRlbC9Qcm9qZWN0cy9jaHJvbWUvc3Jj L3RoaXJkX3BhcnR5L1dlYktpdC9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IiwgbGluZSAxNjY3LCBpbiBtYWluCiAgbnVtX3VuZXhw ZWN0ZWRfcmVzdWx0cyA9IHRlc3RfcnVubmVyLnJ1bihyZXN1bHRfc3VtbWFyeSwgcHJpbnRfcmVz dWx0cykKRmlsZTogIi9Vc2Vycy9lc2VpZGVsL1Byb2plY3RzL2Nocm9tZS9zcmMvdGhpcmRfcGFy dHkvV2ViS2l0L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93 ZWJraXRfdGVzdHMucHkiLCBsaW5lIDcxMiwgaW4gcnVuCiAgc2VsZi5fcnVuX3Rlc3RzKHNlbGYu X3Rlc3RfZmlsZXNfbGlzdCwgcmVzdWx0X3N1bW1hcnkpKQpGaWxlOiAiL1VzZXJzL2VzZWlkZWwv UHJvamVjdHMvY2hyb21lL3NyYy90aGlyZF9wYXJ0eS9XZWJLaXQvV2ViS2l0VG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSIsIGxpbmUgNjUzLCBp biBfcnVuX3Rlc3RzCiAgc2VsZi5fZHVtcF90aHJlYWRfc3RhdGVzX2lmX25lY2Vzc2FyeSgpCkZp bGU6ICIvVXNlcnMvZXNlaWRlbC9Qcm9qZWN0cy9jaHJvbWUvc3JjL3RoaXJkX3BhcnR5L1dlYktp dC9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rl c3RzLnB5IiwgbGluZSA2MDcsIGluIF9kdW1wX3RocmVhZF9zdGF0ZXNfaWZfbmVjZXNzYXJ5CiAg c2VsZi5fZHVtcF90aHJlYWRfc3RhdGVzKCkKRmlsZTogIi9Vc2Vycy9lc2VpZGVsL1Byb2plY3Rz L2Nocm9tZS9zcmMvdGhpcmRfcGFydHkvV2ViS2l0L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkiLCBsaW5lIDU5MiwgaW4gX2R1bXBf dGhyZWFkX3N0YXRlcwogIGZvciBmaWxlbmFtZSwgbGluZW5vLCBuYW1lLCBsaW5lIGluIHRyYWNl YmFjay5leHRyYWN0X3N0YWNrKHN0YWNrKToK 54646 2010-04-28 17:48:25 -0700 2010-04-28 17:48:25 -0700 sample from first TestShell TestShell_41018.CjSzhT.sample.txt text/plain 1534 eric QW5hbHlzaXMgb2Ygc2FtcGxpbmcgVGVzdFNoZWxsIChwaWQgNDEwMTgpIGV2ZXJ5IDEgbWlsbGlz ZWNvbmQKQ2FsbCBncmFwaDoKICAgIDc2NjEgVGhyZWFkXzI2MDcKICAgICAgNzY2MSAweDI3YjYK ICAgICAgICA3NjYxIDB4MzRlYwogICAgICAgICAgNzY2MSBmZ2V0cwogICAgICAgICAgICA3NjYx IF9fc3JlZmlsbAogICAgICAgICAgICAgIDc2NjEgcmVhZAogICAgICAgICAgICAgICAgNzY2MSBy ZWFkCiAgICA3NjYxIFRocmVhZF8yNzAzCiAgICAgIDc2NjEgdGhyZWFkX3N0YXJ0CiAgICAgICAg NzY2MSBfcHRocmVhZF9zdGFydAogICAgICAgICAgNzY2MSAweGUwY2IxCiAgICAgICAgICAgIDc2 NjEgMHhlYmFkNgogICAgICAgICAgICAgIDc2NjEgMHhkYjYwNAogICAgICAgICAgICAgICAgNzY2 MSAweGRiNTg5CiAgICAgICAgICAgICAgICAgIDc2NjEgMHhjMGRhMwogICAgICAgICAgICAgICAg ICAgIDc2NjEgMHhmM2VkMgogICAgICAgICAgICAgICAgICAgICAgNzY2MSBrZXZlbnQKICAgICAg ICAgICAgICAgICAgICAgICAgNzY2MSBrZXZlbnQKICAgIDc2NjEgVGhyZWFkXzI4MDMKICAgICAg NzY2MSB0aHJlYWRfc3RhcnQKICAgICAgICA3NjYxIF9wdGhyZWFkX3N0YXJ0CiAgICAgICAgICA3 NjYxIDB4ZTBjYjEKICAgICAgICAgICAgNzY2MSAweGViYWQ2CiAgICAgICAgICAgICAgNzY2MSAw eGRiNjA0CiAgICAgICAgICAgICAgICA3NjYxIDB4ZGI1ODkKICAgICAgICAgICAgICAgICAgNzY2 MSAweGRkZmVlCiAgICAgICAgICAgICAgICAgICAgNzY2MSAweGYxMTQ2CiAgICAgICAgICAgICAg ICAgICAgICA3NjYxIDB4ZjExMGUKICAgICAgICAgICAgICAgICAgICAgICAgNzY2MSAweGNiMGU3 CiAgICAgICAgICAgICAgICAgICAgICAgICAgNzY2MSBwdGhyZWFkX2NvbmRfd2FpdCRVTklYMjAw MwogICAgICAgICAgICAgICAgICAgICAgICAgICAgNzY2MSBfX3NlbXdhaXRfc2lnbmFsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDc2NjEgX19zZW13YWl0X3NpZ25hbAogICAgNzY2MSBU aHJlYWRfMjkwMwogICAgICA3NjYxIHN0YXJ0X3dxdGhyZWFkCiAgICAgICAgNzY2MSBfX3dvcmtx X29wcwogICAgICAgICAgNzY2MSBfX3dvcmtxX29wcwogICAgNzY2MSBUaHJlYWRfMmEwMwogICAg ICA3NjYxIDB4MAogICAgICAgIDc2NjEgMHgwCiAgICA3NjYxIFRocmVhZF8yYjAzCiAgICAgIDc2 NjEgMHgwCiAgICAgICAgNzY2MSAweDAKICAgIDc2NjEgVGhyZWFkXzJjMDMKICAgICAgNzY2MSAw eDAKICAgICAgICA3NjYxIDB4MAoKVG90YWwgbnVtYmVyIGluIHN0YWNrIChyZWN1cnNpdmUgY291 bnRlZCBtdWx0aXBsZSwgd2hlbiA+PTUpOgoKU29ydCBieSB0b3Agb2Ygc3RhY2ssIHNhbWUgY29s bGFwc2VkICh3aGVuID49IDUpOgogICAgICAgIDB4MCAgICAgICAgMjI5ODMKICAgICAgICBfX3Nl bXdhaXRfc2lnbmFsICAgICAgICA3NjYxCiAgICAgICAgX193b3JrcV9vcHMgICAgICAgIDc2NjEK ICAgICAgICBrZXZlbnQgICAgICAgIDc2NjEKICAgICAgICByZWFkICAgICAgICA3NjYxCg== 54647 2010-04-28 17:48:43 -0700 2010-04-28 17:48:43 -0700 sample from second TestShell TestShell_41376.8jJk1P.sample.txt text/plain 1581 eric QW5hbHlzaXMgb2Ygc2FtcGxpbmcgVGVzdFNoZWxsIChwaWQgNDEzNzYpIGV2ZXJ5IDEgbWlsbGlz ZWNvbmQKQ2FsbCBncmFwaDoKICAgIDc0MzIgVGhyZWFkXzI2MDcKICAgICAgNzQzMiAweDI3YjYK ICAgICAgICA3NDMyIDB4MzRlYwogICAgICAgICAgNzQzMiBmZ2V0cwogICAgICAgICAgICA3NDMy IF9fc3JlZmlsbAogICAgICAgICAgICAgIDc0MzIgcmVhZAogICAgICAgICAgICAgICAgNzQzMiBy ZWFkCiAgICA3NDMyIFRocmVhZF8yNzAzCiAgICAgIDc0MzIgdGhyZWFkX3N0YXJ0CiAgICAgICAg NzQzMiBfcHRocmVhZF9zdGFydAogICAgICAgICAgNzQzMiAweGUwY2IxCiAgICAgICAgICAgIDc0 MzIgMHhlYmFkNgogICAgICAgICAgICAgIDc0MzIgMHhkYjYwNAogICAgICAgICAgICAgICAgNzQz MiAweGRiNTg5CiAgICAgICAgICAgICAgICAgIDc0MzIgMHhjMGRhMwogICAgICAgICAgICAgICAg ICAgIDc0MzIgMHhmM2VkMgogICAgICAgICAgICAgICAgICAgICAgNzQzMiBrZXZlbnQKICAgICAg ICAgICAgICAgICAgICAgICAgNzQzMiBrZXZlbnQKICAgIDc0MzIgVGhyZWFkXzI4MDMKICAgICAg NzQzMiB0aHJlYWRfc3RhcnQKICAgICAgICA3NDMyIF9wdGhyZWFkX3N0YXJ0CiAgICAgICAgICA3 NDMyIDB4ZTBjYjEKICAgICAgICAgICAgNzQzMiAweGViYWQ2CiAgICAgICAgICAgICAgNzQzMiAw eGRiNjA0CiAgICAgICAgICAgICAgICA3NDMyIDB4ZGI1ODkKICAgICAgICAgICAgICAgICAgNzQz MiAweGRkZmVlCiAgICAgICAgICAgICAgICAgICAgNzQzMiAweGYxMTQ2CiAgICAgICAgICAgICAg ICAgICAgICA3NDMyIDB4ZjExMGUKICAgICAgICAgICAgICAgICAgICAgICAgNzQzMiAweGNiMGU3 CiAgICAgICAgICAgICAgICAgICAgICAgICAgNzQzMiBwdGhyZWFkX2NvbmRfd2FpdCRVTklYMjAw MwogICAgICAgICAgICAgICAgICAgICAgICAgICAgNzQzMiBfX3NlbXdhaXRfc2lnbmFsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDc0MzIgX19zZW13YWl0X3NpZ25hbAogICAgNzQzMiBU aHJlYWRfMjkwMwogICAgICA3NDMyIHN0YXJ0X3dxdGhyZWFkCiAgICAgICAgNzQzMiBfX3dvcmtx X29wcwogICAgICAgICAgNzQzMiBfX3dvcmtxX29wcwogICAgNzQzMiBUaHJlYWRfMmEwMwogICAg ICA3NDMyIHN0YXJ0X3dxdGhyZWFkCiAgICAgICAgNzQzMiBfX3dvcmtxX29wcwogICAgICAgICAg NzQzMiBfX3dvcmtxX29wcwogICAgNzQzMiBUaHJlYWRfMmIwMwogICAgICA3NDMyIDB4MAogICAg ICAgIDc0MzIgMHgwCiAgICA3NDMyIFRocmVhZF8yYzAzCiAgICAgIDc0MzIgMHgwCiAgICAgICAg NzQzMiAweDAKClRvdGFsIG51bWJlciBpbiBzdGFjayAocmVjdXJzaXZlIGNvdW50ZWQgbXVsdGlw bGUsIHdoZW4gPj01KToKClNvcnQgYnkgdG9wIG9mIHN0YWNrLCBzYW1lIGNvbGxhcHNlZCAod2hl biA+PSA1KToKICAgICAgICAweDAgICAgICAgIDE0ODY0CiAgICAgICAgX193b3JrcV9vcHMgICAg ICAgIDE0ODY0CiAgICAgICAgX19zZW13YWl0X3NpZ25hbCAgICAgICAgNzQzMgogICAgICAgIGtl dmVudCAgICAgICAgNzQzMgogICAgICAgIHJlYWQgICAgICAgIDc0MzIK 54674 2010-04-28 22:16:08 -0700 2010-04-29 04:29:18 -0700 Patch bug-38298-20100428221607.patch text/plain 4474 eric ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBlZDFlNDZmMWUxNGNkYzQ5NGJhNGVmZTc4Y2I2NDBjYzkwZTJiZGEyLi4xZDE0ZGIw ZWZkODUxZmYyMjAxYTNlNjFmZWMxOTE4NTQ1ZGFkNWFiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjMgQEAK IDIwMTAtMDQtMjggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG5ldy1ydW4td2Via2l0LXRlc3Rz IGNhbiBkZWFkbG9jayB3aXRoIENocm9taXVtJ3MgVGVzdFNoZWxsCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODI5OAorCisgICAgICAgIEZpeCBfd3Jp dGVfY29tbWFuZF9hbmRfcmVhZF9saW5lIHRvIG5ldmVyIHNlbmQgdW5pY29kZSgpIHRvCisgICAg ICAgIHRlc3Rfc2hlbGwsIGluc3RlYWQgdG8gYWx3YXlzIGVuY29kZSBhcyB1dGYtOC4gIFRoaXMg d2FzIGNhdXNpbmcKKyAgICAgICAgcmFuZG9tIGhhbmdzIGJlY2F1c2UgaWYgdGVzdF9zaGVsbCBl dmVyIGVuY291bnRlcnMgYSBcMCBpbiB0aGUKKyAgICAgICAgc3RyZWFtIGl0IGNhbiBkZWFkbG9j ayB3aXRoIE5SV1QuCisKKyAgICAgICAgVGhlcmUgaXMgc3RpbGwgYSBkZWFkbG9jayBidWcgdG8g Zml4IGluIE5SV1QvdGVzdF9zaGVsbCBkZXNpZ24sIGhvd2V2ZXIKKyAgICAgICAgdGhpcyBmaXgg c2hvdWxkIG1ha2UgdGhlIGRlYWRsb2NrIG9jY3VyIGxlc3Mgb2Z0ZW4uCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5OgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3QucHk6 CisKKzIwMTAtMDQtMjggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAgICAgICAg IFJldmlld2VkIGJ5IERhdmlkIExldmluLgogCiAgICAgICAgIERvY3VtZW50IHRoYXQgc3VicHJv Y2Vzcy5wb2xsL3dhaXQgYXJlIG5vdCB0aHJlYWRzYWZlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5IGIvV2ViS2l0 VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQppbmRl eCA4ODRkNGY5YzA0NjJhYmQ0MGI0YTZmYmRjZjljMmM5MWFkYjAxNDdiLi5iY2JkNDk4OTkxYmIw MGRlZTYyOTJmOWM4NTU0NjFhMmI4MGVhZjZhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKQEAgLTMx OSw2ICszMTksOSBAQCBjbGFzcyBDaHJvbWl1bURyaXZlcihiYXNlLkRyaXZlcik6CiAgICAgICAg ICIiIlJldHVybnMgYSB0dXBsZTogKGxpbmUsIGRpZF9jcmFzaCkiIiIKICAgICAgICAgdHJ5Ogog ICAgICAgICAgICAgaWYgaW5wdXQ6CisgICAgICAgICAgICAgICAgaWYgaXNpbnN0YW5jZShpbnB1 dCwgdW5pY29kZSk6CisgICAgICAgICAgICAgICAgICAgICMgVGVzdFNoZWxsIGV4cGVjdHMgdXRm LTgKKyAgICAgICAgICAgICAgICAgICAgaW5wdXQgPSBpbnB1dC5lbmNvZGUoInV0Zi04IikKICAg ICAgICAgICAgICAgICBzZWxmLl9wcm9jLnN0ZGluLndyaXRlKGlucHV0KQogICAgICAgICAgICAg IyBEdW1wUmVuZGVyVHJlZSB0ZXh0IG91dHB1dCBpcyBhbHdheXMgVVRGLTguICBIb3dldmVyIHNv bWUgdGVzdHMKICAgICAgICAgICAgICMgKGUuZy4gd2ViYXJjaGl2ZSkgbWF5IHNwaXQgb3V0IGJp bmFyeSBkYXRhIGluc3RlYWQgb2YgdGV4dCBzbyB3ZQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weSBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1f dW5pdHRlc3QucHkKaW5kZXggZTFjMzcxOWJhYTU0Y2Y5MDRmNjJkNWQzYmE5YzE2NjdjOTU3NGQz MC4uOTVkNjM3ODI2ZDliNWMzYmE3MzZlNjNlNjI0ZjIwZmUwY2IxMjI0YSAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91 bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5CkBAIC0yOCw2ICsyOCw3IEBACiAKIGltcG9ydCBj aHJvbWl1bQogaW1wb3J0IHVuaXR0ZXN0CitpbXBvcnQgU3RyaW5nSU8KIAogZnJvbSB3ZWJraXRw eS50aGlyZHBhcnR5Lm1vY2sgaW1wb3J0IE1vY2sKIApAQCAtNDQsMyArNDUsMzYgQEAgY2xhc3Mg Q2hyb21pdW1Ecml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF90ZXN0 X3NoZWxsX2NvbW1hbmQoc2VsZik6CiAgICAgICAgIGV4cGVjdGVkX2NvbW1hbmQgPSAidGVzdC5o dG1sIDIgY2hlY2tzdW1cbiIKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLmRyaXZlci5f dGVzdF9zaGVsbF9jb21tYW5kKCJ0ZXN0Lmh0bWwiLCAyLCAiY2hlY2tzdW0iKSwgZXhwZWN0ZWRf Y29tbWFuZCkKKworICAgIGRlZiBfYXNzZXJ0X3dyaXRlX2NvbW1hbmRfYW5kX3JlYWRfbGluZShz ZWxmLCBpbnB1dD1Ob25lLCBleHBlY3RlZF9saW5lPU5vbmUsIGV4cGVjdGVkX3N0ZGluPU5vbmUs IGV4cGVjdGVkX2NyYXNoPUZhbHNlKToKKyAgICAgICAgaWYgbm90IGV4cGVjdGVkX3N0ZGluOgor ICAgICAgICAgICAgaWYgaW5wdXQ6CisgICAgICAgICAgICAgICAgZXhwZWN0ZWRfc3RkaW4gPSBp bnB1dAorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAjIFdlIHJlc2V0IHN0ZGlu LCBzbyB3ZSBzaG91bGQgZXhwZWN0IHN0ZGluLmdldFZhbHVlID0gIiIKKyAgICAgICAgICAgICAg ICBleHBlY3RlZF9zdGRpbiA9ICIiCisgICAgICAgIHNlbGYuZHJpdmVyLl9wcm9jLnN0ZGluID0g U3RyaW5nSU8uU3RyaW5nSU8oKQorICAgICAgICBsaW5lLCBkaWRfY3Jhc2ggPSBzZWxmLmRyaXZl ci5fd3JpdGVfY29tbWFuZF9hbmRfcmVhZF9saW5lKGlucHV0KQorICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHNlbGYuZHJpdmVyLl9wcm9jLnN0ZGluLmdldHZhbHVlKCksIGV4cGVjdGVkX3N0ZGlu KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxpbmUsIGV4cGVjdGVkX2xpbmUpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoZGlkX2NyYXNoLCBleHBlY3RlZF9jcmFzaCkKKworICAgIGRlZiB0 ZXN0X3dyaXRlX2NvbW1hbmRfYW5kX3JlYWRfbGluZShzZWxmKToKKyAgICAgICAgc2VsZi5kcml2 ZXIuX3Byb2MgPSBNb2NrKCkKKyAgICAgICAgIyBTZXQgdXAgdG8gcmVhZCAzIGxpbmVzIGJlZm9y ZSB3ZSBnZXQgYW4gSU9FcnJvcgorICAgICAgICBzZWxmLmRyaXZlci5fcHJvYy5zdGRvdXQgPSBT dHJpbmdJTy5TdHJpbmdJTygiZmlyc3RcbnNlY29uZFxudGhpcmRcbiIpCisKKyAgICAgICAgdW5p Y29kZV9pbnB1dCA9IHUiSSBcdTI2NjEgVW5pY29kZSIKKyAgICAgICAgdXRmOF9pbnB1dCA9IHVu aWNvZGVfaW5wdXQuZW5jb2RlKCJ1dGYtOCIpCisgICAgICAgICMgVGVzdCB1bmljb2RlIGlucHV0 IGNvbnZlcnNpb24gdG8gdXRmLTgKKyAgICAgICAgc2VsZi5fYXNzZXJ0X3dyaXRlX2NvbW1hbmRf YW5kX3JlYWRfbGluZShpbnB1dD11bmljb2RlX2lucHV0LCBleHBlY3RlZF9zdGRpbj11dGY4X2lu cHV0LCBleHBlY3RlZF9saW5lPSJmaXJzdFxuIikKKyAgICAgICAgIyBUZXN0IHN0cigpIGlucHV0 LgorICAgICAgICBzZWxmLl9hc3NlcnRfd3JpdGVfY29tbWFuZF9hbmRfcmVhZF9saW5lKGlucHV0 PSJmb28iLCBleHBlY3RlZF9saW5lPSJzZWNvbmRcbiIpCisgICAgICAgICMgVGVzdCBpbnB1dD1O b25lCisgICAgICAgIHNlbGYuX2Fzc2VydF93cml0ZV9jb21tYW5kX2FuZF9yZWFkX2xpbmUoZXhw ZWN0ZWRfbGluZT0idGhpcmRcbiIpCisgICAgICAgICMgVGVzdCByZWFkaW5nIGZyb20gYSBjbG9z ZWQvZW1wdHkgc3RyZWFtLgorICAgICAgICAjIHJlYWRpbmcgZnJvbSBhIFN0cmluZ0lPIGRvZXMg bm90IHJhaXNlIElPRXJyb3IgbGlrZSBhIHJlYWwgZmlsZSB3b3VsZCwgc28gcmFpc2UgSU9FcnJv ciBtYW51YWxseS4KKyAgICAgICAgZGVmIG1vY2tfcmVhZGxpbmUoKToKKyAgICAgICAgICAgIHJh aXNlIElPRXJyb3IKKyAgICAgICAgc2VsZi5kcml2ZXIuX3Byb2Muc3Rkb3V0LnJlYWRsaW5lID0g bW9ja19yZWFkbGluZQorICAgICAgICBzZWxmLl9hc3NlcnRfd3JpdGVfY29tbWFuZF9hbmRfcmVh ZF9saW5lKGV4cGVjdGVkX2NyYXNoPVRydWUpCg==