111346 2013-03-04 10:37:29 -0800 [GTK] Some WebKit2 GTK+ unit tests are failing in 32 bits bot 2013-03-04 11:34:10 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned gustavo mrobinson webkit.review.bot xan.lopez oldest_to_newest 846614 0 cgarcia 2013-03-04 10:37:29 -0800 The problem is the use of a temporary CString object in the macro g_assert_cmpstr. It's a common mistake because we usually forget that g_assert_cmpstr is not a function but a macro, that expands to multiple lines. Some examples: ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp:277:void assertThatUserAgentIsSentInHeaders(WebViewTest*, const WTF::CString&): assertion failed (convertWebViewMainResourceDataToCString(test).data() == userAgent.data()): ("\021r\241\006lla/5.0 (X11; Linux i686) AppleWebKit/537.30 (KHTML, like Gecko) Chromium/25.0.1349.2 Chrome/25.0.1349.2 Safari/537.30" == "Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.30 (KHTML, like Gecko) Chromium/25.0.1349.2 Chrome/25.0.1349.2 Safari/537.30") ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp:207:void testGetFaviconURI(FaviconDatabaseTest*, gconstpointer): assertion failed (iconURI.get() == kServer->getURIForPath("/icon/favicon.ico").data()): (NULL == "q\354\317\006://127.0.0.1:55917/icon/favicon.ico") And there are more cases, sometimes the memory is not overwritten yet when the comparison happens, and the test passes. 846620 1 191269 cgarcia 2013-03-04 10:42:10 -0800 Created attachment 191269 Patch 846624 2 webkit.review.bot 2013-03-04 10:44:06 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 846625 3 webkit.review.bot 2013-03-04 10:44:20 -0800 Attachment 191269 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/UIProcess/API/gtk/tests/TestDownloads.cpp', u'Source/WebKit2/UIProcess/API/gtk/tests/TestInspectorServer.cpp', u'Source/WebKit2/UIProcess/API/gtk/tests/TestLoaderClient.cpp', u'Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h', u'Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp', u'Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFaviconDatabase.cpp', u'Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitSettings.cpp']" exit_code: 1 Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h:44: More than one command on the same line [whitespace/newline] [4] Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h:45: Else clause should never be on same line as else (use 2 lines) [whitespace/newline] [4] Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h:45: More than one command on the same line in if [whitespace/parens] [4] Source/WebKit2/UIProcess/API/gtk/tests/TestMain.h:47: preprocessor directives (e.g., #ifdef, #define, #import) should never be indented. [whitespace/indent] [4] Total errors found: 4 in 8 files If any of these errors are false positives, please file a bug against check-webkit-style. 846637 4 191269 mrobinson 2013-03-04 10:58:19 -0800 Comment on attachment 191269 Patch Looks good for now. Later we probably want to replace all g_assert_cmpstr with a templatized function we can use everywhere. 846668 5 191269 webkit.review.bot 2013-03-04 11:34:07 -0800 Comment on attachment 191269 Patch Clearing flags on attachment: 191269 Committed r144652: <http://trac.webkit.org/changeset/144652> 846669 6 webkit.review.bot 2013-03-04 11:34:10 -0800 All reviewed patches have been landed. Closing bug. 191269 2013-03-04 10:42:10 -0800 2013-03-04 11:34:07 -0800 Patch wk2-assert-cmpcstring.diff text/plain 8792 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiOTY5N2VkLi5jM2M4NDA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMg QEAKKzIwMTMtMDMtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFNvbWUgV2ViS2l0MiBHVEsrIHVuaXQgdGVzdHMgYXJlIGZhaWxp bmcgaW4gMzIgYml0cyBib3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMTM0NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRoZSBwcm9ibGVtIGlzIHRoZSB1c2Ugb2YgYSB0ZW1wb3JhcnkgQ1N0cmluZyBv YmplY3QgaW4gdGhlIG1hY3JvCisgICAgICAgIGdfYXNzZXJ0X2NtcHN0ci4gSXQncyBhIGNvbW1v biBtaXN0YWtlIGJlY2F1c2Ugd2UgdXN1YWxseSBmb3JnZXQKKyAgICAgICAgdGhhdCBnX2Fzc2Vy dF9jbXBzdHIgaXMgbm90IGEgZnVuY3Rpb24gYnV0IGEgbWFjcm8sIHRoYXQgZXhwYW5kcworICAg ICAgICB0byBtdWx0aXBsZSBsaW5lcy4gVGhpcyBwYXRjaCBhZGRzIGEgbmV3IG1hY3JvIEFTU0VS VF9DTVBfQ1NUUklORworICAgICAgICB3aXRoIHRoZSBzYW1lIGltcGxlbWVudGF0aW9uIHRoYXQg Z19hc3NlcnRfY21wc3RyLCBidXQgdXNpbmcKKyAgICAgICAgQ1N0cmluZ3MgaW5zdGVhZCBvZiBj b25zdCBjaGFyKi4gSXQgZml4ZXMgYWxsIHRoZSBjYXNlcyB3aGVyZSBhCisgICAgICAgIHRlbXBv cmFyeSBDU3RyaW5nIHdhcyB1c2VkIGluIGdfYXNzZXJ0X2NtcHN0ciwgYW5kIHVzZXMgdGhlIG5l dworICAgICAgICBtYWNybyBhbHNvIGZvciB0aGUgY2FzZXMgd2hlcmUgd2Ugd2VyZSBjYWNoaW5n IHRoZSBDU3RyaW5nIGp1c3QKKyAgICAgICAgZm9yIGdfYXNzZXJ0X2NtcHN0ci4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3REb3dubG9hZHMuY3BwOgorICAgICAgICAo dGVzdERvd25sb2FkUmVtb3RlRmlsZSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVz dHMvVGVzdEluc3BlY3RvclNlcnZlci5jcHA6CisgICAgICAgICh0ZXN0SW5zcGVjdG9yU2VydmVy UGFnZUxpc3QpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RMb2FkZXJD bGllbnQuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RNYWluLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHA6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFz ZS5jcHA6CisgICAgICAgICh0ZXN0R2V0RmF2aWNvblVSSSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFNldHRpbmdzLmNwcDoKKyAgICAgICAgKGFzc2VydFRo YXRVc2VyQWdlbnRJc1NlbnRJbkhlYWRlcnMpOgorICAgICAgICAodGVzdFdlYktpdFNldHRpbmdz VXNlckFnZW50KToKKwogMjAxMy0wMy0wNCAgTWFudWVsIFJlZ28gQ2FzYXNub3ZhcyAgPHJlZ29A aWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXSzJdIEFkZCBkb2N1bWVudC1sb2FkZWQgc2ln bmFsIHRvIFdlYktpdFdlYlBhZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL3Rlc3RzL1Rlc3REb3dubG9hZHMuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvdGVzdHMvVGVzdERvd25sb2Fkcy5jcHAKaW5kZXggNTZhNjJjZC4uOWE5ZjU1 YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVz dERvd25sb2Fkcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVz dHMvVGVzdERvd25sb2Fkcy5jcHAKQEAgLTM0MSw4ICszNDEsNyBAQCBzdGF0aWMgdm9pZCB0ZXN0 RG93bmxvYWRSZW1vdGVGaWxlKERvd25sb2FkVGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIAog ICAgIFdlYktpdFVSSVJlcXVlc3QqIHJlcXVlc3QgPSB3ZWJraXRfZG93bmxvYWRfZ2V0X3JlcXVl c3QoZG93bmxvYWQuZ2V0KCkpOwogICAgIGdfYXNzZXJ0KHJlcXVlc3QpOwotICAgIENTdHJpbmcg cmVxdWVzdFVSSSA9IGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi90ZXN0LnBkZiIpOwotICAgIGdf YXNzZXJ0X2NtcHN0cih3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSwgPT0sIHJl cXVlc3RVUkkuZGF0YSgpKTsKKyAgICBBU1NFUlRfQ01QX0NTVFJJTkcod2Via2l0X3VyaV9yZXF1 ZXN0X2dldF91cmkocmVxdWVzdCksID09LCBrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvdGVzdC5w ZGYiKSk7CiAKICAgICBnX2Fzc2VydCh3ZWJraXRfZG93bmxvYWRfZ2V0X2Rlc3RpbmF0aW9uKGRv d25sb2FkLmdldCgpKSk7CiAgICAgZ19hc3NlcnRfY21wZmxvYXQod2Via2l0X2Rvd25sb2FkX2dl dF9lc3RpbWF0ZWRfcHJvZ3Jlc3MoZG93bmxvYWQuZ2V0KCkpLCA9PSwgMSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yU2Vy dmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RJbnNw ZWN0b3JTZXJ2ZXIuY3BwCmluZGV4IDMwZDhmYWMuLjQ4YjRlMmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RJbnNwZWN0b3JTZXJ2ZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RJbnNwZWN0 b3JTZXJ2ZXIuY3BwCkBAIC0xOTAsNyArMTkwLDcgQEAgc3RhdGljIHZvaWQgdGVzdEluc3BlY3Rv clNlcnZlclBhZ2VMaXN0KEluc3BlY3RvclNlcnZlclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIK ICAgICBnX2Fzc2VydCghZXJyb3IuZ2V0KCkpOwogICAgIHZhbHVlU3RyaW5nLnNldChXZWJWaWV3 VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmluZyhqYXZhc2NyaXB0UmVzdWx0KSk7CiAgICAg U3RyaW5nIHZhbGlkSW5zcGVjdG9yVVJMID0gU3RyaW5nKCIvd2ViaW5zcGVjdG9yL2luc3BlY3Rv ci5odG1sP3BhZ2U9IikgKyBTdHJpbmc6Om51bWJlcihwYWdlSWQpOwotICAgIGdfYXNzZXJ0X2Nt cHN0cih2YWx1ZVN0cmluZy5nZXQoKSwgPT0sIHZhbGlkSW5zcGVjdG9yVVJMLnV0ZjgoKS5kYXRh KCkpOworICAgIEFTU0VSVF9DTVBfQ1NUUklORyh2YWx1ZVN0cmluZy5nZXQoKSwgPT0sIHZhbGlk SW5zcGVjdG9yVVJMLnV0ZjgoKSk7CiB9CiAKIC8vIFRlc3Qgc2VuZGluZyBhIHJhdyByZW1vdGUg ZGVidWdnaW5nIG1lc3NhZ2UgdGhyb3VnaCBvdXIgd2ViIHNvY2tldCBzZXJ2ZXIuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0TG9hZGVyQ2xp ZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RMb2Fk ZXJDbGllbnQuY3BwCmluZGV4IDhmY2YzMzAuLjQyYzZiNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RMb2FkZXJDbGllbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RMb2FkZXJDbGllbnQu Y3BwCkBAIC0yMTQsOSArMjE0LDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICB2b2lkIGNoZWNr QWN0aXZlVVJJKGNvbnN0IGNoYXIqIHVyaSkKICAgICB7Ci0gICAgICAgIC8vIGdfYXNzZXJ0X2Nt cHN0ciBpcyBhIG1hY3JvLCBzbyB3ZSBuZWVkIHRvIGNhY2hlIHRoZSB0ZW1wb3Jhcnkgc3RyaW5n LgotICAgICAgICBDU3RyaW5nIHNlcnZlclVSSSA9IGtTZXJ2ZXItPmdldFVSSUZvclBhdGgodXJp KTsKLSAgICAgICAgZ19hc3NlcnRfY21wc3RyKG1fYWN0aXZlVVJJLmRhdGEoKSwgPT0sIHNlcnZl clVSSS5kYXRhKCkpOworICAgICAgICBBU1NFUlRfQ01QX0NTVFJJTkcobV9hY3RpdmVVUkksID09 LCBrU2VydmVyLT5nZXRVUklGb3JQYXRoKHVyaSkpOwogICAgIH0KIH07CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RNYWluLmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0TWFpbi5oCmluZGV4IDZmZTlk ZTguLjQ4ZGE3MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L3Rlc3RzL1Rlc3RNYWluLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv dGVzdHMvVGVzdE1haW4uaApAQCAtNDAsNiArNDAsMTIgQEAKICAgICAgICAgZ190ZXN0X2FkZCh0 ZXN0UGF0aC5nZXQoKSwgQ2xhc3NOYW1lLCAwLCBDbGFzc05hbWU6OnNldFVwLCB0ZXN0RnVuYywg Q2xhc3NOYW1lOjp0ZWFyRG93bik7IFwKICAgICB9CiAKKyNkZWZpbmUgQVNTRVJUX0NNUF9DU1RS SU5HKHMxLCBjbXAsIHMyKSBcCisgICAgZG8geyBDU3RyaW5nIF9fczEgPSAoczEpOyBDU3RyaW5n IF9fczIgPSAoczIpOyBcCisgICAgICAgIGlmIChnX3N0cmNtcDAoX19zMS5kYXRhKCksIF9fczIu ZGF0YSgpKSBjbXAgMCkgOyBlbHNlIFwKKyAgICAgICAgICAgIGdfYXNzZXJ0aW9uX21lc3NhZ2Vf Y21wc3RyKEdfTE9HX0RPTUFJTiwgX19GSUxFX18sIF9fTElORV9fLCBHX1NUUkZVTkMsIFwKKyAg ICAgICAgICAgICAgICAjczEgIiAiICNjbXAgIiAiICNzMiwgX19zMS5kYXRhKCksICNjbXAsIF9f czIuZGF0YSgpKTsgfSB3aGlsZSAoMCkKKwogY2xhc3MgVGVzdCB7CiBwdWJsaWM6CiAgICAgTUFL RV9HTElCX1RFU1RfRklYVFVSRShUZXN0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RSZXNvdXJjZXMuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKaW5kZXggYzA2NDNiZi4u NmExMjgzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVz dHMvVGVzdFJlc291cmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9n dGsvdGVzdHMvVGVzdFJlc291cmNlcy5jcHAKQEAgLTUwMyw5ICs1MDMsNyBAQCBwdWJsaWM6CiBw cml2YXRlOgogICAgIHZvaWQgY2hlY2tBY3RpdmVVUkkoY29uc3QgY2hhciogdXJpKQogICAgIHsK LSAgICAgICAgLy8gZ19hc3NlcnRfY21wc3RyIGlzIGEgbWFjcm8sIHNvIHdlIG5lZWQgdG8gY2Fj aGUgdGhlIHRlbXBvcmFyeSBzdHJpbmcuCi0gICAgICAgIENTdHJpbmcgc2VydmVyVVJJID0ga1Nl cnZlci0+Z2V0VVJJRm9yUGF0aCh1cmkpOwotICAgICAgICBnX2Fzc2VydF9jbXBzdHIobV9hY3Rp dmVVUkkuZGF0YSgpLCA9PSwgc2VydmVyVVJJLmRhdGEoKSk7CisgICAgICAgIEFTU0VSVF9DTVBf Q1NUUklORyhtX2FjdGl2ZVVSSSwgPT0sIGtTZXJ2ZXItPmdldFVSSUZvclBhdGgodXJpKSk7CiAg ICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsv dGVzdHMvVGVzdFdlYktpdEZhdmljb25EYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcAppbmRleCBh YzEzZTRkLi5kNWYzMDc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0RmF2aWNvbkRhdGFiYXNlLmNw cApAQCAtMjAyLDkgKzIwMiw5IEBAIHN0YXRpYyB2b2lkIHRlc3RHZXRGYXZpY29uVVJJKEZhdmlj b25EYXRhYmFzZVRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiB7CiAgICAgV2ViS2l0RmF2aWNv bkRhdGFiYXNlKiBkYXRhYmFzZSA9IHdlYmtpdF93ZWJfY29udGV4dF9nZXRfZmF2aWNvbl9kYXRh YmFzZSh0ZXN0LT5tX3dlYkNvbnRleHQpOwogCi0gICAgY29uc3QgY2hhciogYmFzZVVSSSA9IGtT ZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9mb28iKS5kYXRhKCk7Ci0gICAgR093blB0cjxjaGFyPiBp Y29uVVJJKHdlYmtpdF9mYXZpY29uX2RhdGFiYXNlX2dldF9mYXZpY29uX3VyaShkYXRhYmFzZSwg YmFzZVVSSSkpOwotICAgIGdfYXNzZXJ0X2NtcHN0cihpY29uVVJJLmdldCgpLCA9PSwga1NlcnZl ci0+Z2V0VVJJRm9yUGF0aCgiL2ljb24vZmF2aWNvbi5pY28iKS5kYXRhKCkpOworICAgIENTdHJp bmcgYmFzZVVSSSA9IGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9mb28iKTsKKyAgICBHT3duUHRy PGNoYXI+IGljb25VUkkod2Via2l0X2Zhdmljb25fZGF0YWJhc2VfZ2V0X2Zhdmljb25fdXJpKGRh dGFiYXNlLCBiYXNlVVJJLmRhdGEoKSkpOworICAgIEFTU0VSVF9DTVBfQ1NUUklORyhpY29uVVJJ LmdldCgpLCA9PSwga1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL2ljb24vZmF2aWNvbi5pY28iKSk7 CiB9CiAKIHN0YXRpYyB2b2lkIHRlc3RXZWJWaWV3RmF2aWNvbihGYXZpY29uRGF0YWJhc2VUZXN0 KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggYzdh MGRjMi4uZjVhNDVkNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL3Rlc3RzL1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFNldHRpbmdzLmNwcApAQCAtMjc0LDcgKzI3 NCw3IEBAIHN0YXRpYyB2b2lkIGFzc2VydFRoYXRVc2VyQWdlbnRJc1NlbnRJbkhlYWRlcnMoV2Vi Vmlld1Rlc3QqIHRlc3QsIGNvbnN0IENTdHJpbmcmCiB7CiAgICAgdGVzdC0+bG9hZFVSSShnU2Vy dmVyLT5nZXRVUklGb3JQYXRoKCIvIikuZGF0YSgpKTsKICAgICB0ZXN0LT53YWl0VW50aWxMb2Fk RmluaXNoZWQoKTsKLSAgICBnX2Fzc2VydF9jbXBzdHIoY29udmVydFdlYlZpZXdNYWluUmVzb3Vy Y2VEYXRhVG9DU3RyaW5nKHRlc3QpLmRhdGEoKSwgPT0sIHVzZXJBZ2VudC5kYXRhKCkpOworICAg IEFTU0VSVF9DTVBfQ1NUUklORyhjb252ZXJ0V2ViVmlld01haW5SZXNvdXJjZURhdGFUb0NTdHJp bmcodGVzdCksID09LCB1c2VyQWdlbnQpOwogfQogCiBzdGF0aWMgdm9pZCB0ZXN0V2ViS2l0U2V0 dGluZ3NVc2VyQWdlbnQoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCkBAIC0zMDAs MTIgKzMwMCwxMiBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViS2l0U2V0dGluZ3NVc2VyQWdlbnQoV2Vi Vmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgYXNzZXJ0VGhhdFVzZXJBZ2VudElz U2VudEluSGVhZGVycyh0ZXN0LCBmdW5reVVzZXJBZ2VudCk7CiAKICAgICB3ZWJraXRfc2V0dGlu Z3Nfc2V0X3VzZXJfYWdlbnRfd2l0aF9hcHBsaWNhdGlvbl9kZXRhaWxzKHNldHRpbmdzLmdldCgp LCAiV2ViS2l0R1RLKyIsIDApOwotICAgIENTdHJpbmcgdXNlckFnZW50V2l0aE51bGxWZXJzaW9u ID0gd2Via2l0X3NldHRpbmdzX2dldF91c2VyX2FnZW50KHNldHRpbmdzLmdldCgpKTsKLSAgICBn X2Fzc2VydF9jbXBzdHIoZ19zdHJzdHJfbGVuKHVzZXJBZ2VudFdpdGhOdWxsVmVyc2lvbi5kYXRh KCksIC0xLCBkZWZhdWx0VXNlckFnZW50LmRhdGEoKSksID09LCB1c2VyQWdlbnRXaXRoTnVsbFZl cnNpb24uZGF0YSgpKTsKLSAgICBnX2Fzc2VydChnX3N0cnN0cl9sZW4odXNlckFnZW50V2l0aE51 bGxWZXJzaW9uLmRhdGEoKSwgLTEsICJXZWJLaXRHVEsrIikpOworICAgIGNvbnN0IGNoYXIqIHVz ZXJBZ2VudFdpdGhOdWxsVmVyc2lvbiA9IHdlYmtpdF9zZXR0aW5nc19nZXRfdXNlcl9hZ2VudChz ZXR0aW5ncy5nZXQoKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKGdfc3Ryc3RyX2xlbih1c2VyQWdl bnRXaXRoTnVsbFZlcnNpb24sIC0xLCBkZWZhdWx0VXNlckFnZW50LmRhdGEoKSksID09LCB1c2Vy QWdlbnRXaXRoTnVsbFZlcnNpb24pOworICAgIGdfYXNzZXJ0KGdfc3Ryc3RyX2xlbih1c2VyQWdl bnRXaXRoTnVsbFZlcnNpb24sIC0xLCAiV2ViS2l0R1RLKyIpKTsKIAogICAgIHdlYmtpdF9zZXR0 aW5nc19zZXRfdXNlcl9hZ2VudF93aXRoX2FwcGxpY2F0aW9uX2RldGFpbHMoc2V0dGluZ3MuZ2V0 KCksICJXZWJLaXRHVEsrIiwgIiIpOwotICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfc2V0dGlu Z3NfZ2V0X3VzZXJfYWdlbnQoc2V0dGluZ3MuZ2V0KCkpLCA9PSwgdXNlckFnZW50V2l0aE51bGxW ZXJzaW9uLmRhdGEoKSk7CisgICAgZ19hc3NlcnRfY21wc3RyKHdlYmtpdF9zZXR0aW5nc19nZXRf dXNlcl9hZ2VudChzZXR0aW5ncy5nZXQoKSksID09LCB1c2VyQWdlbnRXaXRoTnVsbFZlcnNpb24p OwogCiAgICAgd2Via2l0X3NldHRpbmdzX3NldF91c2VyX2FnZW50X3dpdGhfYXBwbGljYXRpb25f ZGV0YWlscyhzZXR0aW5ncy5nZXQoKSwgIldlYkNhdEdUSysiLCAiMy40LjUiKTsKICAgICBjb25z dCBjaGFyKiBuZXdVc2VyQWdlbnQgPSB3ZWJraXRfc2V0dGluZ3NfZ2V0X3VzZXJfYWdlbnQoc2V0 dGluZ3MuZ2V0KCkpOwo=