119085 2013-07-25 06:36:29 -0700 [EFL][WK2] Simplify context_menu_spelling_items_availability unit test 2013-07-29 00:16:10 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 g.czajkowski g.czajkowski cdumez commit-queue gyuyoung.kim gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 911596 0 g.czajkowski 2013-07-25 06:36:29 -0700 Use findContextMenuItem method to check whether the item appears in context menu. 911598 1 207454 g.czajkowski 2013-07-25 06:40:07 -0700 Created attachment 207454 proposed patch 911815 2 207454 gyuyoung.kim 2013-07-25 17:20:38 -0700 Comment on attachment 207454 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=207454&action=review LGTM. > Source/WebKit2/ChangeLog:13 > + Do not report failure here. It doesn't allow to test the negative test cases. Shouldn't you need to check if existing uses of findContextMenuItem() are also failed ? 911816 3 gyuyoung.kim 2013-07-25 17:22:29 -0700 (In reply to comment #2) > (From update of attachment 207454 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=207454&action=review > > LGTM. LGTM except for my question. 911889 4 207454 g.czajkowski 2013-07-26 00:11:47 -0700 Comment on attachment 207454 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=207454&action=review >> Source/WebKit2/ChangeLog:13 >> + Do not report failure here. It doesn't allow to test the negative test cases. > > Shouldn't you need to check if existing uses of findContextMenuItem() are also failed ? Present findContextMenuItem is being used to test the positive test cases only. Therefore it doesn't reach the 'error block' (ADD_FAILURE; return 0;) IMHO we should check result of findContextMenuItem in the test/callback instead of reporting failure inside. It prevents us to use the method to test negative test cases. Actually, the unit tests use findContextMenuItem to find an appropriate context menu item and to select it. The result of selected item is verified inside the tests. Assuming the positive test case, if findContextMenuItem fails the test will fail as well - the item won't be selected and the expected result will be different as well. The reason of introducing ADD_FAILURE() in findContextMenuItem was to report failure earlier. 911915 5 gyuyoung.kim 2013-07-26 02:15:06 -0700 (In reply to comment #4) > Actually, the unit tests use findContextMenuItem to find an appropriate context menu item and to select it. The result of selected item is verified inside the tests. Assuming the positive test case, if findContextMenuItem fails the test will fail as well - the item won't be selected and the expected result will be different as well. > > The reason of introducing ADD_FAILURE() in findContextMenuItem was to report failure earlier. I see. As we talk on irc, my question was that we need to check the result of findContextMenuItem() in other functions as well. 911918 6 207519 g.czajkowski 2013-07-26 02:35:28 -0700 Created attachment 207519 verify return value of each findContextMenuItem call 911921 7 207519 gyuyoung.kim 2013-07-26 03:01:32 -0700 Comment on attachment 207519 verify return value of each findContextMenuItem call View in context: https://bugs.webkit.org/attachment.cgi?id=207519&action=review > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:295 > + EXPECT_TRUE(spellingAndGrammarSubmenu); Isn't checkSpellingWhileTypingItem instead of spellingAndGrammarSubmenu ? 911923 8 207519 g.czajkowski 2013-07-26 03:11:37 -0700 Comment on attachment 207519 verify return value of each findContextMenuItem call View in context: https://bugs.webkit.org/attachment.cgi?id=207519&action=review >> Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:295 >> + EXPECT_TRUE(spellingAndGrammarSubmenu); > > Isn't checkSpellingWhileTypingItem instead of spellingAndGrammarSubmenu ? Ooops. You're right. I'll fix it. 911924 9 207520 g.czajkowski 2013-07-26 03:21:43 -0700 Created attachment 207520 apply Gyuyoung's review 912010 10 207520 gyuyoung.kim 2013-07-26 10:34:02 -0700 Comment on attachment 207520 apply Gyuyoung's review View in context: https://bugs.webkit.org/attachment.cgi?id=207520&action=review > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:-559 > - ecore_main_loop_iterate(); When I ask EFL community this function, I could get this reply.... "DO NOT use this function unless you are the person God comes to ask for advice when He has trouble managing the Universe" Hey, greg, ryuan and chris, let's think about this function. As we know, we are not GOD. ;) 912011 11 gyuyoung.kim 2013-07-26 10:39:22 -0700 (In reply to comment #10) > (From update of attachment 207520 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=207520&action=review > > > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:-559 > > - ecore_main_loop_iterate(); > > When I ask EFL community this function, I could get this reply.... > "DO NOT use this function unless you are the person God comes to ask for advice when He has trouble managing the Universe" "DO NOT use this function unless you are the person God comes to ask for advice when He has trouble managing the Universe" Frankly speaking, I got this comment from EFL docs, not efl irc or mailing list...........Plz let me know if this comment is incorrect. 912012 12 cdumez 2013-07-26 10:44:20 -0700 (In reply to comment #11) > (In reply to comment #10) > > (From update of attachment 207520 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=207520&action=review > > > > > Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:-559 > > > - ecore_main_loop_iterate(); > > > > When I ask EFL community this function, I could get this reply.... > > "DO NOT use this function unless you are the person God comes to ask for advice when He has trouble managing the Universe" > > "DO NOT use this function unless you are the person God comes to ask for advice when He has trouble managing the Universe" > > Frankly speaking, I got this comment from EFL docs, not efl irc or mailing list...........Plz let me know if this comment is incorrect. We are using this function in the API tests, I don't think this is a big deal. Anyway, this part of the patch does not really get rid of ecore_main_loop_iterate(), it merely hides it. 912038 13 207520 g.czajkowski 2013-07-26 12:13:07 -0700 Comment on attachment 207520 apply Gyuyoung's review View in context: https://bugs.webkit.org/attachment.cgi?id=207520&action=review >>>> Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_text_checker.cpp:-559 >>>> - ecore_main_loop_iterate(); >>> >>> When I ask EFL community this function, I could get this reply.... >>> "DO NOT use this function unless you are the person God comes to ask for advice when He has trouble managing the Universe" >>> >>> Hey, greg, ryuan and chris, let's think about this function. As we know, we are not GOD. ;) >> >> "DO NOT use this function unless you are the person God comes to ask for advice when He has trouble managing the Universe" >> >> Frankly speaking, I got this comment from EFL docs, not efl irc or mailing list...........Plz let me know if this comment is incorrect. > > We are using this function in the API tests, I don't think this is a big deal. > Anyway, this part of the patch does not really get rid of ecore_main_loop_iterate(), it merely hides it. Yeah, using ecore_main_loop_iterate() in unit tests shouldn't affect the Universe ;) As Chris said, we are using it in many aspects and replacing it with waitUntilTrue() is rather to match consistency with other tests which already use it. 912348 14 gyuyoung.kim 2013-07-28 13:49:26 -0700 (In reply to comment #13) > > We are using this function in the API tests, I don't think this is a big deal. > > Anyway, this part of the patch does not really get rid of ecore_main_loop_iterate(), it merely hides it. > > Yeah, using ecore_main_loop_iterate() in unit tests shouldn't affect the Universe ;) > As Chris said, we are using it in many aspects and replacing it with waitUntilTrue() is rather to match consistency with other tests which already use it. Ok, let's replace it with waitUntilTrue() from now on. 912394 15 g.czajkowski 2013-07-29 00:16:10 -0700 Committed r153419: <http://trac.webkit.org/changeset/153419> 207454 2013-07-25 06:40:07 -0700 2013-07-26 02:35:28 -0700 proposed patch simplify_unit_test.patch text/plain 4373 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5NjlmZTZiLi5lMWI4NjNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTMtMDctMjQgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBTaW1wbGlmeSBjb250ZXh0X21lbnVfc3BlbGxp bmdfaXRlbXNfYXZhaWxhYmlsaXR5IHVuaXQgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGZpbmRDb250ZXh0TWVudUl0ZW0gbWV0aG9kIHRv IGNoZWNrIHdoZXRoZXIgdGhlIGl0ZW0KKyAgICAgICAgYXBwZWFycyBpbiBjb250ZXh0IG1lbnUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVj a2VyLmNwcDoKKyAgICAgICAgKEVXSzJUZXh0Q2hlY2tlclRlc3Q6OmZpbmRDb250ZXh0TWVudUl0 ZW0pOgorICAgICAgICBEbyBub3QgcmVwb3J0IGZhaWx1cmUgaGVyZS4gSXQgZG9lc24ndCBhbGxv dyB0byB0ZXN0IHRoZSBuZWdhdGl2ZSB0ZXN0IGNhc2VzLgorCisgICAgICAgIChFV0syVGV4dENo ZWNrZXJUZXN0OjpjaGVja0NvcnJlY3RuZXNzT2ZTcGVsbGluZ0l0ZW1zKToKKyAgICAgICAgVXNl IGZpbmRDb250ZXh0TWVudUl0ZW0gbWV0aG9kLgorCisgICAgICAgIChURVNUX0YpOgorICAgICAg ICBSZXNldCB3YXNDb250ZXh0TWVudVNob3duLCBpdCdzIG5lZWRlZCBhZnRlciByMTUyMTUzLgor ICAgICAgICBVc2Ugd2FpdFVudGlsVHJ1ZSBtZXRob2QuCisKIDIwMTMtMDUtMDUgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSb2xsZWQgYmFjayBpbiByMTQ5 NTI3IHdpdGggY3Jhc2ggZml4ZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVja2VyLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl90ZXh0X2NoZWNrZXIuY3BwCmlu ZGV4IDZkY2I4NzAuLjA1Y2VjN2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl90ZXh0X2NoZWNrZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl90ZXh0X2NoZWNrZXIuY3Bw CkBAIC00Niw5ICs0Niw2IEBAIHN0YXRpYyBFY29yZV9UaW1lciogdGltZW91dFRpbWVyID0gMDsK IHN0YXRpYyBkb3VibGUgZGVmYXVsdFRpbWVvdXRJblNlY29uZHMgPSAwLjU7CiAKIHN0YXRpYyBi b29sIHdhc0NvbnRleHRNZW51U2hvd24gPSBmYWxzZTsKLXN0YXRpYyBjb25zdCBjaGFyIG5vR3Vl c3Nlc1N0cmluZ1tdID0gIk5vIEd1ZXNzZXMgRm91bmQiOwotc3RhdGljIGNvbnN0IGNoYXIgaWdu b3JlU3BlbGxpbmdTdHJpbmdbXSA9ICJJZ25vcmUgU3BlbGxpbmciOwotc3RhdGljIGNvbnN0IGNo YXIgbGVhcm5TcGVsbGluZ1N0cmluZ1tdID0gIkxlYXJuIFNwZWxsaW5nIjsKIAogc3RhdGljIGNv bnN0IGNoYXIqIGNsaWVudFN1Z2dlc3Rpb25zRm9yV29yZFtdID0geyAiY2xpZW50U3VnZ2VzdGlv bjEiLCAiY2xpZW50U3VnZ2VzdGlvbjIiLCAiY2xpZW50U3VnZ2VzdGlvbjMiIH07CiBzdGF0aWMg dW5zaWduZWQgY29udGV4dE1lbnVJdGVtc051bWJlciA9IDA7CkBAIC0yNzAsMzMgKzI2NywxOSBA QCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGl0ZW07CiAgICAgICAgIH0KIAotICAg ICAgICBBRERfRkFJTFVSRSgpOwogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKICAgICBzdGF0 aWMgRWluYV9Cb29sIGNoZWNrQ29ycmVjdG5lc3NPZlNwZWxsaW5nSXRlbXMoRXdrX1ZpZXdfU21h cnRfRGF0YSosIEV2YXNfQ29vcmQsIEV2YXNfQ29vcmQsIEV3a19Db250ZXh0X01lbnUqIGNvbnRl eHRNZW51KQogICAgIHsKLSAgICAgICAgY29uc3QgRWluYV9MaXN0KiBjb250ZXh0TWVudUl0ZW1z ID0gZXdrX2NvbnRleHRfbWVudV9pdGVtc19nZXQoY29udGV4dE1lbnUpOwotCi0gICAgICAgIGJv b2wgbm9HdWVzc2VzQXZhaWxhYmxlID0gZmFsc2U7Ci0gICAgICAgIGJvb2wgaXNJZ25vcmVTcGVs bGluZ0F2YWlsYWJsZSA9IGZhbHNlOwotICAgICAgICBib29sIGlzTGVhcm5TcGVsbGluZ0F2YWls YWJsZSA9IGZhbHNlOworICAgICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIG5vR3Vlc3Nlc0l0 ZW0gPSBmaW5kQ29udGV4dE1lbnVJdGVtKGNvbnRleHRNZW51LCBFV0tfQ09OVEVYVF9NRU5VX0lU RU1fVEFHX05PX0dVRVNTRVNfRk9VTkQsIEVXS19BQ1RJT05fVFlQRSk7CisgICAgICAgIEVYUEVD VF9GQUxTRShub0d1ZXNzZXNJdGVtKTsKIAotICAgICAgICBjb25zdCBFaW5hX0xpc3QqIGxpc3RJ dGVyYXRvcjsKLSAgICAgICAgdm9pZCogaXRlbURhdGE7Ci0gICAgICAgIEVJTkFfTElTVF9GT1JF QUNIKGNvbnRleHRNZW51SXRlbXMsIGxpc3RJdGVyYXRvciwgaXRlbURhdGEpIHsKLSAgICAgICAg ICAgIEV3a19Db250ZXh0X01lbnVfSXRlbSogaXRlbSA9IHN0YXRpY19jYXN0PEV3a19Db250ZXh0 X01lbnVfSXRlbSo+KGl0ZW1EYXRhKTsKLSAgICAgICAgICAgIGlmICghc3RyY21wKGV3a19jb250 ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoaXRlbSksIG5vR3Vlc3Nlc1N0cmluZykpCi0gICAgICAg ICAgICAgICAgbm9HdWVzc2VzQXZhaWxhYmxlID0gdHJ1ZTsKLSAgICAgICAgICAgIGVsc2UgaWYg KCFzdHJjbXAoZXdrX2NvbnRleHRfbWVudV9pdGVtX3RpdGxlX2dldChpdGVtKSwgaWdub3JlU3Bl bGxpbmdTdHJpbmcpKQotICAgICAgICAgICAgICAgIGlzSWdub3JlU3BlbGxpbmdBdmFpbGFibGUg PSB0cnVlOwotICAgICAgICAgICAgZWxzZSBpZiAoIXN0cmNtcChld2tfY29udGV4dF9tZW51X2l0 ZW1fdGl0bGVfZ2V0KGl0ZW0pLCBsZWFyblNwZWxsaW5nU3RyaW5nKSkKLSAgICAgICAgICAgICAg ICBpc0xlYXJuU3BlbGxpbmdBdmFpbGFibGUgPSB0cnVlOwotICAgICAgICB9CisgICAgICAgIEV3 a19Db250ZXh0X01lbnVfSXRlbSogaWdub3JlU3BlbGxpbmdJdGVtID0gZmluZENvbnRleHRNZW51 SXRlbShjb250ZXh0TWVudSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19JR05PUkVfU1BFTExJ TkcsIEVXS19BQ1RJT05fVFlQRSk7CisgICAgICAgIEVYUEVDVF9UUlVFKGlnbm9yZVNwZWxsaW5n SXRlbSk7CiAKLSAgICAgICAgRVhQRUNUX0ZBTFNFKG5vR3Vlc3Nlc0F2YWlsYWJsZSk7Ci0gICAg ICAgIEVYUEVDVF9UUlVFKGlzSWdub3JlU3BlbGxpbmdBdmFpbGFibGUpOwotICAgICAgICBFWFBF Q1RfVFJVRShpc0xlYXJuU3BlbGxpbmdBdmFpbGFibGUpOworICAgICAgICBFd2tfQ29udGV4dF9N ZW51X0l0ZW0qIGxlYXJuU3BlbGxpbmdJdGVtID0gZmluZENvbnRleHRNZW51SXRlbShjb250ZXh0 TWVudSwgRVdLX0NPTlRFWFRfTUVOVV9JVEVNX1RBR19MRUFSTl9TUEVMTElORywgRVdLX0FDVElP Tl9UWVBFKTsKKyAgICAgICAgRVhQRUNUX1RSVUUobGVhcm5TcGVsbGluZ0l0ZW0pOwogCiAgICAg ICAgIHdhc0NvbnRleHRNZW51U2hvd24gPSB0cnVlOwogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAg LTU0OSwxNCArNTMyLDE1IEBAIFRFU1RfRihFV0syVGV4dENoZWNrZXJUZXN0LCBld2tfdGV4dF9j aGVja2VyX3NwZWxsX2NoZWNraW5nX2xhbmd1YWdlc19nZXQpCiAgKi8KIFRFU1RfRihFV0syVGV4 dENoZWNrZXJUZXN0LCBjb250ZXh0X21lbnVfc3BlbGxpbmdfaXRlbXNfYXZhaWxhYmlsaXR5KQog eworICAgIHdhc0NvbnRleHRNZW51U2hvd24gPSBmYWxzZTsKKwogICAgIGV3a190ZXh0X2NoZWNr ZXJfY29udGludW91c19zcGVsbF9jaGVja2luZ19lbmFibGVkX3NldChmYWxzZSk7CiAgICAgZXdr Vmlld0NsYXNzKCktPmNvbnRleHRfbWVudV9zaG93ID0gY2hlY2tDb3JyZWN0bmVzc09mU3BlbGxp bmdJdGVtczsKIAogICAgIEFTU0VSVF9UUlVFKGxvYWRVcmxTeW5jKGVudmlyb25tZW50LT51cmxG b3JSZXNvdXJjZSgic3BlbGxpbmdfdGVzdC5odG1sIikuZGF0YSgpKSk7CiAgICAgc2hvd0NvbnRl eHRNZW51KEZpcnN0TGluZSk7CiAKLSAgICB3aGlsZSAoIXdhc0NvbnRleHRNZW51U2hvd24pCi0g ICAgICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgQVNTRVJUX1RSVUUod2FpdFVu dGlsVHJ1ZSh3YXNDb250ZXh0TWVudVNob3duKSk7CiB9CiAKIC8qKgo= 207519 2013-07-26 02:35:28 -0700 2013-07-26 03:21:43 -0700 verify return value of each findContextMenuItem call spelling-simplify_unit_test.patch text/plain 6647 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5ZGJkN2M1Li5iNjI1MjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDctMjYgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBTaW1wbGlmeSBjb250ZXh0X21lbnVfc3BlbGxp bmdfaXRlbXNfYXZhaWxhYmlsaXR5IHVuaXQgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGZpbmRDb250ZXh0TWVudUl0ZW0gbWV0aG9kIHRv IGNoZWNrIHdoZXRoZXIgdGhlIGl0ZW0KKyAgICAgICAgYXBwZWFycyBpbiBjb250ZXh0IG1lbnUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVj a2VyLmNwcDoKKyAgICAgICAgKEVXSzJUZXh0Q2hlY2tlclRlc3Q6OmZpbmRDb250ZXh0TWVudUl0 ZW0pOgorICAgICAgICBEbyBub3QgcmVwb3J0IGZhaWx1cmUgaW5zaWRlIHRoZSBtZXRob2QuCisg ICAgICAgIEl0IGRvZXNuJ3QgYWxsb3cgdG8gdGVzdCB0aGUgbmVnYXRpdmUgdGVzdCBjYXNlcy4K KworICAgICAgICAoRVdLMlRleHRDaGVja2VyVGVzdDo6Y2hlY2tDb3JyZWN0bmVzc09mU3BlbGxp bmdJdGVtcyk6CisgICAgICAgIFVzZSBmaW5kQ29udGV4dE1lbnVJdGVtIG1ldGhvZC4KKworICAg ICAgICAoRVdLMlRleHRDaGVja2VyVGVzdDo6dG9vZ2xlQ2hlY2tTcGVsbGluZ1doaWxlVHlwaW5n KToKKyAgICAgICAgKEVXSzJUZXh0Q2hlY2tlclRlc3Q6OnNlbGVjdExlYXJuU3BlbGxpbmcpOgor ICAgICAgICAoRVdLMlRleHRDaGVja2VyVGVzdDo6c2VsZWN0SWdub3JlU3BlbGxpbmcpOgorICAg ICAgICBWZXJpZnkgdGhlIHJldHVybiB2YWx1ZSBvZiBmaW5kQ29udGV4dE1lbnVJdGVtLgorCisg ICAgICAgIChURVNUX0YpOgorICAgICAgICBSZXNldCB3YXNDb250ZXh0TWVudVNob3duIHZhcmlh YmxlLCBpdCdzIG5lZWRlZCBhZnRlciByMTUyMTUzLgorICAgICAgICBVc2Ugd2FpdFVudGlsVHJ1 ZSBtZXRob2QuCisKIDIwMTMtMDctMjUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29t PgogCiAgICAgICAgIENocm9tZUNsaWVudDo6Zm9jdXNlZE5vZGVDaGFuZ2VkKCkgc2hvdWxkIGJl IGZvY3VzZWRFbGVtZW50Q2hhbmdlZCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3RleHRfY2hlY2tlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVja2VyLmNw cAppbmRleCA2ZGNiODcwLi42MzEyMGY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVja2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVja2Vy LmNwcApAQCAtNDYsOSArNDYsNiBAQCBzdGF0aWMgRWNvcmVfVGltZXIqIHRpbWVvdXRUaW1lciA9 IDA7CiBzdGF0aWMgZG91YmxlIGRlZmF1bHRUaW1lb3V0SW5TZWNvbmRzID0gMC41OwogCiBzdGF0 aWMgYm9vbCB3YXNDb250ZXh0TWVudVNob3duID0gZmFsc2U7Ci1zdGF0aWMgY29uc3QgY2hhciBu b0d1ZXNzZXNTdHJpbmdbXSA9ICJObyBHdWVzc2VzIEZvdW5kIjsKLXN0YXRpYyBjb25zdCBjaGFy IGlnbm9yZVNwZWxsaW5nU3RyaW5nW10gPSAiSWdub3JlIFNwZWxsaW5nIjsKLXN0YXRpYyBjb25z dCBjaGFyIGxlYXJuU3BlbGxpbmdTdHJpbmdbXSA9ICJMZWFybiBTcGVsbGluZyI7CiAKIHN0YXRp YyBjb25zdCBjaGFyKiBjbGllbnRTdWdnZXN0aW9uc0ZvcldvcmRbXSA9IHsgImNsaWVudFN1Z2dl c3Rpb24xIiwgImNsaWVudFN1Z2dlc3Rpb24yIiwgImNsaWVudFN1Z2dlc3Rpb24zIiB9Owogc3Rh dGljIHVuc2lnbmVkIGNvbnRleHRNZW51SXRlbXNOdW1iZXIgPSAwOwpAQCAtMjcwLDMzICsyNjcs MTkgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIHJldHVybiBpdGVtOwogICAgICAgICB9CiAK LSAgICAgICAgQUREX0ZBSUxVUkUoKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCiAgICAg c3RhdGljIEVpbmFfQm9vbCBjaGVja0NvcnJlY3RuZXNzT2ZTcGVsbGluZ0l0ZW1zKEV3a19WaWV3 X1NtYXJ0X0RhdGEqLCBFdmFzX0Nvb3JkLCBFdmFzX0Nvb3JkLCBFd2tfQ29udGV4dF9NZW51KiBj b250ZXh0TWVudSkKICAgICB7Ci0gICAgICAgIGNvbnN0IEVpbmFfTGlzdCogY29udGV4dE1lbnVJ dGVtcyA9IGV3a19jb250ZXh0X21lbnVfaXRlbXNfZ2V0KGNvbnRleHRNZW51KTsKLQotICAgICAg ICBib29sIG5vR3Vlc3Nlc0F2YWlsYWJsZSA9IGZhbHNlOwotICAgICAgICBib29sIGlzSWdub3Jl U3BlbGxpbmdBdmFpbGFibGUgPSBmYWxzZTsKLSAgICAgICAgYm9vbCBpc0xlYXJuU3BlbGxpbmdB dmFpbGFibGUgPSBmYWxzZTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBub0d1ZXNz ZXNJdGVtID0gZmluZENvbnRleHRNZW51SXRlbShjb250ZXh0TWVudSwgRVdLX0NPTlRFWFRfTUVO VV9JVEVNX1RBR19OT19HVUVTU0VTX0ZPVU5ELCBFV0tfQUNUSU9OX1RZUEUpOworICAgICAgICBF WFBFQ1RfRkFMU0Uobm9HdWVzc2VzSXRlbSk7CiAKLSAgICAgICAgY29uc3QgRWluYV9MaXN0KiBs aXN0SXRlcmF0b3I7Ci0gICAgICAgIHZvaWQqIGl0ZW1EYXRhOwotICAgICAgICBFSU5BX0xJU1Rf Rk9SRUFDSChjb250ZXh0TWVudUl0ZW1zLCBsaXN0SXRlcmF0b3IsIGl0ZW1EYXRhKSB7Ci0gICAg ICAgICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0gPSBzdGF0aWNfY2FzdDxFd2tfQ29u dGV4dF9NZW51X0l0ZW0qPihpdGVtRGF0YSk7Ci0gICAgICAgICAgICBpZiAoIXN0cmNtcChld2tf Y29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGl0ZW0pLCBub0d1ZXNzZXNTdHJpbmcpKQotICAg ICAgICAgICAgICAgIG5vR3Vlc3Nlc0F2YWlsYWJsZSA9IHRydWU7Ci0gICAgICAgICAgICBlbHNl IGlmICghc3RyY21wKGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoaXRlbSksIGlnbm9y ZVNwZWxsaW5nU3RyaW5nKSkKLSAgICAgICAgICAgICAgICBpc0lnbm9yZVNwZWxsaW5nQXZhaWxh YmxlID0gdHJ1ZTsKLSAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoZXdrX2NvbnRleHRfbWVu dV9pdGVtX3RpdGxlX2dldChpdGVtKSwgbGVhcm5TcGVsbGluZ1N0cmluZykpCi0gICAgICAgICAg ICAgICAgaXNMZWFyblNwZWxsaW5nQXZhaWxhYmxlID0gdHJ1ZTsKLSAgICAgICAgfQorICAgICAg ICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGlnbm9yZVNwZWxsaW5nSXRlbSA9IGZpbmRDb250ZXh0 TWVudUl0ZW0oY29udGV4dE1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfSUdOT1JFX1NQ RUxMSU5HLCBFV0tfQUNUSU9OX1RZUEUpOworICAgICAgICBFWFBFQ1RfVFJVRShpZ25vcmVTcGVs bGluZ0l0ZW0pOwogCi0gICAgICAgIEVYUEVDVF9GQUxTRShub0d1ZXNzZXNBdmFpbGFibGUpOwot ICAgICAgICBFWFBFQ1RfVFJVRShpc0lnbm9yZVNwZWxsaW5nQXZhaWxhYmxlKTsKLSAgICAgICAg RVhQRUNUX1RSVUUoaXNMZWFyblNwZWxsaW5nQXZhaWxhYmxlKTsKKyAgICAgICAgRXdrX0NvbnRl eHRfTWVudV9JdGVtKiBsZWFyblNwZWxsaW5nSXRlbSA9IGZpbmRDb250ZXh0TWVudUl0ZW0oY29u dGV4dE1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfTEVBUk5fU1BFTExJTkcsIEVXS19B Q1RJT05fVFlQRSk7CisgICAgICAgIEVYUEVDVF9UUlVFKGxlYXJuU3BlbGxpbmdJdGVtKTsKIAog ICAgICAgICB3YXNDb250ZXh0TWVudVNob3duID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuIHRydWU7 CkBAIC0zMDUsOCArMjg4LDExIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgRWluYV9Cb29sIHRvb2ds ZUNoZWNrU3BlbGxpbmdXaGlsZVR5cGluZyhFd2tfVmlld19TbWFydF9EYXRhKiwgRXZhc19Db29y ZCwgRXZhc19Db29yZCwgRXdrX0NvbnRleHRfTWVudSogY29udGV4dE1lbnUpCiAgICAgewogICAg ICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIHNwZWxsaW5nQW5kR3JhbW1hckl0ZW0gPSBmaW5k Q29udGV4dE1lbnVJdGVtKGNvbnRleHRNZW51LCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX1NQ RUxMSU5HX01FTlUsIEVXS19TVUJNRU5VX1RZUEUpOworICAgICAgICBFWFBFQ1RfVFJVRShzcGVs bGluZ0FuZEdyYW1tYXJJdGVtKTsKKwogICAgICAgICBFd2tfQ29udGV4dF9NZW51KiBzcGVsbGlu Z0FuZEdyYW1tYXJTdWJtZW51ID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KHNw ZWxsaW5nQW5kR3JhbW1hckl0ZW0pOwogICAgICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGNo ZWNrU3BlbGxpbmdXaGlsZVR5cGluZ0l0ZW0gPSBmaW5kQ29udGV4dE1lbnVJdGVtKHNwZWxsaW5n QW5kR3JhbW1hclN1Ym1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfQ0hFQ0tfU1BFTExJ TkdfV0hJTEVfVFlQSU5HLCBFV0tfQ0hFQ0tBQkxFX0FDVElPTl9UWVBFKTsKKyAgICAgICAgRVhQ RUNUX1RSVUUoc3BlbGxpbmdBbmRHcmFtbWFyU3VibWVudSk7CiAKICAgICAgICAgcmV0dXJuIGV3 a19jb250ZXh0X21lbnVfaXRlbV9zZWxlY3Qoc3BlbGxpbmdBbmRHcmFtbWFyU3VibWVudSwgY2hl Y2tTcGVsbGluZ1doaWxlVHlwaW5nSXRlbSk7CiAgICAgfQpAQCAtMzM0LDEyICszMjAsMTggQEAg cHVibGljOgogCiAgICAgc3RhdGljIEVpbmFfQm9vbCBzZWxlY3RMZWFyblNwZWxsaW5nKEV3a19W aWV3X1NtYXJ0X0RhdGEqLCBFdmFzX0Nvb3JkLCBFdmFzX0Nvb3JkLCBFd2tfQ29udGV4dF9NZW51 KiBjb250ZXh0TWVudSkKICAgICB7Ci0gICAgICAgIHJldHVybiBld2tfY29udGV4dF9tZW51X2l0 ZW1fc2VsZWN0KGNvbnRleHRNZW51LCBmaW5kQ29udGV4dE1lbnVJdGVtKGNvbnRleHRNZW51LCBF V0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0xFQVJOX1NQRUxMSU5HLCBFV0tfQUNUSU9OX1RZUEUp KTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBsZWFyblNwZWxsaW5nSXRlbSA9IGZp bmRDb250ZXh0TWVudUl0ZW0oY29udGV4dE1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdf TEVBUk5fU1BFTExJTkcsIEVXS19BQ1RJT05fVFlQRSk7CisgICAgICAgIEVYUEVDVF9UUlVFKGxl YXJuU3BlbGxpbmdJdGVtKTsKKworICAgICAgICByZXR1cm4gZXdrX2NvbnRleHRfbWVudV9pdGVt X3NlbGVjdChjb250ZXh0TWVudSwgbGVhcm5TcGVsbGluZ0l0ZW0pOwogICAgIH0KIAogICAgIHN0 YXRpYyBFaW5hX0Jvb2wgc2VsZWN0SWdub3JlU3BlbGxpbmcoRXdrX1ZpZXdfU21hcnRfRGF0YSos IEV2YXNfQ29vcmQsIEV2YXNfQ29vcmQsIEV3a19Db250ZXh0X01lbnUqIGNvbnRleHRNZW51KQog ICAgIHsKLSAgICAgICAgcmV0dXJuIGV3a19jb250ZXh0X21lbnVfaXRlbV9zZWxlY3QoY29udGV4 dE1lbnUsIGZpbmRDb250ZXh0TWVudUl0ZW0oY29udGV4dE1lbnUsIEVXS19DT05URVhUX01FTlVf SVRFTV9UQUdfSUdOT1JFX1NQRUxMSU5HLCBFV0tfQUNUSU9OX1RZUEUpKTsKKyAgICAgICAgRXdr X0NvbnRleHRfTWVudV9JdGVtKiBpZ25vcmVTcGVsbGluZ0l0ZW0gPSBmaW5kQ29udGV4dE1lbnVJ dGVtKGNvbnRleHRNZW51LCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0lHTk9SRV9TUEVMTElO RywgRVdLX0FDVElPTl9UWVBFKTsKKyAgICAgICAgRVhQRUNUX1RSVUUoaWdub3JlU3BlbGxpbmdJ dGVtKTsKKworICAgICAgICByZXR1cm4gZXdrX2NvbnRleHRfbWVudV9pdGVtX3NlbGVjdChjb250 ZXh0TWVudSwgaWdub3JlU3BlbGxpbmdJdGVtKTsKICAgICB9CiAKICAgICAvKioKQEAgLTU0OSwx NCArNTQxLDE1IEBAIFRFU1RfRihFV0syVGV4dENoZWNrZXJUZXN0LCBld2tfdGV4dF9jaGVja2Vy X3NwZWxsX2NoZWNraW5nX2xhbmd1YWdlc19nZXQpCiAgKi8KIFRFU1RfRihFV0syVGV4dENoZWNr ZXJUZXN0LCBjb250ZXh0X21lbnVfc3BlbGxpbmdfaXRlbXNfYXZhaWxhYmlsaXR5KQogeworICAg IHdhc0NvbnRleHRNZW51U2hvd24gPSBmYWxzZTsKKwogICAgIGV3a190ZXh0X2NoZWNrZXJfY29u dGludW91c19zcGVsbF9jaGVja2luZ19lbmFibGVkX3NldChmYWxzZSk7CiAgICAgZXdrVmlld0Ns YXNzKCktPmNvbnRleHRfbWVudV9zaG93ID0gY2hlY2tDb3JyZWN0bmVzc09mU3BlbGxpbmdJdGVt czsKIAogICAgIEFTU0VSVF9UUlVFKGxvYWRVcmxTeW5jKGVudmlyb25tZW50LT51cmxGb3JSZXNv dXJjZSgic3BlbGxpbmdfdGVzdC5odG1sIikuZGF0YSgpKSk7CiAgICAgc2hvd0NvbnRleHRNZW51 KEZpcnN0TGluZSk7CiAKLSAgICB3aGlsZSAoIXdhc0NvbnRleHRNZW51U2hvd24pCi0gICAgICAg IGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgQVNTRVJUX1RSVUUod2FpdFVudGlsVHJ1 ZSh3YXNDb250ZXh0TWVudVNob3duKSk7CiB9CiAKIC8qKgo= 207520 2013-07-26 03:21:43 -0700 2013-07-26 12:13:07 -0700 apply Gyuyoung's review spelling-simplify_unit_test.patch text/plain 6650 g.czajkowski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5ZGJkN2M1Li5iNjI1MjgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAg QEAKKzIwMTMtMDctMjYgIEdyemVnb3J6IEN6YWprb3dza2kgIDxnLmN6YWprb3dza2lAc2Ftc3Vu Zy5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBTaW1wbGlmeSBjb250ZXh0X21lbnVfc3BlbGxp bmdfaXRlbXNfYXZhaWxhYmlsaXR5IHVuaXQgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIGZpbmRDb250ZXh0TWVudUl0ZW0gbWV0aG9kIHRv IGNoZWNrIHdoZXRoZXIgdGhlIGl0ZW0KKyAgICAgICAgYXBwZWFycyBpbiBjb250ZXh0IG1lbnUu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVj a2VyLmNwcDoKKyAgICAgICAgKEVXSzJUZXh0Q2hlY2tlclRlc3Q6OmZpbmRDb250ZXh0TWVudUl0 ZW0pOgorICAgICAgICBEbyBub3QgcmVwb3J0IGZhaWx1cmUgaW5zaWRlIHRoZSBtZXRob2QuCisg ICAgICAgIEl0IGRvZXNuJ3QgYWxsb3cgdG8gdGVzdCB0aGUgbmVnYXRpdmUgdGVzdCBjYXNlcy4K KworICAgICAgICAoRVdLMlRleHRDaGVja2VyVGVzdDo6Y2hlY2tDb3JyZWN0bmVzc09mU3BlbGxp bmdJdGVtcyk6CisgICAgICAgIFVzZSBmaW5kQ29udGV4dE1lbnVJdGVtIG1ldGhvZC4KKworICAg ICAgICAoRVdLMlRleHRDaGVja2VyVGVzdDo6dG9vZ2xlQ2hlY2tTcGVsbGluZ1doaWxlVHlwaW5n KToKKyAgICAgICAgKEVXSzJUZXh0Q2hlY2tlclRlc3Q6OnNlbGVjdExlYXJuU3BlbGxpbmcpOgor ICAgICAgICAoRVdLMlRleHRDaGVja2VyVGVzdDo6c2VsZWN0SWdub3JlU3BlbGxpbmcpOgorICAg ICAgICBWZXJpZnkgdGhlIHJldHVybiB2YWx1ZSBvZiBmaW5kQ29udGV4dE1lbnVJdGVtLgorCisg ICAgICAgIChURVNUX0YpOgorICAgICAgICBSZXNldCB3YXNDb250ZXh0TWVudVNob3duIHZhcmlh YmxlLCBpdCdzIG5lZWRlZCBhZnRlciByMTUyMTUzLgorICAgICAgICBVc2Ugd2FpdFVudGlsVHJ1 ZSBtZXRob2QuCisKIDIwMTMtMDctMjUgIEFuZHJlYXMgS2xpbmcgIDxha2xpbmdAYXBwbGUuY29t PgogCiAgICAgICAgIENocm9tZUNsaWVudDo6Zm9jdXNlZE5vZGVDaGFuZ2VkKCkgc2hvdWxkIGJl IGZvY3VzZWRFbGVtZW50Q2hhbmdlZCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3RleHRfY2hlY2tlci5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVja2VyLmNw cAppbmRleCA2ZGNiODcwLi43NWE2OTVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVja2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdGV4dF9jaGVja2Vy LmNwcApAQCAtNDYsOSArNDYsNiBAQCBzdGF0aWMgRWNvcmVfVGltZXIqIHRpbWVvdXRUaW1lciA9 IDA7CiBzdGF0aWMgZG91YmxlIGRlZmF1bHRUaW1lb3V0SW5TZWNvbmRzID0gMC41OwogCiBzdGF0 aWMgYm9vbCB3YXNDb250ZXh0TWVudVNob3duID0gZmFsc2U7Ci1zdGF0aWMgY29uc3QgY2hhciBu b0d1ZXNzZXNTdHJpbmdbXSA9ICJObyBHdWVzc2VzIEZvdW5kIjsKLXN0YXRpYyBjb25zdCBjaGFy IGlnbm9yZVNwZWxsaW5nU3RyaW5nW10gPSAiSWdub3JlIFNwZWxsaW5nIjsKLXN0YXRpYyBjb25z dCBjaGFyIGxlYXJuU3BlbGxpbmdTdHJpbmdbXSA9ICJMZWFybiBTcGVsbGluZyI7CiAKIHN0YXRp YyBjb25zdCBjaGFyKiBjbGllbnRTdWdnZXN0aW9uc0ZvcldvcmRbXSA9IHsgImNsaWVudFN1Z2dl c3Rpb24xIiwgImNsaWVudFN1Z2dlc3Rpb24yIiwgImNsaWVudFN1Z2dlc3Rpb24zIiB9Owogc3Rh dGljIHVuc2lnbmVkIGNvbnRleHRNZW51SXRlbXNOdW1iZXIgPSAwOwpAQCAtMjcwLDMzICsyNjcs MTkgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIHJldHVybiBpdGVtOwogICAgICAgICB9CiAK LSAgICAgICAgQUREX0ZBSUxVUkUoKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCiAgICAg c3RhdGljIEVpbmFfQm9vbCBjaGVja0NvcnJlY3RuZXNzT2ZTcGVsbGluZ0l0ZW1zKEV3a19WaWV3 X1NtYXJ0X0RhdGEqLCBFdmFzX0Nvb3JkLCBFdmFzX0Nvb3JkLCBFd2tfQ29udGV4dF9NZW51KiBj b250ZXh0TWVudSkKICAgICB7Ci0gICAgICAgIGNvbnN0IEVpbmFfTGlzdCogY29udGV4dE1lbnVJ dGVtcyA9IGV3a19jb250ZXh0X21lbnVfaXRlbXNfZ2V0KGNvbnRleHRNZW51KTsKLQotICAgICAg ICBib29sIG5vR3Vlc3Nlc0F2YWlsYWJsZSA9IGZhbHNlOwotICAgICAgICBib29sIGlzSWdub3Jl U3BlbGxpbmdBdmFpbGFibGUgPSBmYWxzZTsKLSAgICAgICAgYm9vbCBpc0xlYXJuU3BlbGxpbmdB dmFpbGFibGUgPSBmYWxzZTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBub0d1ZXNz ZXNJdGVtID0gZmluZENvbnRleHRNZW51SXRlbShjb250ZXh0TWVudSwgRVdLX0NPTlRFWFRfTUVO VV9JVEVNX1RBR19OT19HVUVTU0VTX0ZPVU5ELCBFV0tfQUNUSU9OX1RZUEUpOworICAgICAgICBF WFBFQ1RfRkFMU0Uobm9HdWVzc2VzSXRlbSk7CiAKLSAgICAgICAgY29uc3QgRWluYV9MaXN0KiBs aXN0SXRlcmF0b3I7Ci0gICAgICAgIHZvaWQqIGl0ZW1EYXRhOwotICAgICAgICBFSU5BX0xJU1Rf Rk9SRUFDSChjb250ZXh0TWVudUl0ZW1zLCBsaXN0SXRlcmF0b3IsIGl0ZW1EYXRhKSB7Ci0gICAg ICAgICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGl0ZW0gPSBzdGF0aWNfY2FzdDxFd2tfQ29u dGV4dF9NZW51X0l0ZW0qPihpdGVtRGF0YSk7Ci0gICAgICAgICAgICBpZiAoIXN0cmNtcChld2tf Y29udGV4dF9tZW51X2l0ZW1fdGl0bGVfZ2V0KGl0ZW0pLCBub0d1ZXNzZXNTdHJpbmcpKQotICAg ICAgICAgICAgICAgIG5vR3Vlc3Nlc0F2YWlsYWJsZSA9IHRydWU7Ci0gICAgICAgICAgICBlbHNl IGlmICghc3RyY21wKGV3a19jb250ZXh0X21lbnVfaXRlbV90aXRsZV9nZXQoaXRlbSksIGlnbm9y ZVNwZWxsaW5nU3RyaW5nKSkKLSAgICAgICAgICAgICAgICBpc0lnbm9yZVNwZWxsaW5nQXZhaWxh YmxlID0gdHJ1ZTsKLSAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoZXdrX2NvbnRleHRfbWVu dV9pdGVtX3RpdGxlX2dldChpdGVtKSwgbGVhcm5TcGVsbGluZ1N0cmluZykpCi0gICAgICAgICAg ICAgICAgaXNMZWFyblNwZWxsaW5nQXZhaWxhYmxlID0gdHJ1ZTsKLSAgICAgICAgfQorICAgICAg ICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGlnbm9yZVNwZWxsaW5nSXRlbSA9IGZpbmRDb250ZXh0 TWVudUl0ZW0oY29udGV4dE1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfSUdOT1JFX1NQ RUxMSU5HLCBFV0tfQUNUSU9OX1RZUEUpOworICAgICAgICBFWFBFQ1RfVFJVRShpZ25vcmVTcGVs bGluZ0l0ZW0pOwogCi0gICAgICAgIEVYUEVDVF9GQUxTRShub0d1ZXNzZXNBdmFpbGFibGUpOwot ICAgICAgICBFWFBFQ1RfVFJVRShpc0lnbm9yZVNwZWxsaW5nQXZhaWxhYmxlKTsKLSAgICAgICAg RVhQRUNUX1RSVUUoaXNMZWFyblNwZWxsaW5nQXZhaWxhYmxlKTsKKyAgICAgICAgRXdrX0NvbnRl eHRfTWVudV9JdGVtKiBsZWFyblNwZWxsaW5nSXRlbSA9IGZpbmRDb250ZXh0TWVudUl0ZW0oY29u dGV4dE1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfTEVBUk5fU1BFTExJTkcsIEVXS19B Q1RJT05fVFlQRSk7CisgICAgICAgIEVYUEVDVF9UUlVFKGxlYXJuU3BlbGxpbmdJdGVtKTsKIAog ICAgICAgICB3YXNDb250ZXh0TWVudVNob3duID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuIHRydWU7 CkBAIC0zMDUsOCArMjg4LDExIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgRWluYV9Cb29sIHRvb2ds ZUNoZWNrU3BlbGxpbmdXaGlsZVR5cGluZyhFd2tfVmlld19TbWFydF9EYXRhKiwgRXZhc19Db29y ZCwgRXZhc19Db29yZCwgRXdrX0NvbnRleHRfTWVudSogY29udGV4dE1lbnUpCiAgICAgewogICAg ICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIHNwZWxsaW5nQW5kR3JhbW1hckl0ZW0gPSBmaW5k Q29udGV4dE1lbnVJdGVtKGNvbnRleHRNZW51LCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX1NQ RUxMSU5HX01FTlUsIEVXS19TVUJNRU5VX1RZUEUpOworICAgICAgICBFWFBFQ1RfVFJVRShzcGVs bGluZ0FuZEdyYW1tYXJJdGVtKTsKKwogICAgICAgICBFd2tfQ29udGV4dF9NZW51KiBzcGVsbGlu Z0FuZEdyYW1tYXJTdWJtZW51ID0gZXdrX2NvbnRleHRfbWVudV9pdGVtX3N1Ym1lbnVfZ2V0KHNw ZWxsaW5nQW5kR3JhbW1hckl0ZW0pOwogICAgICAgICBFd2tfQ29udGV4dF9NZW51X0l0ZW0qIGNo ZWNrU3BlbGxpbmdXaGlsZVR5cGluZ0l0ZW0gPSBmaW5kQ29udGV4dE1lbnVJdGVtKHNwZWxsaW5n QW5kR3JhbW1hclN1Ym1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9UQUdfQ0hFQ0tfU1BFTExJ TkdfV0hJTEVfVFlQSU5HLCBFV0tfQ0hFQ0tBQkxFX0FDVElPTl9UWVBFKTsKKyAgICAgICAgRVhQ RUNUX1RSVUUoY2hlY2tTcGVsbGluZ1doaWxlVHlwaW5nSXRlbSk7CiAKICAgICAgICAgcmV0dXJu IGV3a19jb250ZXh0X21lbnVfaXRlbV9zZWxlY3Qoc3BlbGxpbmdBbmRHcmFtbWFyU3VibWVudSwg Y2hlY2tTcGVsbGluZ1doaWxlVHlwaW5nSXRlbSk7CiAgICAgfQpAQCAtMzM0LDEyICszMjAsMTgg QEAgcHVibGljOgogCiAgICAgc3RhdGljIEVpbmFfQm9vbCBzZWxlY3RMZWFyblNwZWxsaW5nKEV3 a19WaWV3X1NtYXJ0X0RhdGEqLCBFdmFzX0Nvb3JkLCBFdmFzX0Nvb3JkLCBFd2tfQ29udGV4dF9N ZW51KiBjb250ZXh0TWVudSkKICAgICB7Ci0gICAgICAgIHJldHVybiBld2tfY29udGV4dF9tZW51 X2l0ZW1fc2VsZWN0KGNvbnRleHRNZW51LCBmaW5kQ29udGV4dE1lbnVJdGVtKGNvbnRleHRNZW51 LCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0xFQVJOX1NQRUxMSU5HLCBFV0tfQUNUSU9OX1RZ UEUpKTsKKyAgICAgICAgRXdrX0NvbnRleHRfTWVudV9JdGVtKiBsZWFyblNwZWxsaW5nSXRlbSA9 IGZpbmRDb250ZXh0TWVudUl0ZW0oY29udGV4dE1lbnUsIEVXS19DT05URVhUX01FTlVfSVRFTV9U QUdfTEVBUk5fU1BFTExJTkcsIEVXS19BQ1RJT05fVFlQRSk7CisgICAgICAgIEVYUEVDVF9UUlVF KGxlYXJuU3BlbGxpbmdJdGVtKTsKKworICAgICAgICByZXR1cm4gZXdrX2NvbnRleHRfbWVudV9p dGVtX3NlbGVjdChjb250ZXh0TWVudSwgbGVhcm5TcGVsbGluZ0l0ZW0pOwogICAgIH0KIAogICAg IHN0YXRpYyBFaW5hX0Jvb2wgc2VsZWN0SWdub3JlU3BlbGxpbmcoRXdrX1ZpZXdfU21hcnRfRGF0 YSosIEV2YXNfQ29vcmQsIEV2YXNfQ29vcmQsIEV3a19Db250ZXh0X01lbnUqIGNvbnRleHRNZW51 KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGV3a19jb250ZXh0X21lbnVfaXRlbV9zZWxlY3QoY29u dGV4dE1lbnUsIGZpbmRDb250ZXh0TWVudUl0ZW0oY29udGV4dE1lbnUsIEVXS19DT05URVhUX01F TlVfSVRFTV9UQUdfSUdOT1JFX1NQRUxMSU5HLCBFV0tfQUNUSU9OX1RZUEUpKTsKKyAgICAgICAg RXdrX0NvbnRleHRfTWVudV9JdGVtKiBpZ25vcmVTcGVsbGluZ0l0ZW0gPSBmaW5kQ29udGV4dE1l bnVJdGVtKGNvbnRleHRNZW51LCBFV0tfQ09OVEVYVF9NRU5VX0lURU1fVEFHX0lHTk9SRV9TUEVM TElORywgRVdLX0FDVElPTl9UWVBFKTsKKyAgICAgICAgRVhQRUNUX1RSVUUoaWdub3JlU3BlbGxp bmdJdGVtKTsKKworICAgICAgICByZXR1cm4gZXdrX2NvbnRleHRfbWVudV9pdGVtX3NlbGVjdChj b250ZXh0TWVudSwgaWdub3JlU3BlbGxpbmdJdGVtKTsKICAgICB9CiAKICAgICAvKioKQEAgLTU0 OSwxNCArNTQxLDE1IEBAIFRFU1RfRihFV0syVGV4dENoZWNrZXJUZXN0LCBld2tfdGV4dF9jaGVj a2VyX3NwZWxsX2NoZWNraW5nX2xhbmd1YWdlc19nZXQpCiAgKi8KIFRFU1RfRihFV0syVGV4dENo ZWNrZXJUZXN0LCBjb250ZXh0X21lbnVfc3BlbGxpbmdfaXRlbXNfYXZhaWxhYmlsaXR5KQogewor ICAgIHdhc0NvbnRleHRNZW51U2hvd24gPSBmYWxzZTsKKwogICAgIGV3a190ZXh0X2NoZWNrZXJf Y29udGludW91c19zcGVsbF9jaGVja2luZ19lbmFibGVkX3NldChmYWxzZSk7CiAgICAgZXdrVmll d0NsYXNzKCktPmNvbnRleHRfbWVudV9zaG93ID0gY2hlY2tDb3JyZWN0bmVzc09mU3BlbGxpbmdJ dGVtczsKIAogICAgIEFTU0VSVF9UUlVFKGxvYWRVcmxTeW5jKGVudmlyb25tZW50LT51cmxGb3JS ZXNvdXJjZSgic3BlbGxpbmdfdGVzdC5odG1sIikuZGF0YSgpKSk7CiAgICAgc2hvd0NvbnRleHRN ZW51KEZpcnN0TGluZSk7CiAKLSAgICB3aGlsZSAoIXdhc0NvbnRleHRNZW51U2hvd24pCi0gICAg ICAgIGVjb3JlX21haW5fbG9vcF9pdGVyYXRlKCk7CisgICAgQVNTRVJUX1RSVUUod2FpdFVudGls VHJ1ZSh3YXNDb250ZXh0TWVudVNob3duKSk7CiB9CiAKIC8qKgo=