29798 2009-09-28 00:42:11 -0700 Move message-port-multi.js from resources to script-tests 2009-09-30 05:02:11 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hamaji webkit-unassigned atwilson commit-queue eric oldest_to_newest 150465 0 hamaji 2009-09-28 00:42:11 -0700 While I was working for Bug 25880, some tests which weren't generated from TEMPLATE.html were added into resources directories. fast/js/resources/getOwnPropertyDescriptor.js fast/backgrounds/repeat/resources/margin-shorthand.js fast/events/resources/message-port-multi.js The fist two JS requires custom HTMLs so that we don't need to move them (they should have been added in exception lists of make-script-tests-wrappers). It seems we may want to move the last JS into script-tests directory. 150466 1 40220 hamaji 2009-09-28 00:44:53 -0700 Created attachment 40220 Patch v1 150589 2 40220 commit-queue 2009-09-28 11:51:20 -0700 Comment on attachment 40220 Patch v1 Clearing flags on attachment: 40220 Committed r48823: <http://trac.webkit.org/changeset/48823> 150590 3 commit-queue 2009-09-28 11:51:26 -0700 All reviewed patches have been landed. Closing bug. 150944 4 atwilson 2009-09-29 10:27:23 -0700 This test contains asynchronous tests, so including js-test-post.js is incorrect. Note that if you look at the test expections, it inserts "TEST COMPLETE" in the middle of the test output, which is not correct. 150946 5 hamaji 2009-09-29 10:31:34 -0700 (In reply to comment #4) > This test contains asynchronous tests, so including js-test-post.js is > incorrect. > > Note that if you look at the test expections, it inserts "TEST COMPLETE" in the > middle of the test output, which is not correct. I see. So, we can just revert my patch? 150947 6 eric 2009-09-29 10:33:16 -0700 Yes, it's a known issue that the js testing framework stuff doesn't handle async tests well. I thought I filed a bug about this a while back. Basically we'd like to eventually add an "imDone()" method of some sort that would print the TEST COMPLETED stuff for you. Many tests have already "hacked" this by removing js-test-post.js and done their own TEST COMPLETED writing. Eventually we should just make this function part of js-test-pre.js and have js-test-post call it when the test is a waitUntilDone() test. 150949 7 atwilson 2009-09-29 10:35:57 -0700 It sounds like you were trying to get this test to be generated from TEMPLATE.html, but it's probably not appropriate for this test since it doesn't follow the standard form. I don't actually understand what the motivation behind the test was - if it was just an attempt at cleanup, then yeah, I'd revert it. 150950 8 40309 hamaji 2009-09-29 10:38:47 -0700 Created attachment 40309 Revert patch v1 151041 9 eric 2009-09-29 14:07:01 -0700 I think we're trying to slowly improve the "standard form" over time. The original dream of all the .js tests was that we wouldn't check in the .html files at all. I'm not sure we'll ever reach that dream though. Definitely js-test-pre.js and js-test-post.js need losts of love to support more types of testing (like async tests, XHTML tests, SVG tests, etc.) 151163 10 40342 hamaji 2009-09-29 22:02:42 -0700 Created attachment 40342 Revert patch v2 151164 11 hamaji 2009-09-29 22:04:04 -0700 (In reply to comment #10) > Created an attachment (id=40342) [details] > Revert patch v2 I've updated the revert patch so it has a comment to mention we don't use js-test-post. Sorry for confusion by this bug. 151167 12 40342 commit-queue 2009-09-29 22:58:57 -0700 Comment on attachment 40342 Revert patch v2 Rejecting patch 40342 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 11355 test cases. fast/events/message-port-multi.html -> failed Exiting early after 1 failures. 6051 tests run. 110.37s total testing time 6050 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 2 test cases (<1%) had stderr output 151169 13 40346 hamaji 2009-09-29 23:23:28 -0700 Created attachment 40346 Revert patch v3 151170 14 hamaji 2009-09-29 23:24:54 -0700 (In reply to comment #13) > Created an attachment (id=40346) [details] > Revert patch v3 Sorry, I used patch -R and resources/*.js wasn't tracked by git. I created the patch again using git mv. 151222 15 40346 commit-queue 2009-09-30 05:02:07 -0700 Comment on attachment 40346 Revert patch v3 Clearing flags on attachment: 40346 Committed r48926: <http://trac.webkit.org/changeset/48926> 151223 16 commit-queue 2009-09-30 05:02:11 -0700 All reviewed patches have been landed. Closing bug. 40220 2009-09-28 00:44:53 -0700 2009-09-29 10:38:41 -0700 Patch v1 bug-29798-20090928164451.patch text/plain 8448 hamaji ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2MzU2ZWUwLi4yNWI2YWE0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDkt MjggIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG1lc3NhZ2UtcG9ydC1t dWx0aS5qcyBmcm9tIHJlc291cmNlcyB0byBzY3JpcHQtdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5Nzk4CisKKyAgICAgICAgKiBmYXN0L2V2 ZW50cy9tZXNzYWdlLXBvcnQtbXVsdGktZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGZhc3QvZXZl bnRzL21lc3NhZ2UtcG9ydC1tdWx0aS5odG1sOgorICAgICAgICAqIGZhc3QvZXZlbnRzL3Jlc291 cmNlcy9tZXNzYWdlLXBvcnQtbXVsdGkuanM6IFJlbW92ZWQuCisgICAgICAgICogZmFzdC9ldmVu dHMvc2NyaXB0LXRlc3RzL21lc3NhZ2UtcG9ydC1tdWx0aS5qczogQWRkZWQuCisgICAgICAgIChj aGFubmVsLnBvcnQyLm9ubWVzc2FnZSk6CisKIDIwMDktMDktMjcgIFNhbSBXZWluaWcgIDxzYW1A d2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL21lc3NhZ2UtcG9ydC1tdWx0aS1leHBlY3Rl ZC50eHQKaW5kZXggODMyOGQxMC4uMTUzOGMwZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L2V2ZW50cy9tZXNzYWdlLXBvcnQtbXVsdGktZXhwZWN0ZWQudHh0CkBAIC05LDYgKzks OSBAQCBQQVNTIGNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm51bGwgcG9ydCIsIFtjaGFubmVs My5wb3J0MSwgbnVsbCwgY2hhbm5lbDMucG9ydAogUEFTUyBjaGFubmVsLnBvcnQxLnBvc3RNZXNz YWdlKCJub3RBUG9ydCIsIFtjaGFubmVsMy5wb3J0MSwge30sIGNoYW5uZWwzLnBvcnQyXSkgdGhy ZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KIFBBU1MgY2hhbm5lbC5wb3J0MS5w b3N0TWVzc2FnZSgibm90QW5BcnJheSIsIGNoYW5uZWwzLnBvcnQxKSB0aHJldyBleGNlcHRpb24g VHlwZUVycm9yOiBUeXBlIGVycm9yLgogUEFTUyBjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJu b3RBU2VxdWVuY2UiLCBbe2xlbmd0aDogM31dKSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBU eXBlIGVycm9yLgorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBM RVRFCiBQQVNTIGV2ZW50LnBvcnRzIGlzIG51bGwgd2hlbiBubyBwb3J0IHNlbnQKIFBBU1MgZXZl bnQucG9ydHMgaXMgbnVsbCB3aGVuIGVtcHR5IGFycmF5IHNlbnQKIFBBU1MgZXZlbnQucG9ydHMg Y29udGFpbnMgdHdvIHBvcnRzIHdoZW4gdHdvIHBvcnRzIHNlbnQKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvZXZlbnRzL21lc3NhZ2UtcG9ydC1tdWx0aS5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLmh0bWwKaW5kZXggNzZmYjc0OC4uZTJiMDY0 YyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRp Lmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLmh0 bWwKQEAgLTEsMyArMSw1IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBI VE1MLy9FTiI+Cis8aHRtbD4KIDxoZWFkPgogPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIu Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgogPHNjcmlwdCBzcmM9Ii4uL2pzL3Jl c291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CkBAIC01LDUgKzcsNyBAQAogPGJvZHk+ CiA8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgotPHNj cmlwdCBzcmM9InJlc291cmNlcy9tZXNzYWdlLXBvcnQtbXVsdGkuanMiPjwvc2NyaXB0PgorPHNj cmlwdCBzcmM9InNjcmlwdC10ZXN0cy9tZXNzYWdlLXBvcnQtbXVsdGkuanMiPjwvc2NyaXB0Pgor PHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgog PC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcmVz b3VyY2VzL21lc3NhZ2UtcG9ydC1tdWx0aS5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Jl c291cmNlcy9tZXNzYWdlLXBvcnQtbXVsdGkuanMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IGY3ZTM0MzYuLjAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcmVzb3Vy Y2VzL21lc3NhZ2UtcG9ydC1tdWx0aS5qcworKysgL2Rldi9udWxsCkBAIC0xLDYyICswLDAgQEAK LWlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKLSAgICBsYXlvdXRUZXN0Q29udHJv bGxlci5kdW1wQXNUZXh0KCk7Ci0gICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9u ZSgpOwotfQotCi1kZXNjcmlwdGlvbigiVGhpcyB0ZXN0IGNoZWNrcyB0aGUgdmFyaW91cyB1c2Ug Y2FzZXMgYXJvdW5kIHNlbmRpbmcgbXVsdGlwbGUgcG9ydHMgdGhyb3VnaCBNZXNzYWdlUG9ydC5w b3N0TWVzc2FnZSIpOwotCi12YXIgY2hhbm5lbCA9IG5ldyBNZXNzYWdlQ2hhbm5lbCgpOwotdmFy IGNoYW5uZWwyID0gbmV3IE1lc3NhZ2VDaGFubmVsKCk7Ci12YXIgY2hhbm5lbDMgPSBuZXcgTWVz c2FnZUNoYW5uZWwoKTsKLQotY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm9wb3J0Iik7Ci1j aGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJ6ZXJvIHBvcnRzIiwgW10pOwotY2hhbm5lbC5wb3J0 MS5wb3N0TWVzc2FnZSgidHdvIHBvcnRzIiwgW2NoYW5uZWwyLnBvcnQxLCBjaGFubmVsMi5wb3J0 Ml0pOwotCi0vLyBOb3cgdGVzdCB2YXJpb3VzIGZhaWx1cmUgY2FzZXMKLXNob3VsZFRocm93KCdj aGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJzYW1lIHBvcnQiLCBbY2hhbm5lbC5wb3J0MV0pJyk7 Ci1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgiZW50YW5nbGVkIHBvcnQi LCBbY2hhbm5lbC5wb3J0Ml0pJyk7Ci1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVz c2FnZSgibnVsbCBwb3J0IiwgW2NoYW5uZWwzLnBvcnQxLCBudWxsLCBjaGFubmVsMy5wb3J0Ml0p Jyk7Ci1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QVBvcnQiLCBb Y2hhbm5lbDMucG9ydDEsIHt9LCBjaGFubmVsMy5wb3J0Ml0pJyk7Ci0vLyBTaG91bGQgYmUgT0sg dG8gc2VuZCBjaGFubmVsMy5wb3J0MSAoc2hvdWxkIG5vdCBoYXZlIGJlZW4gZGlzZW50YW5nbGVk IGJ5IHRoZSBwcmV2aW91cyBmYWlsZWQgY2FsbHMpLgotY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2Fn ZSgiZW50YW5nbGVkIHBvcnRzIiwgW2NoYW5uZWwzLnBvcnQxLCBjaGFubmVsMy5wb3J0Ml0pOwot Ci1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QW5BcnJheSIsIGNo YW5uZWwzLnBvcnQxKScpCi1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgi bm90QVNlcXVlbmNlIiwgW3tsZW5ndGg6IDN9XSknKTsKLQotY2hhbm5lbC5wb3J0MS5wb3N0TWVz c2FnZSgiZG9uZSIpOwotCi1jaGFubmVsLnBvcnQyLm9ubWVzc2FnZSA9IGZ1bmN0aW9uKGV2ZW50 KSB7Ci0gICAgaWYgKGV2ZW50LmRhdGEgPT0gIm5vcG9ydCIpIHsKLSAgICAgICAgaWYgKCFldmVu dC5wb3J0cykKLSAgICAgICAgICAgIHRlc3RQYXNzZWQoImV2ZW50LnBvcnRzIGlzIG51bGwgd2hl biBubyBwb3J0IHNlbnQiKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGVzdEZhaWxlZCgi ZXZlbnQucG9ydHMgc2hvdWxkIGJlIG51bGwgd2hlbiBubyBwb3J0IHNlbnQiKTsKLSAgICB9IGVs c2UgaWYgKGV2ZW50LmRhdGEgPT0gInplcm8gcG9ydHMiKSB7Ci0gICAgICAgIGlmICghZXZlbnQu cG9ydHMpCi0gICAgICAgICAgICB0ZXN0UGFzc2VkKCJldmVudC5wb3J0cyBpcyBudWxsIHdoZW4g ZW1wdHkgYXJyYXkgc2VudCIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0ZXN0RmFpbGVk KCJldmVudC5wb3J0cyBzaG91bGQgYmUgbnVsbCB3aGVuIGVtcHR5IGFycmF5IHNlbnQiKTsKLSAg ICB9IGVsc2UgaWYgKGV2ZW50LmRhdGEgPT0gInR3byBwb3J0cyIpIHsKLSAgICAgICAgaWYgKCFl dmVudC5wb3J0cykgewotICAgICAgICAgICAgdGVzdEZhaWxlZCgiZXZlbnQucG9ydHMgc2hvdWxk IGJlIG5vbi1udWxsIHdoZW4gcG9ydHMgc2VudCIpOwotICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICB9Ci0gICAgICAgIGlmIChldmVudC5wb3J0cy5sZW5ndGggPT0gMikKLSAgICAgICAgICAg IHRlc3RQYXNzZWQoImV2ZW50LnBvcnRzIGNvbnRhaW5zIHR3byBwb3J0cyB3aGVuIHR3byBwb3J0 cyBzZW50Iik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50LnBv cnRzIGNvbnRhaW5lZCAiICsgZXZlbnQucG9ydHMubGVuZ3RoICsgIiB3aGVuIHR3byBwb3J0cyBz ZW50Iik7Ci0KLSAgICB9IGVsc2UgaWYgKGV2ZW50LmRhdGEgPT0gImVudGFuZ2xlZCBwb3J0cyIp IHsKLSAgICAgICAgaWYgKGV2ZW50LnBvcnRzLmxlbmd0aCA9PSAyKQotICAgICAgICAgICAgdGVz dFBhc3NlZCgiZXZlbnQucG9ydHMgY29udGFpbnMgdHdvIHBvcnRzIHdoZW4gdHdvIHBvcnRzIHJl LXNlbnQgYWZ0ZXIgZXJyb3IiKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGVzdEZhaWxl ZCgiZXZlbnQucG9ydHMgY29udGFpbmVkICIgKyBldmVudC5wb3J0cy5sZW5ndGggKyAiIHdoZW4g dHdvIHBvcnRzIHJlLXNlbnQgYWZ0ZXIgZXJyb3IiKTsKLSAgICB9IGVsc2UgaWYgKGV2ZW50LmRh dGEgPT0gImRvbmUiKSB7Ci0gICAgICAgIGRlYnVnKCc8YnI+PHNwYW4gY2xhc3M9InBhc3MiPlRF U1QgQ09NUExFVEU8L3NwYW4+Jyk7Ci0gICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpCi0gICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7Ci0g ICAgfSBlbHNlCi0gICAgICAgIHRlc3RGYWlsZWQoIlJlY2VpdmVkIHVuZXhwZWN0ZWQgbWVzc2Fn ZTogIiArIGV2ZW50LmRhdGEpOwotfQotCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy9zY3JpcHQtdGVzdHMvbWVzc2FnZS1wb3J0LW11bHRpLmpzIGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvc2NyaXB0LXRlc3RzL21lc3NhZ2UtcG9ydC1tdWx0aS5qcwpuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwLi5mZmIzNTQzCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9ldmVudHMvc2NyaXB0LXRlc3RzL21lc3NhZ2UtcG9ydC1tdWx0aS5qcwpAQCAt MCwwICsxLDYzIEBACitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5 b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVy LndhaXRVbnRpbERvbmUoKTsKK30KKworZGVzY3JpcHRpb24oIlRoaXMgdGVzdCBjaGVja3MgdGhl IHZhcmlvdXMgdXNlIGNhc2VzIGFyb3VuZCBzZW5kaW5nIG11bHRpcGxlIHBvcnRzIHRocm91Z2gg TWVzc2FnZVBvcnQucG9zdE1lc3NhZ2UiKTsKKwordmFyIGNoYW5uZWwgPSBuZXcgTWVzc2FnZUNo YW5uZWwoKTsKK3ZhciBjaGFubmVsMiA9IG5ldyBNZXNzYWdlQ2hhbm5lbCgpOwordmFyIGNoYW5u ZWwzID0gbmV3IE1lc3NhZ2VDaGFubmVsKCk7CisKK2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2Uo Im5vcG9ydCIpOworY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgiemVybyBwb3J0cyIsIFtdKTsK K2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoInR3byBwb3J0cyIsIFtjaGFubmVsMi5wb3J0MSwg Y2hhbm5lbDIucG9ydDJdKTsKKworLy8gTm93IHRlc3QgdmFyaW91cyBmYWlsdXJlIGNhc2VzCitz aG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgic2FtZSBwb3J0IiwgW2NoYW5u ZWwucG9ydDFdKScpOworc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoImVu dGFuZ2xlZCBwb3J0IiwgW2NoYW5uZWwucG9ydDJdKScpOworc2hvdWxkVGhyb3coJ2NoYW5uZWwu cG9ydDEucG9zdE1lc3NhZ2UoIm51bGwgcG9ydCIsIFtjaGFubmVsMy5wb3J0MSwgbnVsbCwgY2hh bm5lbDMucG9ydDJdKScpOworc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2Uo Im5vdEFQb3J0IiwgW2NoYW5uZWwzLnBvcnQxLCB7fSwgY2hhbm5lbDMucG9ydDJdKScpOworLy8g U2hvdWxkIGJlIE9LIHRvIHNlbmQgY2hhbm5lbDMucG9ydDEgKHNob3VsZCBub3QgaGF2ZSBiZWVu IGRpc2VudGFuZ2xlZCBieSB0aGUgcHJldmlvdXMgZmFpbGVkIGNhbGxzKS4KK2NoYW5uZWwucG9y dDEucG9zdE1lc3NhZ2UoImVudGFuZ2xlZCBwb3J0cyIsIFtjaGFubmVsMy5wb3J0MSwgY2hhbm5l bDMucG9ydDJdKTsKKworc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5v dEFuQXJyYXkiLCBjaGFubmVsMy5wb3J0MSknKQorc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEu cG9zdE1lc3NhZ2UoIm5vdEFTZXF1ZW5jZSIsIFt7bGVuZ3RoOiAzfV0pJyk7CisKK2NoYW5uZWwu cG9ydDEucG9zdE1lc3NhZ2UoImRvbmUiKTsKKworY2hhbm5lbC5wb3J0Mi5vbm1lc3NhZ2UgPSBm dW5jdGlvbihldmVudCkgeworICAgIGlmIChldmVudC5kYXRhID09ICJub3BvcnQiKSB7CisgICAg ICAgIGlmICghZXZlbnQucG9ydHMpCisgICAgICAgICAgICB0ZXN0UGFzc2VkKCJldmVudC5wb3J0 cyBpcyBudWxsIHdoZW4gbm8gcG9ydCBzZW50Iik7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAg IHRlc3RGYWlsZWQoImV2ZW50LnBvcnRzIHNob3VsZCBiZSBudWxsIHdoZW4gbm8gcG9ydCBzZW50 Iik7CisgICAgfSBlbHNlIGlmIChldmVudC5kYXRhID09ICJ6ZXJvIHBvcnRzIikgeworICAgICAg ICBpZiAoIWV2ZW50LnBvcnRzKQorICAgICAgICAgICAgdGVzdFBhc3NlZCgiZXZlbnQucG9ydHMg aXMgbnVsbCB3aGVuIGVtcHR5IGFycmF5IHNlbnQiKTsKKyAgICAgICAgZWxzZQorICAgICAgICAg ICAgdGVzdEZhaWxlZCgiZXZlbnQucG9ydHMgc2hvdWxkIGJlIG51bGwgd2hlbiBlbXB0eSBhcnJh eSBzZW50Iik7CisgICAgfSBlbHNlIGlmIChldmVudC5kYXRhID09ICJ0d28gcG9ydHMiKSB7Cisg ICAgICAgIGlmICghZXZlbnQucG9ydHMpIHsKKyAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50 LnBvcnRzIHNob3VsZCBiZSBub24tbnVsbCB3aGVuIHBvcnRzIHNlbnQiKTsKKyAgICAgICAgICAg IHJldHVybjsKKyAgICAgICAgfQorICAgICAgICBpZiAoZXZlbnQucG9ydHMubGVuZ3RoID09IDIp CisgICAgICAgICAgICB0ZXN0UGFzc2VkKCJldmVudC5wb3J0cyBjb250YWlucyB0d28gcG9ydHMg d2hlbiB0d28gcG9ydHMgc2VudCIpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0ZXN0RmFp bGVkKCJldmVudC5wb3J0cyBjb250YWluZWQgIiArIGV2ZW50LnBvcnRzLmxlbmd0aCArICIgd2hl biB0d28gcG9ydHMgc2VudCIpOworCisgICAgfSBlbHNlIGlmIChldmVudC5kYXRhID09ICJlbnRh bmdsZWQgcG9ydHMiKSB7CisgICAgICAgIGlmIChldmVudC5wb3J0cy5sZW5ndGggPT0gMikKKyAg ICAgICAgICAgIHRlc3RQYXNzZWQoImV2ZW50LnBvcnRzIGNvbnRhaW5zIHR3byBwb3J0cyB3aGVu IHR3byBwb3J0cyByZS1zZW50IGFmdGVyIGVycm9yIik7CisgICAgICAgIGVsc2UKKyAgICAgICAg ICAgIHRlc3RGYWlsZWQoImV2ZW50LnBvcnRzIGNvbnRhaW5lZCAiICsgZXZlbnQucG9ydHMubGVu Z3RoICsgIiB3aGVuIHR3byBwb3J0cyByZS1zZW50IGFmdGVyIGVycm9yIik7CisgICAgfSBlbHNl IGlmIChldmVudC5kYXRhID09ICJkb25lIikgeworICAgICAgICBkZWJ1ZygnPGJyPjxzcGFuIGNs YXNzPSJwYXNzIj5URVNUIENPTVBMRVRFPC9zcGFuPicpOworICAgICAgICBpZiAod2luZG93Lmxh eW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90 aWZ5RG9uZSgpOworICAgIH0gZWxzZQorICAgICAgICB0ZXN0RmFpbGVkKCJSZWNlaXZlZCB1bmV4 cGVjdGVkIG1lc3NhZ2U6ICIgKyBldmVudC5kYXRhKTsKK30KKwordmFyIHN1Y2Nlc3NmdWxseVBh cnNlZCA9IHRydWU7 40309 2009-09-29 10:38:47 -0700 2009-09-29 22:02:37 -0700 Revert patch v1 bug-29798-20090930023845.patch text/plain 5397 hamaji ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYWI1ZmQ2Li5kYTc5NmVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDkt MjkgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG1lc3NhZ2UtcG9ydC1t dWx0aS5qcyBmcm9tIHJlc291cmNlcyB0byBzY3JpcHQtdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5Nzk4CisKKyAgICAgICAgUmV2ZXJ0IHI0 ODgyMy4gbWVzc2FnZS1wb3J0LW11bHRpLmpzIG5lZWRzIGN1c3RvbSBIVE1MLgorCisgICAgICAg ICogZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBmYXN0L2V2ZW50cy9tZXNzYWdlLXBvcnQtbXVsdGkuaHRtbDoKKyAgICAgICAgKiBmYXN0L2V2 ZW50cy9zY3JpcHQtdGVzdHMvbWVzc2FnZS1wb3J0LW11bHRpLmpzOiBSZW1vdmVkLgorCiAyMDA5 LTA5LTI4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEJyYWR5IEVpZHNvbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZl bnRzL21lc3NhZ2UtcG9ydC1tdWx0aS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2V2 ZW50cy9tZXNzYWdlLXBvcnQtbXVsdGktZXhwZWN0ZWQudHh0CmluZGV4IDE1MzhjMGYuLjgzMjhk MTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL21lc3NhZ2UtcG9ydC1tdWx0 aS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0 LW11bHRpLWV4cGVjdGVkLnR4dApAQCAtOSw5ICs5LDYgQEAgUEFTUyBjaGFubmVsLnBvcnQxLnBv c3RNZXNzYWdlKCJudWxsIHBvcnQiLCBbY2hhbm5lbDMucG9ydDEsIG51bGwsIGNoYW5uZWwzLnBv cnQKIFBBU1MgY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QVBvcnQiLCBbY2hhbm5lbDMu cG9ydDEsIHt9LCBjaGFubmVsMy5wb3J0Ml0pIHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5 cGUgZXJyb3IuCiBQQVNTIGNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vdEFuQXJyYXkiLCBj aGFubmVsMy5wb3J0MSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KIFBB U1MgY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QVNlcXVlbmNlIiwgW3tsZW5ndGg6IDN9 XSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KLVBBU1Mgc3VjY2Vzc2Z1 bGx5UGFyc2VkIGlzIHRydWUKLQotVEVTVCBDT01QTEVURQogUEFTUyBldmVudC5wb3J0cyBpcyBu dWxsIHdoZW4gbm8gcG9ydCBzZW50CiBQQVNTIGV2ZW50LnBvcnRzIGlzIG51bGwgd2hlbiBlbXB0 eSBhcnJheSBzZW50CiBQQVNTIGV2ZW50LnBvcnRzIGNvbnRhaW5zIHR3byBwb3J0cyB3aGVuIHR3 byBwb3J0cyBzZW50CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9tZXNzYWdl LXBvcnQtbXVsdGkuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL21lc3NhZ2UtcG9ydC1t dWx0aS5odG1sCmluZGV4IGUyYjA2NGMuLjc2ZmI3NDggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2Zhc3QvZXZlbnRzL21lc3NhZ2UtcG9ydC1tdWx0aS5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZXZlbnRzL21lc3NhZ2UtcG9ydC1tdWx0aS5odG1sCkBAIC0xLDUgKzEsMyBAQAotPCFET0NU WVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgotPGh0bWw+CiA8aGVhZD4K IDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5 bGUuY3NzIj4KIDxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwv c2NyaXB0PgpAQCAtNyw3ICs1LDUgQEAKIDxib2R5PgogPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+ CiA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KLTxzY3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvbWVz c2FnZS1wb3J0LW11bHRpLmpzIj48L3NjcmlwdD4KLTxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvbWVz c2FnZS1wb3J0LW11bHRpLmpzIj48L3NjcmlwdD4KIDwvYm9keT4KLTwvaHRtbD4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NjcmlwdC10ZXN0cy9tZXNzYWdlLXBvcnQtbXVs dGkuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zY3JpcHQtdGVzdHMvbWVzc2FnZS1wb3J0 LW11bHRpLmpzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBmZmIzNTQzLi4wMDAwMDAw Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NjcmlwdC10ZXN0cy9tZXNzYWdlLXBvcnQt bXVsdGkuanMKKysrIC9kZXYvbnVsbApAQCAtMSw2MyArMCwwIEBACi1pZiAod2luZG93LmxheW91 dFRlc3RDb250cm9sbGVyKSB7Ci0gICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgp OwotICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKLX0KLQotZGVzY3Jp cHRpb24oIlRoaXMgdGVzdCBjaGVja3MgdGhlIHZhcmlvdXMgdXNlIGNhc2VzIGFyb3VuZCBzZW5k aW5nIG11bHRpcGxlIHBvcnRzIHRocm91Z2ggTWVzc2FnZVBvcnQucG9zdE1lc3NhZ2UiKTsKLQot dmFyIGNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsKLXZhciBjaGFubmVsMiA9IG5ldyBN ZXNzYWdlQ2hhbm5lbCgpOwotdmFyIGNoYW5uZWwzID0gbmV3IE1lc3NhZ2VDaGFubmVsKCk7Ci0K LWNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vcG9ydCIpOwotY2hhbm5lbC5wb3J0MS5wb3N0 TWVzc2FnZSgiemVybyBwb3J0cyIsIFtdKTsKLWNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoInR3 byBwb3J0cyIsIFtjaGFubmVsMi5wb3J0MSwgY2hhbm5lbDIucG9ydDJdKTsKLQotLy8gTm93IHRl c3QgdmFyaW91cyBmYWlsdXJlIGNhc2VzCi1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0 TWVzc2FnZSgic2FtZSBwb3J0IiwgW2NoYW5uZWwucG9ydDFdKScpOwotc2hvdWxkVGhyb3coJ2No YW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoImVudGFuZ2xlZCBwb3J0IiwgW2NoYW5uZWwucG9ydDJd KScpOwotc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm51bGwgcG9ydCIs IFtjaGFubmVsMy5wb3J0MSwgbnVsbCwgY2hhbm5lbDMucG9ydDJdKScpOwotc2hvdWxkVGhyb3co J2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vdEFQb3J0IiwgW2NoYW5uZWwzLnBvcnQxLCB7 fSwgY2hhbm5lbDMucG9ydDJdKScpOwotLy8gU2hvdWxkIGJlIE9LIHRvIHNlbmQgY2hhbm5lbDMu cG9ydDEgKHNob3VsZCBub3QgaGF2ZSBiZWVuIGRpc2VudGFuZ2xlZCBieSB0aGUgcHJldmlvdXMg ZmFpbGVkIGNhbGxzKS4KLWNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoImVudGFuZ2xlZCBwb3J0 cyIsIFtjaGFubmVsMy5wb3J0MSwgY2hhbm5lbDMucG9ydDJdKTsKLQotc2hvdWxkVGhyb3coJ2No YW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vdEFuQXJyYXkiLCBjaGFubmVsMy5wb3J0MSknKQot c2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vdEFTZXF1ZW5jZSIsIFt7 bGVuZ3RoOiAzfV0pJyk7Ci0KLWNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoImRvbmUiKTsKLQot Y2hhbm5lbC5wb3J0Mi5vbm1lc3NhZ2UgPSBmdW5jdGlvbihldmVudCkgewotICAgIGlmIChldmVu dC5kYXRhID09ICJub3BvcnQiKSB7Ci0gICAgICAgIGlmICghZXZlbnQucG9ydHMpCi0gICAgICAg ICAgICB0ZXN0UGFzc2VkKCJldmVudC5wb3J0cyBpcyBudWxsIHdoZW4gbm8gcG9ydCBzZW50Iik7 Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50LnBvcnRzIHNob3Vs ZCBiZSBudWxsIHdoZW4gbm8gcG9ydCBzZW50Iik7Ci0gICAgfSBlbHNlIGlmIChldmVudC5kYXRh ID09ICJ6ZXJvIHBvcnRzIikgewotICAgICAgICBpZiAoIWV2ZW50LnBvcnRzKQotICAgICAgICAg ICAgdGVzdFBhc3NlZCgiZXZlbnQucG9ydHMgaXMgbnVsbCB3aGVuIGVtcHR5IGFycmF5IHNlbnQi KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGVzdEZhaWxlZCgiZXZlbnQucG9ydHMgc2hv dWxkIGJlIG51bGwgd2hlbiBlbXB0eSBhcnJheSBzZW50Iik7Ci0gICAgfSBlbHNlIGlmIChldmVu dC5kYXRhID09ICJ0d28gcG9ydHMiKSB7Ci0gICAgICAgIGlmICghZXZlbnQucG9ydHMpIHsKLSAg ICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50LnBvcnRzIHNob3VsZCBiZSBub24tbnVsbCB3aGVu IHBvcnRzIHNlbnQiKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAgICBp ZiAoZXZlbnQucG9ydHMubGVuZ3RoID09IDIpCi0gICAgICAgICAgICB0ZXN0UGFzc2VkKCJldmVu dC5wb3J0cyBjb250YWlucyB0d28gcG9ydHMgd2hlbiB0d28gcG9ydHMgc2VudCIpOwotICAgICAg ICBlbHNlCi0gICAgICAgICAgICB0ZXN0RmFpbGVkKCJldmVudC5wb3J0cyBjb250YWluZWQgIiAr IGV2ZW50LnBvcnRzLmxlbmd0aCArICIgd2hlbiB0d28gcG9ydHMgc2VudCIpOwotCi0gICAgfSBl bHNlIGlmIChldmVudC5kYXRhID09ICJlbnRhbmdsZWQgcG9ydHMiKSB7Ci0gICAgICAgIGlmIChl dmVudC5wb3J0cy5sZW5ndGggPT0gMikKLSAgICAgICAgICAgIHRlc3RQYXNzZWQoImV2ZW50LnBv cnRzIGNvbnRhaW5zIHR3byBwb3J0cyB3aGVuIHR3byBwb3J0cyByZS1zZW50IGFmdGVyIGVycm9y Iik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50LnBvcnRzIGNv bnRhaW5lZCAiICsgZXZlbnQucG9ydHMubGVuZ3RoICsgIiB3aGVuIHR3byBwb3J0cyByZS1zZW50 IGFmdGVyIGVycm9yIik7Ci0gICAgfSBlbHNlIGlmIChldmVudC5kYXRhID09ICJkb25lIikgewot ICAgICAgICBkZWJ1ZygnPGJyPjxzcGFuIGNsYXNzPSJwYXNzIj5URVNUIENPTVBMRVRFPC9zcGFu PicpOwotICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQotICAgICAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOwotICAgIH0gZWxzZQotICAgICAg ICB0ZXN0RmFpbGVkKCJSZWNlaXZlZCB1bmV4cGVjdGVkIG1lc3NhZ2U6ICIgKyBldmVudC5kYXRh KTsKLX0KLQotdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7 40342 2009-09-29 22:02:42 -0700 2009-09-29 23:23:22 -0700 Revert patch v2 bug-29798-20090930140240.patch text/plain 5477 hamaji ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0NmY0MDRjLi5jYzNlMWZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDktMDkt MjkgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG1lc3NhZ2UtcG9ydC1t dWx0aS5qcyBmcm9tIHJlc291cmNlcyB0byBzY3JpcHQtdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5Nzk4CisKKyAgICAgICAgUmV2ZXJ0IHI0 ODgyMy4gbWVzc2FnZS1wb3J0LW11bHRpLmpzIG5lZWRzIGN1c3RvbSBIVE1MLgorCisgICAgICAg ICogZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBmYXN0L2V2ZW50cy9tZXNzYWdlLXBvcnQtbXVsdGkuaHRtbDoKKyAgICAgICAgKiBmYXN0L2V2 ZW50cy9zY3JpcHQtdGVzdHMvbWVzc2FnZS1wb3J0LW11bHRpLmpzOiBSZW1vdmVkLgorCiAyMDA5 LTA5LTI5ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBKb2huIFN1bGxpdmFuLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVu dHMvbWVzc2FnZS1wb3J0LW11bHRpLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZXZl bnRzL21lc3NhZ2UtcG9ydC1tdWx0aS1leHBlY3RlZC50eHQKaW5kZXggMTUzOGMwZi4uODMyOGQx MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRp LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9tZXNzYWdlLXBvcnQt bXVsdGktZXhwZWN0ZWQudHh0CkBAIC05LDkgKzksNiBAQCBQQVNTIGNoYW5uZWwucG9ydDEucG9z dE1lc3NhZ2UoIm51bGwgcG9ydCIsIFtjaGFubmVsMy5wb3J0MSwgbnVsbCwgY2hhbm5lbDMucG9y dAogUEFTUyBjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJub3RBUG9ydCIsIFtjaGFubmVsMy5w b3J0MSwge30sIGNoYW5uZWwzLnBvcnQyXSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlw ZSBlcnJvci4KIFBBU1MgY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QW5BcnJheSIsIGNo YW5uZWwzLnBvcnQxKSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgogUEFT UyBjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJub3RBU2VxdWVuY2UiLCBbe2xlbmd0aDogM31d KSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgotUEFTUyBzdWNjZXNzZnVs bHlQYXJzZWQgaXMgdHJ1ZQotCi1URVNUIENPTVBMRVRFCiBQQVNTIGV2ZW50LnBvcnRzIGlzIG51 bGwgd2hlbiBubyBwb3J0IHNlbnQKIFBBU1MgZXZlbnQucG9ydHMgaXMgbnVsbCB3aGVuIGVtcHR5 IGFycmF5IHNlbnQKIFBBU1MgZXZlbnQucG9ydHMgY29udGFpbnMgdHdvIHBvcnRzIHdoZW4gdHdv IHBvcnRzIHNlbnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL21lc3NhZ2Ut cG9ydC1tdWx0aS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11 bHRpLmh0bWwKaW5kZXggZTJiMDY0Yy4uNmFhMGZiNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv ZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLmh0bWwKQEAgLTEsNSArMSwzIEBACi08IURPQ1RZ UEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Ci08aHRtbD4KIDxoZWFkPgog PGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHls ZS5jc3MiPgogPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9z Y3JpcHQ+CkBAIC03LDcgKzUsNiBAQAogPGJvZHk+CiA8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4K IDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgotPHNjcmlwdCBzcmM9InNjcmlwdC10ZXN0cy9tZXNz YWdlLXBvcnQtbXVsdGkuanMiPjwvc2NyaXB0PgotPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNl cy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9tZXNz YWdlLXBvcnQtbXVsdGkuanMiPjwvc2NyaXB0PgorPCEtLSBXZSBkb24ndCB1c2UgdGhlIHN0YW5k YXJkIGpzLXRlc3QtcG9zdCBhcyB0aGlzIGlzIGFuIGFzeW5jaHJvbm91cyB0ZXN0IC0tPgogPC9i b2R5PgotPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvc2NyaXB0 LXRlc3RzL21lc3NhZ2UtcG9ydC1tdWx0aS5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Nj cmlwdC10ZXN0cy9tZXNzYWdlLXBvcnQtbXVsdGkuanMKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IGZmYjM1NDMuLjAwMDAwMDAKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvc2Ny aXB0LXRlc3RzL21lc3NhZ2UtcG9ydC1tdWx0aS5qcworKysgL2Rldi9udWxsCkBAIC0xLDYzICsw LDAgQEAKLWlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKLSAgICBsYXlvdXRUZXN0 Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7Ci0gICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVu dGlsRG9uZSgpOwotfQotCi1kZXNjcmlwdGlvbigiVGhpcyB0ZXN0IGNoZWNrcyB0aGUgdmFyaW91 cyB1c2UgY2FzZXMgYXJvdW5kIHNlbmRpbmcgbXVsdGlwbGUgcG9ydHMgdGhyb3VnaCBNZXNzYWdl UG9ydC5wb3N0TWVzc2FnZSIpOwotCi12YXIgY2hhbm5lbCA9IG5ldyBNZXNzYWdlQ2hhbm5lbCgp OwotdmFyIGNoYW5uZWwyID0gbmV3IE1lc3NhZ2VDaGFubmVsKCk7Ci12YXIgY2hhbm5lbDMgPSBu ZXcgTWVzc2FnZUNoYW5uZWwoKTsKLQotY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm9wb3J0 Iik7Ci1jaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJ6ZXJvIHBvcnRzIiwgW10pOwotY2hhbm5l bC5wb3J0MS5wb3N0TWVzc2FnZSgidHdvIHBvcnRzIiwgW2NoYW5uZWwyLnBvcnQxLCBjaGFubmVs Mi5wb3J0Ml0pOwotCi0vLyBOb3cgdGVzdCB2YXJpb3VzIGZhaWx1cmUgY2FzZXMKLXNob3VsZFRo cm93KCdjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJzYW1lIHBvcnQiLCBbY2hhbm5lbC5wb3J0 MV0pJyk7Ci1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgiZW50YW5nbGVk IHBvcnQiLCBbY2hhbm5lbC5wb3J0Ml0pJyk7Ci1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5w b3N0TWVzc2FnZSgibnVsbCBwb3J0IiwgW2NoYW5uZWwzLnBvcnQxLCBudWxsLCBjaGFubmVsMy5w b3J0Ml0pJyk7Ci1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QVBv cnQiLCBbY2hhbm5lbDMucG9ydDEsIHt9LCBjaGFubmVsMy5wb3J0Ml0pJyk7Ci0vLyBTaG91bGQg YmUgT0sgdG8gc2VuZCBjaGFubmVsMy5wb3J0MSAoc2hvdWxkIG5vdCBoYXZlIGJlZW4gZGlzZW50 YW5nbGVkIGJ5IHRoZSBwcmV2aW91cyBmYWlsZWQgY2FsbHMpLgotY2hhbm5lbC5wb3J0MS5wb3N0 TWVzc2FnZSgiZW50YW5nbGVkIHBvcnRzIiwgW2NoYW5uZWwzLnBvcnQxLCBjaGFubmVsMy5wb3J0 Ml0pOwotCi1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QW5BcnJh eSIsIGNoYW5uZWwzLnBvcnQxKScpCi1zaG91bGRUaHJvdygnY2hhbm5lbC5wb3J0MS5wb3N0TWVz c2FnZSgibm90QVNlcXVlbmNlIiwgW3tsZW5ndGg6IDN9XSknKTsKLQotY2hhbm5lbC5wb3J0MS5w b3N0TWVzc2FnZSgiZG9uZSIpOwotCi1jaGFubmVsLnBvcnQyLm9ubWVzc2FnZSA9IGZ1bmN0aW9u KGV2ZW50KSB7Ci0gICAgaWYgKGV2ZW50LmRhdGEgPT0gIm5vcG9ydCIpIHsKLSAgICAgICAgaWYg KCFldmVudC5wb3J0cykKLSAgICAgICAgICAgIHRlc3RQYXNzZWQoImV2ZW50LnBvcnRzIGlzIG51 bGwgd2hlbiBubyBwb3J0IHNlbnQiKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGVzdEZh aWxlZCgiZXZlbnQucG9ydHMgc2hvdWxkIGJlIG51bGwgd2hlbiBubyBwb3J0IHNlbnQiKTsKLSAg ICB9IGVsc2UgaWYgKGV2ZW50LmRhdGEgPT0gInplcm8gcG9ydHMiKSB7Ci0gICAgICAgIGlmICgh ZXZlbnQucG9ydHMpCi0gICAgICAgICAgICB0ZXN0UGFzc2VkKCJldmVudC5wb3J0cyBpcyBudWxs IHdoZW4gZW1wdHkgYXJyYXkgc2VudCIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0ZXN0 RmFpbGVkKCJldmVudC5wb3J0cyBzaG91bGQgYmUgbnVsbCB3aGVuIGVtcHR5IGFycmF5IHNlbnQi KTsKLSAgICB9IGVsc2UgaWYgKGV2ZW50LmRhdGEgPT0gInR3byBwb3J0cyIpIHsKLSAgICAgICAg aWYgKCFldmVudC5wb3J0cykgewotICAgICAgICAgICAgdGVzdEZhaWxlZCgiZXZlbnQucG9ydHMg c2hvdWxkIGJlIG5vbi1udWxsIHdoZW4gcG9ydHMgc2VudCIpOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9Ci0gICAgICAgIGlmIChldmVudC5wb3J0cy5sZW5ndGggPT0gMikKLSAgICAg ICAgICAgIHRlc3RQYXNzZWQoImV2ZW50LnBvcnRzIGNvbnRhaW5zIHR3byBwb3J0cyB3aGVuIHR3 byBwb3J0cyBzZW50Iik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2 ZW50LnBvcnRzIGNvbnRhaW5lZCAiICsgZXZlbnQucG9ydHMubGVuZ3RoICsgIiB3aGVuIHR3byBw b3J0cyBzZW50Iik7Ci0KLSAgICB9IGVsc2UgaWYgKGV2ZW50LmRhdGEgPT0gImVudGFuZ2xlZCBw b3J0cyIpIHsKLSAgICAgICAgaWYgKGV2ZW50LnBvcnRzLmxlbmd0aCA9PSAyKQotICAgICAgICAg ICAgdGVzdFBhc3NlZCgiZXZlbnQucG9ydHMgY29udGFpbnMgdHdvIHBvcnRzIHdoZW4gdHdvIHBv cnRzIHJlLXNlbnQgYWZ0ZXIgZXJyb3IiKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGVz dEZhaWxlZCgiZXZlbnQucG9ydHMgY29udGFpbmVkICIgKyBldmVudC5wb3J0cy5sZW5ndGggKyAi IHdoZW4gdHdvIHBvcnRzIHJlLXNlbnQgYWZ0ZXIgZXJyb3IiKTsKLSAgICB9IGVsc2UgaWYgKGV2 ZW50LmRhdGEgPT0gImRvbmUiKSB7Ci0gICAgICAgIGRlYnVnKCc8YnI+PHNwYW4gY2xhc3M9InBh c3MiPlRFU1QgQ09NUExFVEU8L3NwYW4+Jyk7Ci0gICAgICAgIGlmICh3aW5kb3cubGF5b3V0VGVz dENvbnRyb2xsZXIpCi0gICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25l KCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHRlc3RGYWlsZWQoIlJlY2VpdmVkIHVuZXhwZWN0ZWQg bWVzc2FnZTogIiArIGV2ZW50LmRhdGEpOwotfQotCi12YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0g dHJ1ZTs= 40346 2009-09-29 23:23:28 -0700 2009-09-30 05:02:07 -0700 Revert patch v3 bug-29798-20090930152326.patch text/plain 8601 hamaji ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0NmY0MDRjLi44MjFlNWI4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDkt MjkgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG1lc3NhZ2UtcG9ydC1t dWx0aS5qcyBmcm9tIHJlc291cmNlcyB0byBzY3JpcHQtdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5Nzk4CisKKyAgICAgICAgUmV2ZXJ0IHI0 ODgyMy4gbWVzc2FnZS1wb3J0LW11bHRpLmpzIG5lZWRzIGN1c3RvbSBIVE1MLgorCisgICAgICAg ICogZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLWV4cGVjdGVkLnR4dDoKKyAgICAgICAg KiBmYXN0L2V2ZW50cy9tZXNzYWdlLXBvcnQtbXVsdGkuaHRtbDoKKyAgICAgICAgKiBmYXN0L2V2 ZW50cy9yZXNvdXJjZXMvbWVzc2FnZS1wb3J0LW11bHRpLmpzOiBBZGRlZC4KKyAgICAgICAgKGNo YW5uZWwucG9ydDIub25tZXNzYWdlKToKKyAgICAgICAgKiBmYXN0L2V2ZW50cy9zY3JpcHQtdGVz dHMvbWVzc2FnZS1wb3J0LW11bHRpLmpzOiBSZW1vdmVkLgorCiAyMDA5LTA5LTI5ICBCcmFkeSBF aWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKb2huIFN1 bGxpdmFuLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0 LW11bHRpLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL21lc3NhZ2UtcG9y dC1tdWx0aS1leHBlY3RlZC50eHQKaW5kZXggMTUzOGMwZi4uODMyOGQxMCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLWV4cGVjdGVkLnR4dAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9tZXNzYWdlLXBvcnQtbXVsdGktZXhwZWN0ZWQu dHh0CkBAIC05LDkgKzksNiBAQCBQQVNTIGNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm51bGwg cG9ydCIsIFtjaGFubmVsMy5wb3J0MSwgbnVsbCwgY2hhbm5lbDMucG9ydAogUEFTUyBjaGFubmVs LnBvcnQxLnBvc3RNZXNzYWdlKCJub3RBUG9ydCIsIFtjaGFubmVsMy5wb3J0MSwge30sIGNoYW5u ZWwzLnBvcnQyXSkgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KIFBBU1Mg Y2hhbm5lbC5wb3J0MS5wb3N0TWVzc2FnZSgibm90QW5BcnJheSIsIGNoYW5uZWwzLnBvcnQxKSB0 aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgogUEFTUyBjaGFubmVsLnBvcnQx LnBvc3RNZXNzYWdlKCJub3RBU2VxdWVuY2UiLCBbe2xlbmd0aDogM31dKSB0aHJldyBleGNlcHRp b24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgotUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1 ZQotCi1URVNUIENPTVBMRVRFCiBQQVNTIGV2ZW50LnBvcnRzIGlzIG51bGwgd2hlbiBubyBwb3J0 IHNlbnQKIFBBU1MgZXZlbnQucG9ydHMgaXMgbnVsbCB3aGVuIGVtcHR5IGFycmF5IHNlbnQKIFBB U1MgZXZlbnQucG9ydHMgY29udGFpbnMgdHdvIHBvcnRzIHdoZW4gdHdvIHBvcnRzIHNlbnQKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL21lc3NhZ2UtcG9ydC1tdWx0aS5odG1s IGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2FnZS1wb3J0LW11bHRpLmh0bWwKaW5kZXgg ZTJiMDY0Yy4uNmFhMGZiNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVz c2FnZS1wb3J0LW11bHRpLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvbWVzc2Fn ZS1wb3J0LW11bHRpLmh0bWwKQEAgLTEsNSArMSwzIEBACi08IURPQ1RZUEUgSFRNTCBQVUJMSUMg Ii0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Ci08aHRtbD4KIDxoZWFkPgogPGxpbmsgcmVsPSJzdHls ZXNoZWV0IiBocmVmPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgogPHNjcmlw dCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CkBAIC03LDcg KzUsNiBAQAogPGJvZHk+CiA8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KIDxkaXYgaWQ9ImNvbnNv bGUiPjwvZGl2PgotPHNjcmlwdCBzcmM9InNjcmlwdC10ZXN0cy9tZXNzYWdlLXBvcnQtbXVsdGku anMiPjwvc2NyaXB0PgotPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3Qu anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9tZXNzYWdlLXBvcnQtbXVsdGku anMiPjwvc2NyaXB0PgorPCEtLSBXZSBkb24ndCB1c2UgdGhlIHN0YW5kYXJkIGpzLXRlc3QtcG9z dCBhcyB0aGlzIGlzIGFuIGFzeW5jaHJvbm91cyB0ZXN0IC0tPgogPC9ib2R5PgotPC9odG1sPgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9ldmVudHMvcmVzb3VyY2VzL21lc3NhZ2UtcG9y dC1tdWx0aS5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Jlc291cmNlcy9tZXNzYWdlLXBv cnQtbXVsdGkuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZjdlMzQzNgot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3Jlc291cmNlcy9tZXNz YWdlLXBvcnQtbXVsdGkuanMKQEAgLTAsMCArMSw2MiBAQAoraWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikgeworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAg ICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cit9CisKK2Rlc2NyaXB0aW9u KCJUaGlzIHRlc3QgY2hlY2tzIHRoZSB2YXJpb3VzIHVzZSBjYXNlcyBhcm91bmQgc2VuZGluZyBt dWx0aXBsZSBwb3J0cyB0aHJvdWdoIE1lc3NhZ2VQb3J0LnBvc3RNZXNzYWdlIik7CisKK3ZhciBj aGFubmVsID0gbmV3IE1lc3NhZ2VDaGFubmVsKCk7Cit2YXIgY2hhbm5lbDIgPSBuZXcgTWVzc2Fn ZUNoYW5uZWwoKTsKK3ZhciBjaGFubmVsMyA9IG5ldyBNZXNzYWdlQ2hhbm5lbCgpOworCitjaGFu bmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJub3BvcnQiKTsKK2NoYW5uZWwucG9ydDEucG9zdE1lc3Nh Z2UoInplcm8gcG9ydHMiLCBbXSk7CitjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJ0d28gcG9y dHMiLCBbY2hhbm5lbDIucG9ydDEsIGNoYW5uZWwyLnBvcnQyXSk7CisKKy8vIE5vdyB0ZXN0IHZh cmlvdXMgZmFpbHVyZSBjYXNlcworc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3Nh Z2UoInNhbWUgcG9ydCIsIFtjaGFubmVsLnBvcnQxXSknKTsKK3Nob3VsZFRocm93KCdjaGFubmVs LnBvcnQxLnBvc3RNZXNzYWdlKCJlbnRhbmdsZWQgcG9ydCIsIFtjaGFubmVsLnBvcnQyXSknKTsK K3Nob3VsZFRocm93KCdjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJudWxsIHBvcnQiLCBbY2hh bm5lbDMucG9ydDEsIG51bGwsIGNoYW5uZWwzLnBvcnQyXSknKTsKK3Nob3VsZFRocm93KCdjaGFu bmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJub3RBUG9ydCIsIFtjaGFubmVsMy5wb3J0MSwge30sIGNo YW5uZWwzLnBvcnQyXSknKTsKKy8vIFNob3VsZCBiZSBPSyB0byBzZW5kIGNoYW5uZWwzLnBvcnQx IChzaG91bGQgbm90IGhhdmUgYmVlbiBkaXNlbnRhbmdsZWQgYnkgdGhlIHByZXZpb3VzIGZhaWxl ZCBjYWxscykuCitjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJlbnRhbmdsZWQgcG9ydHMiLCBb Y2hhbm5lbDMucG9ydDEsIGNoYW5uZWwzLnBvcnQyXSk7CisKK3Nob3VsZFRocm93KCdjaGFubmVs LnBvcnQxLnBvc3RNZXNzYWdlKCJub3RBbkFycmF5IiwgY2hhbm5lbDMucG9ydDEpJykKK3Nob3Vs ZFRocm93KCdjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJub3RBU2VxdWVuY2UiLCBbe2xlbmd0 aDogM31dKScpOworCitjaGFubmVsLnBvcnQxLnBvc3RNZXNzYWdlKCJkb25lIik7CisKK2NoYW5u ZWwucG9ydDIub25tZXNzYWdlID0gZnVuY3Rpb24oZXZlbnQpIHsKKyAgICBpZiAoZXZlbnQuZGF0 YSA9PSAibm9wb3J0IikgeworICAgICAgICBpZiAoIWV2ZW50LnBvcnRzKQorICAgICAgICAgICAg dGVzdFBhc3NlZCgiZXZlbnQucG9ydHMgaXMgbnVsbCB3aGVuIG5vIHBvcnQgc2VudCIpOworICAg ICAgICBlbHNlCisgICAgICAgICAgICB0ZXN0RmFpbGVkKCJldmVudC5wb3J0cyBzaG91bGQgYmUg bnVsbCB3aGVuIG5vIHBvcnQgc2VudCIpOworICAgIH0gZWxzZSBpZiAoZXZlbnQuZGF0YSA9PSAi emVybyBwb3J0cyIpIHsKKyAgICAgICAgaWYgKCFldmVudC5wb3J0cykKKyAgICAgICAgICAgIHRl c3RQYXNzZWQoImV2ZW50LnBvcnRzIGlzIG51bGwgd2hlbiBlbXB0eSBhcnJheSBzZW50Iik7Cisg ICAgICAgIGVsc2UKKyAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50LnBvcnRzIHNob3VsZCBi ZSBudWxsIHdoZW4gZW1wdHkgYXJyYXkgc2VudCIpOworICAgIH0gZWxzZSBpZiAoZXZlbnQuZGF0 YSA9PSAidHdvIHBvcnRzIikgeworICAgICAgICBpZiAoIWV2ZW50LnBvcnRzKSB7CisgICAgICAg ICAgICB0ZXN0RmFpbGVkKCJldmVudC5wb3J0cyBzaG91bGQgYmUgbm9uLW51bGwgd2hlbiBwb3J0 cyBzZW50Iik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAgICAgICAgaWYgKGV2 ZW50LnBvcnRzLmxlbmd0aCA9PSAyKQorICAgICAgICAgICAgdGVzdFBhc3NlZCgiZXZlbnQucG9y dHMgY29udGFpbnMgdHdvIHBvcnRzIHdoZW4gdHdvIHBvcnRzIHNlbnQiKTsKKyAgICAgICAgZWxz ZQorICAgICAgICAgICAgdGVzdEZhaWxlZCgiZXZlbnQucG9ydHMgY29udGFpbmVkICIgKyBldmVu dC5wb3J0cy5sZW5ndGggKyAiIHdoZW4gdHdvIHBvcnRzIHNlbnQiKTsKKworICAgIH0gZWxzZSBp ZiAoZXZlbnQuZGF0YSA9PSAiZW50YW5nbGVkIHBvcnRzIikgeworICAgICAgICBpZiAoZXZlbnQu cG9ydHMubGVuZ3RoID09IDIpCisgICAgICAgICAgICB0ZXN0UGFzc2VkKCJldmVudC5wb3J0cyBj b250YWlucyB0d28gcG9ydHMgd2hlbiB0d28gcG9ydHMgcmUtc2VudCBhZnRlciBlcnJvciIpOwor ICAgICAgICBlbHNlCisgICAgICAgICAgICB0ZXN0RmFpbGVkKCJldmVudC5wb3J0cyBjb250YWlu ZWQgIiArIGV2ZW50LnBvcnRzLmxlbmd0aCArICIgd2hlbiB0d28gcG9ydHMgcmUtc2VudCBhZnRl ciBlcnJvciIpOworICAgIH0gZWxzZSBpZiAoZXZlbnQuZGF0YSA9PSAiZG9uZSIpIHsKKyAgICAg ICAgZGVidWcoJzxicj48c3BhbiBjbGFzcz0icGFzcyI+VEVTVCBDT01QTEVURTwvc3Bhbj4nKTsK KyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAgIGxh eW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICB9IGVsc2UKKyAgICAgICAgdGVz dEZhaWxlZCgiUmVjZWl2ZWQgdW5leHBlY3RlZCBtZXNzYWdlOiAiICsgZXZlbnQuZGF0YSk7Cit9 CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NjcmlwdC10ZXN0cy9tZXNz YWdlLXBvcnQtbXVsdGkuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2V2ZW50cy9zY3JpcHQtdGVzdHMv bWVzc2FnZS1wb3J0LW11bHRpLmpzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCBmZmIz NTQzLi4wMDAwMDAwCi0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZXZlbnRzL3NjcmlwdC10ZXN0cy9t ZXNzYWdlLXBvcnQtbXVsdGkuanMKKysrIC9kZXYvbnVsbApAQCAtMSw2MyArMCwwIEBACi1pZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7Ci0gICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu ZHVtcEFzVGV4dCgpOwotICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsK LX0KLQotZGVzY3JpcHRpb24oIlRoaXMgdGVzdCBjaGVja3MgdGhlIHZhcmlvdXMgdXNlIGNhc2Vz IGFyb3VuZCBzZW5kaW5nIG11bHRpcGxlIHBvcnRzIHRocm91Z2ggTWVzc2FnZVBvcnQucG9zdE1l c3NhZ2UiKTsKLQotdmFyIGNoYW5uZWwgPSBuZXcgTWVzc2FnZUNoYW5uZWwoKTsKLXZhciBjaGFu bmVsMiA9IG5ldyBNZXNzYWdlQ2hhbm5lbCgpOwotdmFyIGNoYW5uZWwzID0gbmV3IE1lc3NhZ2VD aGFubmVsKCk7Ci0KLWNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vcG9ydCIpOwotY2hhbm5l bC5wb3J0MS5wb3N0TWVzc2FnZSgiemVybyBwb3J0cyIsIFtdKTsKLWNoYW5uZWwucG9ydDEucG9z dE1lc3NhZ2UoInR3byBwb3J0cyIsIFtjaGFubmVsMi5wb3J0MSwgY2hhbm5lbDIucG9ydDJdKTsK LQotLy8gTm93IHRlc3QgdmFyaW91cyBmYWlsdXJlIGNhc2VzCi1zaG91bGRUaHJvdygnY2hhbm5l bC5wb3J0MS5wb3N0TWVzc2FnZSgic2FtZSBwb3J0IiwgW2NoYW5uZWwucG9ydDFdKScpOwotc2hv dWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoImVudGFuZ2xlZCBwb3J0IiwgW2No YW5uZWwucG9ydDJdKScpOwotc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2Uo Im51bGwgcG9ydCIsIFtjaGFubmVsMy5wb3J0MSwgbnVsbCwgY2hhbm5lbDMucG9ydDJdKScpOwot c2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vdEFQb3J0IiwgW2NoYW5u ZWwzLnBvcnQxLCB7fSwgY2hhbm5lbDMucG9ydDJdKScpOwotLy8gU2hvdWxkIGJlIE9LIHRvIHNl bmQgY2hhbm5lbDMucG9ydDEgKHNob3VsZCBub3QgaGF2ZSBiZWVuIGRpc2VudGFuZ2xlZCBieSB0 aGUgcHJldmlvdXMgZmFpbGVkIGNhbGxzKS4KLWNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoImVu dGFuZ2xlZCBwb3J0cyIsIFtjaGFubmVsMy5wb3J0MSwgY2hhbm5lbDMucG9ydDJdKTsKLQotc2hv dWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vdEFuQXJyYXkiLCBjaGFubmVs My5wb3J0MSknKQotc2hvdWxkVGhyb3coJ2NoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2UoIm5vdEFT ZXF1ZW5jZSIsIFt7bGVuZ3RoOiAzfV0pJyk7Ci0KLWNoYW5uZWwucG9ydDEucG9zdE1lc3NhZ2Uo ImRvbmUiKTsKLQotY2hhbm5lbC5wb3J0Mi5vbm1lc3NhZ2UgPSBmdW5jdGlvbihldmVudCkgewot ICAgIGlmIChldmVudC5kYXRhID09ICJub3BvcnQiKSB7Ci0gICAgICAgIGlmICghZXZlbnQucG9y dHMpCi0gICAgICAgICAgICB0ZXN0UGFzc2VkKCJldmVudC5wb3J0cyBpcyBudWxsIHdoZW4gbm8g cG9ydCBzZW50Iik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50 LnBvcnRzIHNob3VsZCBiZSBudWxsIHdoZW4gbm8gcG9ydCBzZW50Iik7Ci0gICAgfSBlbHNlIGlm IChldmVudC5kYXRhID09ICJ6ZXJvIHBvcnRzIikgewotICAgICAgICBpZiAoIWV2ZW50LnBvcnRz KQotICAgICAgICAgICAgdGVzdFBhc3NlZCgiZXZlbnQucG9ydHMgaXMgbnVsbCB3aGVuIGVtcHR5 IGFycmF5IHNlbnQiKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgdGVzdEZhaWxlZCgiZXZl bnQucG9ydHMgc2hvdWxkIGJlIG51bGwgd2hlbiBlbXB0eSBhcnJheSBzZW50Iik7Ci0gICAgfSBl bHNlIGlmIChldmVudC5kYXRhID09ICJ0d28gcG9ydHMiKSB7Ci0gICAgICAgIGlmICghZXZlbnQu cG9ydHMpIHsKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2ZW50LnBvcnRzIHNob3VsZCBiZSBu b24tbnVsbCB3aGVuIHBvcnRzIHNlbnQiKTsKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAg fQotICAgICAgICBpZiAoZXZlbnQucG9ydHMubGVuZ3RoID09IDIpCi0gICAgICAgICAgICB0ZXN0 UGFzc2VkKCJldmVudC5wb3J0cyBjb250YWlucyB0d28gcG9ydHMgd2hlbiB0d28gcG9ydHMgc2Vu dCIpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICB0ZXN0RmFpbGVkKCJldmVudC5wb3J0cyBj b250YWluZWQgIiArIGV2ZW50LnBvcnRzLmxlbmd0aCArICIgd2hlbiB0d28gcG9ydHMgc2VudCIp OwotCi0gICAgfSBlbHNlIGlmIChldmVudC5kYXRhID09ICJlbnRhbmdsZWQgcG9ydHMiKSB7Ci0g ICAgICAgIGlmIChldmVudC5wb3J0cy5sZW5ndGggPT0gMikKLSAgICAgICAgICAgIHRlc3RQYXNz ZWQoImV2ZW50LnBvcnRzIGNvbnRhaW5zIHR3byBwb3J0cyB3aGVuIHR3byBwb3J0cyByZS1zZW50 IGFmdGVyIGVycm9yIik7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHRlc3RGYWlsZWQoImV2 ZW50LnBvcnRzIGNvbnRhaW5lZCAiICsgZXZlbnQucG9ydHMubGVuZ3RoICsgIiB3aGVuIHR3byBw b3J0cyByZS1zZW50IGFmdGVyIGVycm9yIik7Ci0gICAgfSBlbHNlIGlmIChldmVudC5kYXRhID09 ICJkb25lIikgewotICAgICAgICBkZWJ1ZygnPGJyPjxzcGFuIGNsYXNzPSJwYXNzIj5URVNUIENP TVBMRVRFPC9zcGFuPicpOwotICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVy KQotICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOwotICAgIH0g ZWxzZQotICAgICAgICB0ZXN0RmFpbGVkKCJSZWNlaXZlZCB1bmV4cGVjdGVkIG1lc3NhZ2U6ICIg KyBldmVudC5kYXRhKTsKLX0KLQotdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7