98142 2012-10-02 04:20:02 -0700 [EFL][WK2] Use correct gtest macro for testing true/false 2012-10-02 07:05:51 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jinwoo7.song jinwoo7.song cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 732513 0 jinwoo7.song 2012-10-02 04:20:02 -0700 Using EXPECT_EQ(true/false, ...) makes clang trip when it tries to convert true/false to a pointer. Tests should use EXPECT_TRUE/FALSE instead. 732532 1 166663 jinwoo7.song 2012-10-02 04:33:25 -0700 Created attachment 166663 Patch 732545 2 166663 rakuco 2012-10-02 04:48:01 -0700 Comment on attachment 166663 Patch Looks OK. 732555 3 166663 cdumez 2012-10-02 05:01:29 -0700 Comment on attachment 166663 Patch LGTM. 732561 4 cdumez 2012-10-02 05:07:20 -0700 I'm guessing this patch fixes the following compilation warnings? /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In function 'Eina_Bool showPopupMenu(Ewk_View_Smart_Data*, Eina_Rectangle, Ewk_Text_Direction, double, Eina_List*, int)': /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:223:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In member function 'virtual void EWK2UnitTestBase_ewk_view_run_javascript_alert_Test::TestBody()': /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:462:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In member function 'virtual void EWK2UnitTestBase_ewk_view_run_javascript_confirm_Test::TestBody()': /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:526:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In member function 'virtual void EWK2UnitTestBase_ewk_view_run_javascript_prompt_Test::TestBody()': /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:626:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] 732563 5 jinwoo7.song 2012-10-02 05:09:33 -0700 (In reply to comment #4) > I'm guessing this patch fixes the following compilation warnings? > > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In function 'Eina_Bool showPopupMenu(Ewk_View_Smart_Data*, Eina_Rectangle, Ewk_Text_Direction, double, Eina_List*, int)': > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:223:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In member function 'virtual void EWK2UnitTestBase_ewk_view_run_javascript_alert_Test::TestBody()': > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:462:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In member function 'virtual void EWK2UnitTestBase_ewk_view_run_javascript_confirm_Test::TestBody()': > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:526:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp: In member function 'virtual void EWK2UnitTestBase_ewk_view_run_javascript_prompt_Test::TestBody()': > /home/chris/Devel/WebKit/Source/WebKit2/UIProcess/API/efl/tests/test_ewk2_view.cpp:626:158: warning: converting 'false' to pointer type for argument 1 of 'char testing::internal::IsNullLiteralHelper(testing::internal::Secret*)' [-Wconversion-null] Yes, that's right! 732611 6 166663 laszlo.gombos 2012-10-02 06:35:57 -0700 Comment on attachment 166663 Patch r=me. 732629 7 166663 webkit.review.bot 2012-10-02 07:05:46 -0700 Comment on attachment 166663 Patch Clearing flags on attachment: 166663 Committed r130166: <http://trac.webkit.org/changeset/130166> 732630 8 webkit.review.bot 2012-10-02 07:05:51 -0700 All reviewed patches have been landed. Closing bug. 166663 2012-10-02 04:33:25 -0700 2012-10-02 07:05:46 -0700 Patch bug-98142-20121002203231.patch text/plain 9960 jinwoo7.song U3VidmVyc2lvbiBSZXZpc2lvbjogMTMwMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2I3Mzc4YTRmNjYxMDli MmYzOGI5NGNiYjBiYjI0YzZlM2NlY2ZjMS4uMDI1ZTEzMDdlNmRkZmYzZGUyNjA0OWNhOWIyMzM2 NGI1MTA4ZDA5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTEwLTAyICBKaW53 b28gU29uZyAgPGppbndvbzcuc29uZ0BzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJd IFVzZSBjb3JyZWN0IGd0ZXN0IG1hY3JvIGZvciB0ZXN0aW5nIHRydWUvZmFsc2UKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk4MTQyCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgRVhQRUNUX0VRKHRy dWUvZmFsc2UsIC4uLikgbWFrZXMgY2xhbmcgdHJpcCB3aGVuIGl0IHRyaWVzIHRvIGNvbnZlcnQK KyAgICAgICAgdHJ1ZS9mYWxzZSB0byBhIHBvaW50ZXIuIFRlc3RzIHNob3VsZCB1c2UgRVhQRUNU X1RSVUUvRkFMU0UgaW5zdGVhZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKHNob3dQb3B1cE1lbnUpOgorICAgICAgICAo VEVTVF9GKToKKwogMjAxMi0xMC0wMSAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+ CiAKICAgICAgICAgUmVtb3ZlIHRoZSBTYWZhcmkgMiAtPiBTYWZhcmkgMyBpY29uIGRhdGFiYXNl IGltcG9ydCBjb2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4IDNmNjdkNWVhMjhkMWNmNzE1YWRj NDA0ZTZmYWZlYTA1MmNmNGY1MzkuLmRiYjBjMTQ0ZDMzOTkzYWI3MTQ5MWFhOWNlOTBkYjI0ZWNi OTNkMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3Rz L3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTIyMCw3ICsyMjAsNyBAQCBzdGF0aWMgRWlu YV9Cb29sIHNob3dQb3B1cE1lbnUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhLCBFaW5h X1JlY3RhbmdsZSwgRQogCiAgICAgaXRlbSA9IHN0YXRpY19jYXN0PEV3a19Qb3B1cF9NZW51X0l0 ZW0qPihlaW5hX2xpc3RfbnRoKGxpc3QsIDEpKTsKICAgICBjaGVja0Jhc2ljUG9wdXBNZW51SXRl bShpdGVtLCAic2Vjb25kIiwgZmFsc2UpOwotICAgIEVYUEVDVF9FUShmYWxzZSwgZXdrX3BvcHVw X21lbnVfaXRlbV9lbmFibGVkX2dldChpdGVtKSk7CisgICAgRVhQRUNUX0ZBTFNFKGV3a19wb3B1 cF9tZW51X2l0ZW1fZW5hYmxlZF9nZXQoaXRlbSkpOwogCiAgICAgaXRlbSA9IHN0YXRpY19jYXN0 PEV3a19Qb3B1cF9NZW51X0l0ZW0qPihlaW5hX2xpc3RfbnRoKGxpc3QsIDIpKTsKICAgICBjaGVj a0Jhc2ljUG9wdXBNZW51SXRlbShpdGVtLCAidGhpcmQiLCB0cnVlKTsKQEAgLTQzMSwzNSArNDMx LDM1IEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19ydW5famF2YXNjcmlwdF9h bGVydCkKICAgICBhbGVydENhbGxiYWNrRGF0YS5jYWxsZWQgPSBmYWxzZTsKICAgICBld2tfdmll d19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgYWxlcnRIVE1MLCAwLCAwKTsKICAgICBFWFBF Q1RfVFJVRSh3YWl0VW50aWxMb2FkRmluaXNoZWQoKSk7Ci0gICAgRVhQRUNUX0VRKHRydWUsIGFs ZXJ0Q2FsbGJhY2tEYXRhLmNhbGxlZCk7CisgICAgRVhQRUNUX1RSVUUoYWxlcnRDYWxsYmFja0Rh dGEuY2FsbGVkKTsKIAogICAgIGFsZXJ0SFRNTCA9ICI8IWRvY3R5cGUgaHRtbD48Ym9keSBvbmxv YWQ9XCJhbGVydCgnJyk7XCI+PC9ib2R5PiI7CiAgICAgYWxlcnRDYWxsYmFja0RhdGEuZXhwZWN0 ZWRNZXNzYWdlID0gIiI7CiAgICAgYWxlcnRDYWxsYmFja0RhdGEuY2FsbGVkID0gZmFsc2U7CiAg ICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGFsZXJ0SFRNTCwgMCwgMCk7 CiAgICAgRVhQRUNUX1RSVUUod2FpdFVudGlsTG9hZEZpbmlzaGVkKCkpOwotICAgIEVYUEVDVF9F USh0cnVlLCBhbGVydENhbGxiYWNrRGF0YS5jYWxsZWQpOworICAgIEVYUEVDVF9UUlVFKGFsZXJ0 Q2FsbGJhY2tEYXRhLmNhbGxlZCk7CiAKICAgICBhbGVydEhUTUwgPSAiPCFkb2N0eXBlIGh0bWw+ PGJvZHkgb25sb2FkPVwiYWxlcnQobnVsbCk7XCI+PC9ib2R5PiI7CiAgICAgYWxlcnRDYWxsYmFj a0RhdGEuZXhwZWN0ZWRNZXNzYWdlID0gIm51bGwiOwogICAgIGFsZXJ0Q2FsbGJhY2tEYXRhLmNh bGxlZCA9IGZhbHNlOwogICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQod2ViVmlldygpLCBh bGVydEhUTUwsIDAsIDApOwogICAgIEVYUEVDVF9UUlVFKHdhaXRVbnRpbExvYWRGaW5pc2hlZCgp KTsKLSAgICBFWFBFQ1RfRVEodHJ1ZSwgYWxlcnRDYWxsYmFja0RhdGEuY2FsbGVkKTsKKyAgICBF WFBFQ1RfVFJVRShhbGVydENhbGxiYWNrRGF0YS5jYWxsZWQpOwogCiAgICAgYWxlcnRIVE1MID0g IjwhZG9jdHlwZSBodG1sPjxib2R5IG9ubG9hZD1cImFsZXJ0KCk7XCI+PC9ib2R5PiI7CiAgICAg YWxlcnRDYWxsYmFja0RhdGEuZXhwZWN0ZWRNZXNzYWdlID0gInVuZGVmaW5lZCI7CiAgICAgYWxl cnRDYWxsYmFja0RhdGEuY2FsbGVkID0gZmFsc2U7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdf bG9hZCh3ZWJWaWV3KCksIGFsZXJ0SFRNTCwgMCwgMCk7CiAgICAgRVhQRUNUX1RSVUUod2FpdFVu dGlsTG9hZEZpbmlzaGVkKCkpOwotICAgIEVYUEVDVF9FUSh0cnVlLCBhbGVydENhbGxiYWNrRGF0 YS5jYWxsZWQpOworICAgIEVYUEVDVF9UUlVFKGFsZXJ0Q2FsbGJhY2tEYXRhLmNhbGxlZCk7CiAK ICAgICBld2tWaWV3Q2xhc3MoKS0+cnVuX2phdmFzY3JpcHRfYWxlcnQgPSAwOwogCiAgICAgYWxl cnRDYWxsYmFja0RhdGEuY2FsbGVkID0gZmFsc2U7CiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdf bG9hZCh3ZWJWaWV3KCksIGFsZXJ0SFRNTCwgMCwgMCk7CiAgICAgRVhQRUNUX1RSVUUod2FpdFVu dGlsTG9hZEZpbmlzaGVkKCkpOwotICAgIEVYUEVDVF9FUShmYWxzZSwgYWxlcnRDYWxsYmFja0Rh dGEuY2FsbGVkKTsKKyAgICBFWFBFQ1RfRkFMU0UoYWxlcnRDYWxsYmFja0RhdGEuY2FsbGVkKTsK IH0KIAogc3RhdGljIEVpbmFfQm9vbCBjaGVja0NvbmZpcm0oRXdrX1ZpZXdfU21hcnRfRGF0YSos IGNvbnN0IGNoYXIqIG1lc3NhZ2UpCkBAIC00ODAsNyArNDgwLDcgQEAgVEVTVF9GKEVXSzJVbml0 VGVzdEJhc2UsIGV3a192aWV3X3J1bl9qYXZhc2NyaXB0X2NvbmZpcm0pCiAgICAgZXdrX3ZpZXdf aHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGNvbmZpcm1IVE1MLCAwLCAwKTsKICAgICBFWFBF Q1RfVFJVRSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbygidHJ1ZSIpKTsKICAgICBFWFBFQ1RfU1RS RVEoInRydWUiLCBld2tfdmlld190aXRsZV9nZXQod2ViVmlldygpKSk7Ci0gICAgRVhQRUNUX0VR KHRydWUsIGNvbmZpcm1DYWxsYmFja0RhdGEuY2FsbGVkKTsKKyAgICBFWFBFQ1RfVFJVRShjb25m aXJtQ2FsbGJhY2tEYXRhLmNhbGxlZCk7CiAKICAgICBjb25maXJtQ2FsbGJhY2tEYXRhLmV4cGVj dGVkTWVzc2FnZSA9ICJDb25maXJtIG1lc3NhZ2UiOwogICAgIGNvbmZpcm1DYWxsYmFja0RhdGEu cmVzdWx0ID0gZmFsc2U7CkBAIC00ODgsNyArNDg4LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJh c2UsIGV3a192aWV3X3J1bl9qYXZhc2NyaXB0X2NvbmZpcm0pCiAgICAgZXdrX3ZpZXdfaHRtbF9z dHJpbmdfbG9hZCh3ZWJWaWV3KCksIGNvbmZpcm1IVE1MLCAwLCAwKTsKICAgICBFWFBFQ1RfVFJV RSh3YWl0VW50aWxUaXRsZUNoYW5nZWRUbygiZmFsc2UiKSk7CiAgICAgRVhQRUNUX1NUUkVRKCJm YWxzZSIsIGV3a192aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsKLSAgICBFWFBFQ1RfRVEodHJ1 ZSwgY29uZmlybUNhbGxiYWNrRGF0YS5jYWxsZWQpOworICAgIEVYUEVDVF9UUlVFKGNvbmZpcm1D YWxsYmFja0RhdGEuY2FsbGVkKTsKIAogICAgIGNvbmZpcm1IVE1MID0gIjwhZG9jdHlwZSBodG1s Pjxib2R5IG9ubG9hZD1cImRvY3VtZW50LnRpdGxlID0gY29uZmlybSgnJyk7XCI+PC9ib2R5PiI7 CiAgICAgY29uZmlybUNhbGxiYWNrRGF0YS5leHBlY3RlZE1lc3NhZ2UgPSAiIjsKQEAgLTQ5Nyw3 ICs0OTcsNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfcnVuX2phdmFzY3Jp cHRfY29uZmlybSkKICAgICBld2tfdmlld19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgY29u ZmlybUhUTUwsIDAsIDApOwogICAgIEVYUEVDVF9UUlVFKHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRv KCJ0cnVlIikpOwogICAgIEVYUEVDVF9TVFJFUSgidHJ1ZSIsIGV3a192aWV3X3RpdGxlX2dldCh3 ZWJWaWV3KCkpKTsKLSAgICBFWFBFQ1RfRVEodHJ1ZSwgY29uZmlybUNhbGxiYWNrRGF0YS5jYWxs ZWQpOworICAgIEVYUEVDVF9UUlVFKGNvbmZpcm1DYWxsYmFja0RhdGEuY2FsbGVkKTsKIAogICAg IGNvbmZpcm1IVE1MID0gIjwhZG9jdHlwZSBodG1sPjxib2R5IG9ubG9hZD1cImRvY3VtZW50LnRp dGxlID0gY29uZmlybShudWxsKTtcIj48L2JvZHk+IjsKICAgICBjb25maXJtQ2FsbGJhY2tEYXRh LmV4cGVjdGVkTWVzc2FnZSA9ICJudWxsIjsKQEAgLTUwNiw3ICs1MDYsNyBAQCBURVNUX0YoRVdL MlVuaXRUZXN0QmFzZSwgZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfY29uZmlybSkKICAgICBld2tf dmlld19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgY29uZmlybUhUTUwsIDAsIDApOwogICAg IEVYUEVDVF9UUlVFKHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKCJ0cnVlIikpOwogICAgIEVYUEVD VF9TVFJFUSgidHJ1ZSIsIGV3a192aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsKLSAgICBFWFBF Q1RfRVEodHJ1ZSwgY29uZmlybUNhbGxiYWNrRGF0YS5jYWxsZWQpOworICAgIEVYUEVDVF9UUlVF KGNvbmZpcm1DYWxsYmFja0RhdGEuY2FsbGVkKTsKIAogICAgIGNvbmZpcm1IVE1MID0gIjwhZG9j dHlwZSBodG1sPjxib2R5IG9ubG9hZD1cImRvY3VtZW50LnRpdGxlID0gY29uZmlybSgpO1wiPjwv Ym9keT4iOwogICAgIGNvbmZpcm1DYWxsYmFja0RhdGEuZXhwZWN0ZWRNZXNzYWdlID0gInVuZGVm aW5lZCI7CkBAIC01MTUsNyArNTE1LDcgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192 aWV3X3J1bl9qYXZhc2NyaXB0X2NvbmZpcm0pCiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9h ZCh3ZWJWaWV3KCksIGNvbmZpcm1IVE1MLCAwLCAwKTsKICAgICBFWFBFQ1RfVFJVRSh3YWl0VW50 aWxUaXRsZUNoYW5nZWRUbygidHJ1ZSIpKTsKICAgICBFWFBFQ1RfU1RSRVEoInRydWUiLCBld2tf dmlld190aXRsZV9nZXQod2ViVmlldygpKSk7Ci0gICAgRVhQRUNUX0VRKHRydWUsIGNvbmZpcm1D YWxsYmFja0RhdGEuY2FsbGVkKTsKKyAgICBFWFBFQ1RfVFJVRShjb25maXJtQ2FsbGJhY2tEYXRh LmNhbGxlZCk7CiAKICAgICBld2tWaWV3Q2xhc3MoKS0+cnVuX2phdmFzY3JpcHRfY29uZmlybSA9 IDA7CiAKQEAgLTUyMyw3ICs1MjMsNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3Zp ZXdfcnVuX2phdmFzY3JpcHRfY29uZmlybSkKICAgICBld2tfdmlld19odG1sX3N0cmluZ19sb2Fk KHdlYlZpZXcoKSwgY29uZmlybUhUTUwsIDAsIDApOwogICAgIEVYUEVDVF9UUlVFKHdhaXRVbnRp bFRpdGxlQ2hhbmdlZFRvKCJmYWxzZSIpKTsKICAgICBFWFBFQ1RfU1RSRVEoImZhbHNlIiwgZXdr X3ZpZXdfdGl0bGVfZ2V0KHdlYlZpZXcoKSkpOwotICAgIEVYUEVDVF9FUShmYWxzZSwgY29uZmly bUNhbGxiYWNrRGF0YS5jYWxsZWQpOworICAgIEVYUEVDVF9GQUxTRShjb25maXJtQ2FsbGJhY2tE YXRhLmNhbGxlZCk7CiB9CiAKIHN0YXRpYyBjb25zdCBjaGFyKiBjaGVja1Byb21wdChFd2tfVmll d19TbWFydF9EYXRhKiwgY29uc3QgY2hhciogbWVzc2FnZSwgY29uc3QgY2hhciogZGVmYXVsdFZh bHVlKQpAQCAtNTUzLDcgKzU1Myw3IEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmll d19ydW5famF2YXNjcmlwdF9wcm9tcHQpCiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3 ZWJWaWV3KCksIHByb21wdEhUTUwsIDAsIDApOwogICAgIEVYUEVDVF9UUlVFKHdhaXRVbnRpbFRp dGxlQ2hhbmdlZFRvKHByb21wdFJlc3VsdCkpOwogICAgIEVYUEVDVF9TVFJFUShwcm9tcHRSZXN1 bHQsIGV3a192aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsKLSAgICBFWFBFQ1RfRVEodHJ1ZSwg cHJvbXB0Q2FsbGJhY2tEYXRhLmNhbGxlZCk7CisgICAgRVhQRUNUX1RSVUUocHJvbXB0Q2FsbGJh Y2tEYXRhLmNhbGxlZCk7CiAKICAgICBwcm9tcHRIVE1MID0gIjwhZG9jdHlwZSBodG1sPjxib2R5 IG9ubG9hZD1cImRvY3VtZW50LnRpdGxlID0gcHJvbXB0KCdQcm9tcHQgbWVzc2FnZScsICcnKTtc Ij48L2JvZHk+IjsKICAgICBwcm9tcHRDYWxsYmFja0RhdGEuZXhwZWN0ZWRNZXNzYWdlID0gcHJv bXB0TWVzc2FnZTsKQEAgLTU2Myw3ICs1NjMsNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwg ZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0KQogICAgIGV3a192aWV3X2h0bWxfc3RyaW5n X2xvYWQod2ViVmlldygpLCBwcm9tcHRIVE1MLCAwLCAwKTsKICAgICBFWFBFQ1RfVFJVRSh3YWl0 VW50aWxUaXRsZUNoYW5nZWRUbyhwcm9tcHRSZXN1bHQpKTsKICAgICBFWFBFQ1RfU1RSRVEocHJv bXB0UmVzdWx0LCBld2tfdmlld190aXRsZV9nZXQod2ViVmlldygpKSk7Ci0gICAgRVhQRUNUX0VR KHRydWUsIHByb21wdENhbGxiYWNrRGF0YS5jYWxsZWQpOworICAgIEVYUEVDVF9UUlVFKHByb21w dENhbGxiYWNrRGF0YS5jYWxsZWQpOwogCiAgICAgcHJvbXB0SFRNTCA9ICI8IWRvY3R5cGUgaHRt bD48Ym9keSBvbmxvYWQ9XCJkb2N1bWVudC50aXRsZSA9IHByb21wdCgnUHJvbXB0IG1lc3NhZ2Un KTtcIj48L2JvZHk+IjsKICAgICBwcm9tcHRDYWxsYmFja0RhdGEuZXhwZWN0ZWRNZXNzYWdlID0g cHJvbXB0TWVzc2FnZTsKQEAgLTU3Myw3ICs1NzMsNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFz ZSwgZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0KQogICAgIGV3a192aWV3X2h0bWxfc3Ry aW5nX2xvYWQod2ViVmlldygpLCBwcm9tcHRIVE1MLCAwLCAwKTsKICAgICBFWFBFQ1RfVFJVRSh3 YWl0VW50aWxUaXRsZUNoYW5nZWRUbyhwcm9tcHRSZXN1bHQpKTsKICAgICBFWFBFQ1RfU1RSRVEo cHJvbXB0UmVzdWx0LCBld2tfdmlld190aXRsZV9nZXQod2ViVmlldygpKSk7Ci0gICAgRVhQRUNU X0VRKHRydWUsIHByb21wdENhbGxiYWNrRGF0YS5jYWxsZWQpOworICAgIEVYUEVDVF9UUlVFKHBy b21wdENhbGxiYWNrRGF0YS5jYWxsZWQpOwogCiAgICAgcHJvbXB0SFRNTCA9ICI8IWRvY3R5cGUg aHRtbD48Ym9keSBvbmxvYWQ9XCJkb2N1bWVudC50aXRsZSA9IHByb21wdCgnJyk7XCI+PC9ib2R5 PiI7CiAgICAgcHJvbXB0Q2FsbGJhY2tEYXRhLmV4cGVjdGVkTWVzc2FnZSA9ICIiOwpAQCAtNTgz LDcgKzU4Myw3IEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19ydW5famF2YXNj cmlwdF9wcm9tcHQpCiAgICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIHBy b21wdEhUTUwsIDAsIDApOwogICAgIEVYUEVDVF9UUlVFKHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRv KHByb21wdFJlc3VsdCkpOwogICAgIEVYUEVDVF9TVFJFUShwcm9tcHRSZXN1bHQsIGV3a192aWV3 X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsKLSAgICBFWFBFQ1RfRVEodHJ1ZSwgcHJvbXB0Q2FsbGJh Y2tEYXRhLmNhbGxlZCk7CisgICAgRVhQRUNUX1RSVUUocHJvbXB0Q2FsbGJhY2tEYXRhLmNhbGxl ZCk7CiAKICAgICBwcm9tcHRIVE1MID0gIjwhZG9jdHlwZSBodG1sPjxib2R5IG9ubG9hZD1cImRv Y3VtZW50LnRpdGxlID0gcHJvbXB0KCk7XCI+PC9ib2R5PiI7CiAgICAgcHJvbXB0Q2FsbGJhY2tE YXRhLmV4cGVjdGVkTWVzc2FnZSA9ICJ1bmRlZmluZWQiOwpAQCAtNTkzLDcgKzU5Myw3IEBAIFRF U1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfdmlld19ydW5famF2YXNjcmlwdF9wcm9tcHQpCiAg ICAgZXdrX3ZpZXdfaHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIHByb21wdEhUTUwsIDAsIDAp OwogICAgIEVYUEVDVF9UUlVFKHdhaXRVbnRpbFRpdGxlQ2hhbmdlZFRvKHByb21wdFJlc3VsdCkp OwogICAgIEVYUEVDVF9TVFJFUShwcm9tcHRSZXN1bHQsIGV3a192aWV3X3RpdGxlX2dldCh3ZWJW aWV3KCkpKTsKLSAgICBFWFBFQ1RfRVEodHJ1ZSwgcHJvbXB0Q2FsbGJhY2tEYXRhLmNhbGxlZCk7 CisgICAgRVhQRUNUX1RSVUUocHJvbXB0Q2FsbGJhY2tEYXRhLmNhbGxlZCk7CiAKICAgICBwcm9t cHRIVE1MID0gIjxodG1sPjxoZWFkPjx0aXRsZT5EZWZhdWx0IHRpdGxlPC90aXRsZT48L2hlYWQ+ IgogICAgICAgICAgICAgICAgICAiPGJvZHkgb25sb2FkPVwidmFyIHByb21wdFJlc3VsdCA9IHBy b21wdCgnUHJvbXB0IG1lc3NhZ2UnKTsiCkBAIC02MDYsNyArNjA2LDcgQEAgVEVTVF9GKEVXSzJV bml0VGVzdEJhc2UsIGV3a192aWV3X3J1bl9qYXZhc2NyaXB0X3Byb21wdCkKICAgICBld2tfdmll d19odG1sX3N0cmluZ19sb2FkKHdlYlZpZXcoKSwgcHJvbXB0SFRNTCwgMCwgMCk7CiAgICAgRVhQ RUNUX1RSVUUod2FpdFVudGlsVGl0bGVDaGFuZ2VkVG8oIiIpKTsKICAgICBFWFBFQ1RfU1RSRVEo IiIsIGV3a192aWV3X3RpdGxlX2dldCh3ZWJWaWV3KCkpKTsKLSAgICBFWFBFQ1RfRVEodHJ1ZSwg cHJvbXB0Q2FsbGJhY2tEYXRhLmNhbGxlZCk7CisgICAgRVhQRUNUX1RSVUUocHJvbXB0Q2FsbGJh Y2tEYXRhLmNhbGxlZCk7CiAKICAgICBwcm9tcHRDYWxsYmFja0RhdGEuZXhwZWN0ZWRNZXNzYWdl ID0gcHJvbXB0TWVzc2FnZTsKICAgICBwcm9tcHRDYWxsYmFja0RhdGEuZXhwZWN0ZWREZWZhdWx0 VmFsdWUgPSAiIjsKQEAgLTYxNSw3ICs2MTUsNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwg ZXdrX3ZpZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0KQogICAgIGV3a192aWV3X2h0bWxfc3RyaW5n X2xvYWQod2ViVmlldygpLCBwcm9tcHRIVE1MLCAwLCAwKTsKICAgICBFWFBFQ1RfVFJVRSh3YWl0 VW50aWxUaXRsZUNoYW5nZWRUbygibnVsbCIpKTsKICAgICBFWFBFQ1RfU1RSRVEoIm51bGwiLCBl d2tfdmlld190aXRsZV9nZXQod2ViVmlldygpKSk7Ci0gICAgRVhQRUNUX0VRKHRydWUsIHByb21w dENhbGxiYWNrRGF0YS5jYWxsZWQpOworICAgIEVYUEVDVF9UUlVFKHByb21wdENhbGxiYWNrRGF0 YS5jYWxsZWQpOwogCiAgICAgZXdrVmlld0NsYXNzKCktPnJ1bl9qYXZhc2NyaXB0X3Byb21wdCA9 IDA7CiAKQEAgLTYyMyw3ICs2MjMsNyBAQCBURVNUX0YoRVdLMlVuaXRUZXN0QmFzZSwgZXdrX3Zp ZXdfcnVuX2phdmFzY3JpcHRfcHJvbXB0KQogICAgIGV3a192aWV3X2h0bWxfc3RyaW5nX2xvYWQo d2ViVmlldygpLCBwcm9tcHRIVE1MLCAwLCAwKTsKICAgICBFWFBFQ1RfVFJVRSh3YWl0VW50aWxU aXRsZUNoYW5nZWRUbygibnVsbCIpKTsKICAgICBFWFBFQ1RfU1RSRVEoIm51bGwiLCBld2tfdmll d190aXRsZV9nZXQod2ViVmlldygpKSk7Ci0gICAgRVhQRUNUX0VRKGZhbHNlLCBwcm9tcHRDYWxs YmFja0RhdGEuY2FsbGVkKTsKKyAgICBFWFBFQ1RfRkFMU0UocHJvbXB0Q2FsbGJhY2tEYXRhLmNh bGxlZCk7CiB9CiAKICNpZiBFTkFCTEUoSU5QVVRfVFlQRV9DT0xPUikK