105866 2012-12-30 01:44:45 -0800 [GTK] TestInspectorServer unit test is timing out 2013-07-24 08:26:14 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 zan webkit-unassigned cgarcia commit-queue gustavo mrobinson obzhirov oldest_to_newest 798203 0 zan 2012-12-30 01:44:45 -0800 Both on release and debug builds. Will skip it. 810642 1 obzhirov 2013-01-18 08:43:24 -0800 Going check this one. Probably started to fail after GTK inspector server has been re-factored to Soup inspector server. 812267 2 obzhirov 2013-01-21 10:49:37 -0800 It does time out in debug mode - managed to reproduce it. Will debug tomorrow 907909 3 obzhirov 2013-07-12 05:27:49 -0700 Well, found out the problem finally - webinspector resources are not installed in default folder. Going to fix it now. 908357 4 206654 obzhirov 2013-07-15 03:57:36 -0700 Created attachment 206654 Patch 908358 5 commit-queue 2013-07-15 03:58:19 -0700 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 908403 6 206654 gustavo 2013-07-15 08:05:09 -0700 Comment on attachment 206654 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=206654&action=review r- because we should move copying of files to the build system > Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp:48 > + // Overwrite WEBKIT_INSPECTOR_SERVER_PATH variable to point to inspector resources folder. > + const gchar* inspectorResourcesPath = g_getenv("WEBKIT_INSPECTOR_PATH"); > + g_setenv("WEBKIT_INSPECTOR_SERVER_PATH", inspectorResourcesPath, TRUE); It makes sense to have this variable being set here, but when you say overwrite, do you mean the variable is already set but set to the wrong path? > Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp:55 > + // Copy inspectorPageIndex.html to inspector resources folder > + GOwnPtr<char> sourcePath(g_build_filename(WEBKIT_SRC_DIR, "Source", "WebKit2", "UIProcess", "InspectorServer", "front-end", "inspectorPageIndex.html", NULL)); > + GRefPtr<GFile> source = adoptGRef(g_file_new_for_path(sourcePath.get())); > + GOwnPtr<char> destinationPath(g_build_filename(inspectorResourcesPath, "inspectorPageIndex.html", NULL)); > + GRefPtr<GFile> destination = adoptGRef(g_file_new_for_path(destinationPath.get())); > + g_file_copy(source.get(), destination.get(), G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL); We should do this in the build system like we do for that other bits, instead. 908419 7 obzhirov 2013-07-15 08:51:58 -0700 (In reply to comment #6) > (From update of attachment 206654 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=206654&action=review > > r- because we should move copying of files to the build system > > > Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp:48 > > + // Overwrite WEBKIT_INSPECTOR_SERVER_PATH variable to point to inspector resources folder. > > + const gchar* inspectorResourcesPath = g_getenv("WEBKIT_INSPECTOR_PATH"); > > + g_setenv("WEBKIT_INSPECTOR_SERVER_PATH", inspectorResourcesPath, TRUE); > > It makes sense to have this variable being set here, but when you say overwrite, do you mean the variable is already set but set to the wrong path? No, it shouldn’t be set. But just in case if there is "leftover" after another test. It feels safer for me to overwrite it. > > > Source/WebKit2/UIProcess/API/gtk/tests/InspectorTestServer.cpp:55 > > + // Copy inspectorPageIndex.html to inspector resources folder > > + GOwnPtr<char> sourcePath(g_build_filename(WEBKIT_SRC_DIR, "Source", "WebKit2", "UIProcess", "InspectorServer", "front-end", "inspectorPageIndex.html", NULL)); > > + GRefPtr<GFile> source = adoptGRef(g_file_new_for_path(sourcePath.get())); > > + GOwnPtr<char> destinationPath(g_build_filename(inspectorResourcesPath, "inspectorPageIndex.html", NULL)); > > + GRefPtr<GFile> destination = adoptGRef(g_file_new_for_path(destinationPath.get())); > > + g_file_copy(source.get(), destination.get(), G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL); > > We should do this in the build system like we do for that other bits, instead. Yep, I will update GNUmakefile.am for WebKit2 to copy the file. 908420 8 cgarcia 2013-07-15 09:02:04 -0700 run-gtk-tests sets WEBKIT_INSPECTOR_PATH 908426 9 obzhirov 2013-07-15 09:12:36 -0700 (In reply to comment #8) > run-gtk-tests sets WEBKIT_INSPECTOR_PATH Yes, and then I use it to set WEBKIT_INSPECTOR_SERVER_PATH inside the test. Or you mean I should set WEBKIT_INSPECTOR_SERVER_PATH in run-gtk-tests as well? 908427 10 cgarcia 2013-07-15 09:18:01 -0700 (In reply to comment #9) > (In reply to comment #8) > > run-gtk-tests sets WEBKIT_INSPECTOR_PATH > Yes, and then I use it to set WEBKIT_INSPECTOR_SERVER_PATH inside the test. Or you mean I should set WEBKIT_INSPECTOR_SERVER_PATH in run-gtk-tests as well? Ah, SERVER_PATH, I see, sorry, I read too fast. I think it's fine to set it in the test then. 908905 11 206787 obzhirov 2013-07-16 09:00:59 -0700 Created attachment 206787 Patch 911298 12 206787 gustavo 2013-07-24 07:50:10 -0700 Comment on attachment 206787 Patch OK 911311 13 206787 commit-queue 2013-07-24 08:26:11 -0700 Comment on attachment 206787 Patch Clearing flags on attachment: 206787 Committed r153085: <http://trac.webkit.org/changeset/153085> 911312 14 commit-queue 2013-07-24 08:26:14 -0700 All reviewed patches have been landed. Closing bug. 206654 2013-07-15 03:57:36 -0700 2013-07-16 09:00:50 -0700 Patch bug-105866-20130715115716.patch text/plain 7785 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNjI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmEyYWViZTJmZTkzNTQ3 Yzg4YzUzYWNjNzIyOTdlOWVjYWI0YTM5My4uOTYwZDZhZDQzNTVkOWU5MWZlMjZmMTYwY2M4OTI2 NzQ0MTVjYWRiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEzLTA3LTE1ICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0dUS10gVGVz dEluc3BlY3RvclNlcnZlciB1bml0IHRlc3QgaXMgdGltaW5nIG91dAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODY2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHRlc3QgZmFpbGVkIGJlY2F1c2Ug aXQgY291bGRuJ3QgZmluZCBpbnNwZWN0b3IgcmVzb3VyY2VzIGluIGRlZmF1bHQgZm9sZGVyCisg ICAgICAgIChtYWtlIGluc3RhbGwgc3RlcCB3YXMgbWlzc2luZykuIEl0IHVzZXMgbm93IHJlc291 cmNlcyBhdmFpbGFibGUgaW4KKyAgICAgICAgV2ViS2l0QnVpbGQgZm9sZGVyLiBXZWJJbnNwZWN0 b3JTZXJ2ZXJHdGsgd2FzIHJlZmFjdG9yZWQgYXMgd2VsbCB0byBtYWtlCisgICAgICAgIGVhc2ll ciB0byB1c2UgV0VCS0lUX0lOU1BFQ1RPUl9TRVJWRVJfUEFUSCB2YXJpYWJsZS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL0luc3BlY3RvclRlc3RTZXJ2ZXIuY3BwOgorICAg ICAgICAobWFpbik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdEluc3Bl Y3RvclNlcnZlci5jcHA6CisgICAgICAgICh0ZXN0SW5zcGVjdG9yU2VydmVyUGFnZUxpc3QpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZl ckd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclNlcnZlcjo6cGxhdGZvcm1S ZXNvdXJjZUZvclBhdGgpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JTZXJ2ZXI6OmJ1 aWxkUGFnZUxpc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JTZXJ2ZXI6Omluc3Bl Y3RvclNlcnZlckZpbGVzUGF0aCk6CisKIDIwMTMtMDctMTUgIFNpbW9uIFBlbmEgIDxzaW1vbi5w ZW5hQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtHVEtdIFtXSzJdIENoZWNrIGlmIHRoZSBrZXlF dmVudFF1ZXVlIGlzIGVtcHR5IGluIFdlYlBhZ2VQcm94eTo6Z2V0RWRpdG9yQ29tbWFuZHNGb3JL ZXlFdmVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVz dHMvSW5zcGVjdG9yVGVzdFNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L2d0ay90ZXN0cy9JbnNwZWN0b3JUZXN0U2VydmVyLmNwcAppbmRleCBmMTNiMDQzZGYxNmQ4OWQw ZWJhMDQ3NzJmZjBmNDFjNmM4ZDk0YmFlLi41YTk3ZTU4ZDQ4ZTA0NjliODM5MWFlY2M0NTQ4ODU4 ZWU3Y2JkYmY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90 ZXN0cy9JbnNwZWN0b3JUZXN0U2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2d0ay90ZXN0cy9JbnNwZWN0b3JUZXN0U2VydmVyLmNwcApAQCAtMjYsNiArMjYsOCBA QAogCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogI2luY2x1ZGUgPHdlYmtpdDIvd2Via2l0Mi5oPgor I2luY2x1ZGUgPHd0Zi9nb2JqZWN0L0dPd25QdHIuaD4KKyNpbmNsdWRlIDx3dGYvZ29iamVjdC9H UmVmUHRyLmg+CiAKIHN0YXRpYyB2b2lkIGxvYWRDaGFuZ2VkQ2FsbGJhY2soV2ViS2l0V2ViVmll dyosIFdlYktpdExvYWRFdmVudCBsb2FkRXZlbnQsIGdwb2ludGVyKQogewpAQCAtNDAsNiArNDIs MTcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqKiBhcmd2KQogCiAgICAgLy8gT3ZlcndyaXRl IFdFQktJVF9JTlNQRUNUT1JfU0VSVkVSIHZhcmlhYmxlIHdpdGggZGVmYXVsdCB2YWx1ZS4KICAg ICBnX3NldGVudigiV0VCS0lUX0lOU1BFQ1RPUl9TRVJWRVIiLCAiMTI3LjAuMC4xOjI5OTkiLCBU UlVFKTsKKyAgICAKKyAgICAvLyBPdmVyd3JpdGUgV0VCS0lUX0lOU1BFQ1RPUl9TRVJWRVJfUEFU SCB2YXJpYWJsZSB0byBwb2ludCB0byBpbnNwZWN0b3IgcmVzb3VyY2VzIGZvbGRlci4KKyAgICBj b25zdCBnY2hhciogaW5zcGVjdG9yUmVzb3VyY2VzUGF0aCA9IGdfZ2V0ZW52KCJXRUJLSVRfSU5T UEVDVE9SX1BBVEgiKTsgICAgCisgICAgZ19zZXRlbnYoIldFQktJVF9JTlNQRUNUT1JfU0VSVkVS X1BBVEgiLCBpbnNwZWN0b3JSZXNvdXJjZXNQYXRoLCBUUlVFKTsKKworICAgIC8vIENvcHkgaW5z cGVjdG9yUGFnZUluZGV4Lmh0bWwgdG8gaW5zcGVjdG9yIHJlc291cmNlcyBmb2xkZXIKKyAgICBH T3duUHRyPGNoYXI+IHNvdXJjZVBhdGgoZ19idWlsZF9maWxlbmFtZShXRUJLSVRfU1JDX0RJUiwg IlNvdXJjZSIsICJXZWJLaXQyIiwgIlVJUHJvY2VzcyIsICJJbnNwZWN0b3JTZXJ2ZXIiLCAiZnJv bnQtZW5kIiwgImluc3BlY3RvclBhZ2VJbmRleC5odG1sIiwgTlVMTCkpOworICAgIEdSZWZQdHI8 R0ZpbGU+IHNvdXJjZSA9IGFkb3B0R1JlZihnX2ZpbGVfbmV3X2Zvcl9wYXRoKHNvdXJjZVBhdGgu Z2V0KCkpKTsKKyAgICBHT3duUHRyPGNoYXI+IGRlc3RpbmF0aW9uUGF0aChnX2J1aWxkX2ZpbGVu YW1lKGluc3BlY3RvclJlc291cmNlc1BhdGgsICJpbnNwZWN0b3JQYWdlSW5kZXguaHRtbCIsIE5V TEwpKTsKKyAgICBHUmVmUHRyPEdGaWxlPiBkZXN0aW5hdGlvbiA9IGFkb3B0R1JlZihnX2ZpbGVf bmV3X2Zvcl9wYXRoKGRlc3RpbmF0aW9uUGF0aC5nZXQoKSkpOworICAgIGdfZmlsZV9jb3B5KHNv dXJjZS5nZXQoKSwgZGVzdGluYXRpb24uZ2V0KCksIEdfRklMRV9DT1BZX09WRVJXUklURSwgTlVM TCwgTlVMTCwgTlVMTCwgTlVMTCk7IAogCiAgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IFdF QktJVF9XRUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3KCkpOwogICAgIHdlYmtpdF9zZXR0aW5n c19zZXRfZW5hYmxlX2RldmVsb3Blcl9leHRyYXMod2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5n cyh3ZWJWaWV3KSwgVFJVRSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yU2VydmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RJbnNwZWN0b3JTZXJ2ZXIuY3BwCmluZGV4IDkyYjdm MDBiZGI2MzEyNGVmNjEzMWYwNWVhNDI2NTY4OTIzNzdlNTAuLjM1ZmIzZmNkY2E0ZTM1MDc3MDQy YTZmNDgwY2U1NWY2MTExMTRlNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvZ3RrL3Rlc3RzL1Rlc3RJbnNwZWN0b3JTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RJbnNwZWN0b3JTZXJ2ZXIuY3BwCkBAIC0x ODQsNyArMTg0LDcgQEAgc3RhdGljIHZvaWQgdGVzdEluc3BlY3RvclNlcnZlclBhZ2VMaXN0KElu c3BlY3RvclNlcnZlclRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIKICAgICBnX2Fzc2VydChqYXZh c2NyaXB0UmVzdWx0KTsKICAgICBnX2Fzc2VydCghZXJyb3IuZ2V0KCkpOwogICAgIHZhbHVlU3Ry aW5nLnNldChXZWJWaWV3VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmluZyhqYXZhc2NyaXB0 UmVzdWx0KSk7Ci0gICAgU3RyaW5nIHZhbGlkSW5zcGVjdG9yVVJMID0gU3RyaW5nKCIvd2ViaW5z cGVjdG9yL2luc3BlY3Rvci5odG1sP3BhZ2U9IikgKyBTdHJpbmc6Om51bWJlcihwYWdlSWQpOwor ICAgIFN0cmluZyB2YWxpZEluc3BlY3RvclVSTCA9IFN0cmluZygiL2luc3BlY3Rvci5odG1sP3Bh Z2U9IikgKyBTdHJpbmc6Om51bWJlcihwYWdlSWQpOwogICAgIEFTU0VSVF9DTVBfQ1NUUklORyh2 YWx1ZVN0cmluZy5nZXQoKSwgPT0sIHZhbGlkSW5zcGVjdG9yVVJMLnV0ZjgoKSk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZ3RrL1dl Ykluc3BlY3RvclNlcnZlckd0ay5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVj dG9yU2VydmVyL2d0ay9XZWJJbnNwZWN0b3JTZXJ2ZXJHdGsuY3BwCmluZGV4IGMzMWY4MjAxM2Rh ZDU5YTQ2MWU3ZTEyZTQ3MmY3MTIzNWFmNWZjODguLjE5NGM4Y2I1YjIxNDFkYzQxZGU3N2MyYjBh NjNjYzgxNjBiMjM4NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNw ZWN0b3JTZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZlckd0ay5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9ndGsvV2ViSW5zcGVjdG9yU2VydmVyR3Rr LmNwcApAQCAtNDgsNyArNDgsNyBAQCBib29sIFdlYkluc3BlY3RvclNlcnZlcjo6cGxhdGZvcm1S ZXNvdXJjZUZvclBhdGgoY29uc3QgU3RyaW5nJiBwYXRoLCBWZWN0b3I8Y2hhcgogICAgIH0KIAog ICAgIC8vIFBvaW50IHRoZSBkZWZhdWx0IHBhdGggdG8gYSBmb3JtYXR0ZWQgcGFnZSB0aGF0IHF1 ZXJpZXMgdGhlIHBhZ2UgbGlzdCBhbmQgZGlzcGxheSB0aGVtLgotICAgIENTdHJpbmcgbG9jYWxQ YXRoID0gV2ViQ29yZTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGluc3BlY3RvclNlcnZlckZp bGVzUGF0aCgpICsgKChwYXRoID09ICIvIikgPyAiL3dlYmluc3BlY3Rvci9pbnNwZWN0b3JQYWdl SW5kZXguaHRtbCIgOiBwYXRoKSk7CisgICAgQ1N0cmluZyBsb2NhbFBhdGggPSBXZWJDb3JlOjpm aWxlU3lzdGVtUmVwcmVzZW50YXRpb24oaW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoKCkgKyAoKHBh dGggPT0gIi8iKSA/ICIvaW5zcGVjdG9yUGFnZUluZGV4Lmh0bWwiIDogcGF0aCkpOwogICAgIGlm IChsb2NhbFBhdGguaXNOdWxsKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtODUsNyAr ODUsNyBAQCB2b2lkIFdlYkluc3BlY3RvclNlcnZlcjo6YnVpbGRQYWdlTGlzdChWZWN0b3I8Y2hh cj4mIGRhdGEsIFN0cmluZyYgY29udGVudFR5cGUpCiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0 ZXJhbCgiXCIsIFwidXJsXCI6IFwiIik7CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKHdlYlBhZ2Ut PmFjdGl2ZVVSTCgpKTsKICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCJcIiwgXCJpbnNw ZWN0b3JVcmxcIjogXCIiKTsKLSAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRlcmFsKCIvd2ViaW5z cGVjdG9yL2luc3BlY3Rvci5odG1sP3BhZ2U9Iik7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0 ZXJhbCgiL2luc3BlY3Rvci5odG1sP3BhZ2U9Iik7CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTnVt YmVyKGl0LT5rZXkpOwogICAgICAgICBidWlsZGVyLmFwcGVuZExpdGVyYWwoIlwiIH0iKTsKICAg ICB9CkBAIC0xMDQsNyArMTA0LDcgQEAgU3RyaW5nIFdlYkluc3BlY3RvclNlcnZlcjo6aW5zcGVj dG9yU2VydmVyRmlsZXNQYXRoKCkKICAgICBpZiAoZW52aXJvbm1lbnRQYXRoICYmIGdfZmlsZV90 ZXN0KGVudmlyb25tZW50UGF0aCwgR19GSUxFX1RFU1RfSVNfRElSKSkKICAgICAgICAgbV9pbnNw ZWN0b3JTZXJ2ZXJGaWxlc1BhdGggPSBTdHJpbmcoZW52aXJvbm1lbnRQYXRoKTsKICAgICBlbHNl Ci0gICAgICAgIG1faW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoID0gU3RyaW5nKFdlYkNvcmU6OnNo YXJlZFJlc291cmNlc1BhdGgoKS5kYXRhKCkpOworICAgICAgICBtX2luc3BlY3RvclNlcnZlckZp bGVzUGF0aCA9IFN0cmluZyhXZWJDb3JlOjpzaGFyZWRSZXNvdXJjZXNQYXRoKCkuZGF0YSgpKSAr ICIvd2ViaW5zcGVjdG9yIjsKIAogICAgIHJldHVybiBtX2luc3BlY3RvclNlcnZlckZpbGVzUGF0 aDsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCA3ZjQxOTdkNTRlNjM0NGQwNTY3MDY5ZmE2YWVmMmMzNDkyOTgyYWJiLi42NzRmMGUwYjNlNmUy ZTY4NDFhODI3NDE4M2I3NGVkMzAyMTZkZTMxIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTMtMDctMTUgIEFudG9u IE9iemhpcm92ICA8YS5vYnpoaXJvdkBzYW1zdW5nLmNvbT4KKworICAgICAgICBbR1RLXSBUZXN0 SW5zcGVjdG9yU2VydmVyIHVuaXQgdGVzdCBpcyB0aW1pbmcgb3V0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDU4NjYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvcnVuLWd0ay10ZXN0czoK KyAgICAgICAgKFRlc3RSdW5uZXIpOgorCiAyMDEzLTA3LTE1ICBYYWJpZXIgUm9kcmlndWV6IENh bHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gSW5jcmVhc2UgdGhl IEpIQnVpbGQgdmVyc2lvbiBvZiBHU3RyZWFtZXIgdG8gMS4wLjcKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRl eCBjM2MwNzEyODQxMjg2ZjNlY2ZiOGY2YTdmY2ExMjJkYWM3NDdkNmRjLi44ODNlZDU2ZTA4NTA1 YzZhOTQwYmFmMjhkYjVkMjE1YzU1NGQ3Zjg1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1 bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC02Nyw3ICs2 Nyw2IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIFNraXBwZWRUZXN0KCJ1bml0dGVzdHMv dGVzdHdlYnJlc291cmNlIiwgIi93ZWJraXQvd2VicmVzb3VyY2Uvc3ViX3Jlc291cmNlX2xvYWRp bmciLCAiVGVzdCBmYWlscyBpbiBHVEsgTGludXggNjQtYml0IFJlbGVhc2UgYm90IiwgODIzMzAp LAogICAgICAgICBTa2lwcGVkVGVzdCgidW5pdHRlc3RzL3Rlc3R3ZWJ2aWV3IiwgIi93ZWJraXQv d2Vidmlldy9pY29uLXVyaSIsICJUZXN0IHRpbWVzIG91dCBpbiBHVEsgTGludXggNjQtYml0IFJl bGVhc2UgYm90IiwgODIzMjgpLAogICAgICAgICBTa2lwcGVkVGVzdCgidW5pdHRlc3RzL3Rlc3Rh dGsiLCAiL3dlYmtpdC9hdGsvZ2V0VGV4dEluUGFyYWdyYXBoQW5kQm9keU1vZGVyYXRlIiwgIlRl c3QgZmFpbHMiLCAxMDU1MzgpLAotICAgICAgICBTa2lwcGVkVGVzdCgiV2ViS2l0MkFQSVRlc3Rz L1Rlc3RJbnNwZWN0b3JTZXJ2ZXIiLCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRp bWVzIG91dCIsIDEwNTg2NiksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMv VGVzdFJlc291cmNlcyIsICIvd2Via2l0Mi9XZWJLaXRXZWJWaWV3L3Jlc291cmNlcyIsICJUZXN0 IGlzIGZsYWt5IGluIEdUSyBMaW51eCAzMi1iaXQgUmVsZWFzZSBib3QiLCA4Mjg2OCksCiAgICAg ICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHki LCAiL3dlYmtpdDIvV2ViS2l0QWNjZXNzaWJpbGl0eS9hdHNwaS1iYXNpYy1oaWVyYXJjaHkiLCAi VGVzdCBmYWlscyIsIDEwMDQwOCksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVz dHMvVGVzdFdlYktpdFdlYlZpZXciLCBTa2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRp bWVzIG91dCBhZnRlciByMTUwODkwIiwgMTE3Njg5KSwK 206787 2013-07-16 09:00:59 -0700 2013-07-24 08:26:11 -0700 Patch bug-105866-20130716170130.patch text/plain 8388 obzhirov U3VidmVyc2lvbiBSZXZpc2lvbjogMTUyNzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODVmMTg5ODg2NTE1MGNj MDlmNWMxNzM0MTFiMmUzYmQzYmY5OWJhMy4uYTQ1NzIwNzM4ZGE3ZTA0MzBjMTdmN2E1OGFiZTM5 ZjVhNmE2ZDZmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTA3LTE2ICBBbnRv biBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0dUS10gVGVz dEluc3BlY3RvclNlcnZlciB1bml0IHRlc3QgaXMgdGltaW5nIG91dAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODY2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHRlc3QgZmFpbGVkIGJlY2F1c2Ug aXQgY291bGRuJ3QgZmluZCBpbnNwZWN0b3IgcmVzb3VyY2VzIGluIGRlZmF1bHQgZm9sZGVyCisg ICAgICAgIChtYWtlIGluc3RhbGwgc3RlcCB3YXMgbWlzc2luZykuIEl0IHVzZXMgbm93IHJlc291 cmNlcyBhdmFpbGFibGUgaW4KKyAgICAgICAgV2ViS2l0QnVpbGQgZm9sZGVyLiBXZWJJbnNwZWN0 b3JTZXJ2ZXJHdGsgd2FzIHJlZmFjdG9yZWQgYXMgd2VsbCB0byBtYWtlCisgICAgICAgIGVhc2ll ciB0byB1c2UgV0VCS0lUX0lOU1BFQ1RPUl9TRVJWRVJfUEFUSCB2YXJpYWJsZS4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL0dOVW1ha2VmaWxlLmFtOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL0luc3BlY3RvclRlc3RTZXJ2ZXIuY3BwOgorICAgICAgICAo bWFpbik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdEluc3BlY3RvclNl cnZlci5jcHA6CisgICAgICAgICh0ZXN0SW5zcGVjdG9yU2VydmVyUGFnZUxpc3QpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZ3RrL1dlYkluc3BlY3RvclNlcnZlckd0ay5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkluc3BlY3RvclNlcnZlcjo6cGxhdGZvcm1SZXNvdXJj ZUZvclBhdGgpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JTZXJ2ZXI6OmJ1aWxkUGFn ZUxpc3QpOgorICAgICAgICAoV2ViS2l0OjpXZWJJbnNwZWN0b3JTZXJ2ZXI6Omluc3BlY3RvclNl cnZlckZpbGVzUGF0aCk6CisKIDIwMTMtMDctMTYgIE1pY2hhZWwgQnLDvG5pbmcgIDxtaWNoYWVs LmJydW5pbmdAZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF0gUmVwbGFjZSBOb2tpYSB3aXRoIFF0 IFByb2plY3QgaW4gc2VydmljZSBuYW1lLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9ndGsvdGVzdHMvR05VbWFrZWZpbGUuYW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2d0ay90ZXN0cy9HTlVtYWtlZmlsZS5hbQppbmRleCA4NDZhYjQ5NmYxOTgyYWJk YWEzMDQ4NjYzYzFhMWQ3ZDE5MmNkZDM4Li43NTEwYjYxN2M4MzU4MzhlNzFjMjVhN2VjZjYyZjBj ZmNiMGRkODlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90 ZXN0cy9HTlVtYWtlZmlsZS5hbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9HTlVtYWtlZmlsZS5hbQpAQCAtNzAsOCArNzAsMTcgQEAgUHJvZ3JhbXMvcmVzb3Vy Y2VzL3dlYmtpdDJndGstdGVzdHMtcmVzb3VyY2VzLmdyZXNvdXJjZTogU291cmNlL1dlYktpdDIv VUlQcm9jZXMKIAkkKEFNX1ZfYXQpbWtkaXIgLXAgJHtHRU5QUk9HUkFNU30vcmVzb3VyY2VzCiAJ JChBTV9WX0dFTikgJChHTElCX0NPTVBJTEVfUkVTT1VSQ0VTKSAtLXRhcmdldD0kQCAtLXNvdXJj ZWRpcj0kKHNyY2RpcikgJDwKIAotRElTVENMRUFORklMRVMgKz0gUHJvZ3JhbXMvcmVzb3VyY2Vz L3dlYmtpdDJndGstdGVzdHMtcmVzb3VyY2VzLmdyZXNvdXJjZQotbm9pbnN0X0RBVEEgKz0gUHJv Z3JhbXMvcmVzb3VyY2VzL3dlYmtpdDJndGstdGVzdHMtcmVzb3VyY2VzLmdyZXNvdXJjZQorUHJv Z3JhbXMvcmVzb3VyY2VzL2luc3BlY3Rvci9pbnNwZWN0b3JQYWdlSW5kZXguaHRtbDogU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9mcm9udC1lbmQvaW5zcGVjdG9yUGFn ZUluZGV4Lmh0bWwKKwkkKEFNX1ZfYXQpbWtkaXIgLXAgJHtHRU5QUk9HUkFNU30vcmVzb3VyY2Vz L2luc3BlY3RvcgorCSQoQU1fVl9HRU4pY3AgJChzcmNkaXIpL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZnJvbnQtZW5kL2luc3BlY3RvclBhZ2VJbmRleC5odG1sICR7 R0VOUFJPR1JBTVN9L3Jlc291cmNlcy9pbnNwZWN0b3IKKworRElTVENMRUFORklMRVMgKz0gXAor CVByb2dyYW1zL3Jlc291cmNlcy93ZWJraXQyZ3RrLXRlc3RzLXJlc291cmNlcy5ncmVzb3VyY2Ug XAorCVByb2dyYW1zL3Jlc291cmNlcy9pbnNwZWN0b3IvaW5zcGVjdG9yUGFnZUluZGV4Lmh0bWwK Kworbm9pbnN0X0RBVEEgKz0gXAorCVByb2dyYW1zL3Jlc291cmNlcy93ZWJraXQyZ3RrLXRlc3Rz LXJlc291cmNlcy5ncmVzb3VyY2UgXAorCVByb2dyYW1zL3Jlc291cmNlcy9pbnNwZWN0b3IvaW5z cGVjdG9yUGFnZUluZGV4Lmh0bWwKIAogbm9pbnN0X0xUTElCUkFSSUVTICs9IExpYnJhcmllcy9s aWJXZWJLaXQyQVBJVGVzdENvcmUubGEKIExpYnJhcmllc19saWJXZWJLaXQyQVBJVGVzdENvcmVf bGFfU09VUkNFUyA9IFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Z3RrL3Rlc3RzL0luc3BlY3RvclRlc3RTZXJ2ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvdGVzdHMvSW5zcGVjdG9yVGVzdFNlcnZlci5jcHAKaW5kZXggZjEzYjA0M2Rm MTZkODlkMGViYTA0NzcyZmYwZjQxYzZjOGQ5NGJhZS4uN2M5ZGM5MDBjZGEzNTczYWY5NGJlMDJi YWFiMGIzMGRhMDVjMzEyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvdGVzdHMvSW5zcGVjdG9yVGVzdFNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvSW5zcGVjdG9yVGVzdFNlcnZlci5jcHAKQEAgLTQwLDYg KzQwLDEwIEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiogYXJndikKIAogICAgIC8vIE92ZXJ3 cml0ZSBXRUJLSVRfSU5TUEVDVE9SX1NFUlZFUiB2YXJpYWJsZSB3aXRoIGRlZmF1bHQgdmFsdWUu CiAgICAgZ19zZXRlbnYoIldFQktJVF9JTlNQRUNUT1JfU0VSVkVSIiwgIjEyNy4wLjAuMToyOTk5 IiwgVFJVRSk7CisgICAgCisgICAgLy8gT3ZlcndyaXRlIFdFQktJVF9JTlNQRUNUT1JfU0VSVkVS X1BBVEggdmFyaWFibGUgdG8gcG9pbnQgdG8gaW5zcGVjdG9yIHJlc291cmNlcyBmb2xkZXIuCisg ICAgY29uc3QgZ2NoYXIqIGluc3BlY3RvclJlc291cmNlc1BhdGggPSBnX2dldGVudigiV0VCS0lU X0lOU1BFQ1RPUl9QQVRIIik7CisgICAgZ19zZXRlbnYoIldFQktJVF9JTlNQRUNUT1JfU0VSVkVS X1BBVEgiLCBpbnNwZWN0b3JSZXNvdXJjZXNQYXRoLCBUUlVFKTsKIAogICAgIFdlYktpdFdlYlZp ZXcqIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2Via2l0X3dlYl92aWV3X25ldygpKTsKICAg ICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2VuYWJsZV9kZXZlbG9wZXJfZXh0cmFzKHdlYmtpdF93ZWJf dmlld19nZXRfc2V0dGluZ3Mod2ViVmlldyksIFRSVUUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdEluc3BlY3RvclNlcnZlci5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yU2VydmVy LmNwcAppbmRleCA5MmI3ZjAwYmRiNjMxMjRlZjYxMzFmMDVlYTQyNjU2ODkyMzc3ZTUwLi4zNWZi M2ZjZGNhNGUzNTA3NzA0MmE2ZjQ4MGNlNTVmNjExMTE0ZTU4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9yU2VydmVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0SW5zcGVjdG9y U2VydmVyLmNwcApAQCAtMTg0LDcgKzE4NCw3IEBAIHN0YXRpYyB2b2lkIHRlc3RJbnNwZWN0b3JT ZXJ2ZXJQYWdlTGlzdChJbnNwZWN0b3JTZXJ2ZXJUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyCiAg ICAgZ19hc3NlcnQoamF2YXNjcmlwdFJlc3VsdCk7CiAgICAgZ19hc3NlcnQoIWVycm9yLmdldCgp KTsKICAgICB2YWx1ZVN0cmluZy5zZXQoV2ViVmlld1Rlc3Q6OmphdmFzY3JpcHRSZXN1bHRUb0NT dHJpbmcoamF2YXNjcmlwdFJlc3VsdCkpOwotICAgIFN0cmluZyB2YWxpZEluc3BlY3RvclVSTCA9 IFN0cmluZygiL3dlYmluc3BlY3Rvci9pbnNwZWN0b3IuaHRtbD9wYWdlPSIpICsgU3RyaW5nOjpu dW1iZXIocGFnZUlkKTsKKyAgICBTdHJpbmcgdmFsaWRJbnNwZWN0b3JVUkwgPSBTdHJpbmcoIi9p bnNwZWN0b3IuaHRtbD9wYWdlPSIpICsgU3RyaW5nOjpudW1iZXIocGFnZUlkKTsKICAgICBBU1NF UlRfQ01QX0NTVFJJTkcodmFsdWVTdHJpbmcuZ2V0KCksID09LCB2YWxpZEluc3BlY3RvclVSTC51 dGY4KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvSW5zcGVj dG9yU2VydmVyL2d0ay9XZWJJbnNwZWN0b3JTZXJ2ZXJHdGsuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0luc3BlY3RvclNlcnZlci9ndGsvV2ViSW5zcGVjdG9yU2VydmVyR3RrLmNwcApp bmRleCA3ZTIxYjBjNmIyYWM5ZGM5MTkwMWI4YTcyOWUzMGYyMWVmY2Y1MzA4Li5iNGNkMjE0YjFh M2Q1MGZlMjhhZmFiMzAwZTFlOGUyYjMzN2Q2ZjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvSW5zcGVjdG9yU2VydmVyL2d0ay9XZWJJbnNwZWN0b3JTZXJ2ZXJHdGsuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9JbnNwZWN0b3JTZXJ2ZXIvZ3RrL1dlYklu c3BlY3RvclNlcnZlckd0ay5jcHAKQEAgLTQ4LDcgKzQ4LDcgQEAgYm9vbCBXZWJJbnNwZWN0b3JT ZXJ2ZXI6OnBsYXRmb3JtUmVzb3VyY2VGb3JQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCwgVmVjdG9y PGNoYXIKICAgICB9CiAKICAgICAvLyBQb2ludCB0aGUgZGVmYXVsdCBwYXRoIHRvIGEgZm9ybWF0 dGVkIHBhZ2UgdGhhdCBxdWVyaWVzIHRoZSBwYWdlIGxpc3QgYW5kIGRpc3BsYXkgdGhlbS4KLSAg ICBDU3RyaW5nIGxvY2FsUGF0aCA9IFdlYkNvcmU6OmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbihp bnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGgoKSArICgocGF0aCA9PSAiLyIpID8gIi93ZWJpbnNwZWN0 b3IvaW5zcGVjdG9yUGFnZUluZGV4Lmh0bWwiIDogcGF0aCkpOworICAgIENTdHJpbmcgbG9jYWxQ YXRoID0gV2ViQ29yZTo6ZmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGluc3BlY3RvclNlcnZlckZp bGVzUGF0aCgpICsgKChwYXRoID09ICIvIikgPyAiL2luc3BlY3RvclBhZ2VJbmRleC5odG1sIiA6 IHBhdGgpKTsKICAgICBpZiAobG9jYWxQYXRoLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKQEAgLTk3LDcgKzk3LDcgQEAgdm9pZCBXZWJJbnNwZWN0b3JTZXJ2ZXI6OmJ1aWxkUGFn ZUxpc3QoVmVjdG9yPGNoYXI+JiBkYXRhLCBTdHJpbmcmIGNvbnRlbnRUeXBlKQogICAgICAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIlwiLCBcInVybFwiOiBcIiIpOwogICAgICAgICBidWlsZGVy LmFwcGVuZCh3ZWJQYWdlLT5hY3RpdmVVUkwoKSk7CiAgICAgICAgIGJ1aWxkZXIuYXBwZW5kTGl0 ZXJhbCgiXCIsIFwiaW5zcGVjdG9yVXJsXCI6IFwiIik7Ci0gICAgICAgIGJ1aWxkZXIuYXBwZW5k TGl0ZXJhbCgiL3dlYmluc3BlY3Rvci9pbnNwZWN0b3IuaHRtbD9wYWdlPSIpOworICAgICAgICBi dWlsZGVyLmFwcGVuZExpdGVyYWwoIi9pbnNwZWN0b3IuaHRtbD9wYWdlPSIpOwogICAgICAgICBi dWlsZGVyLmFwcGVuZE51bWJlcihpdC0+a2V5KTsKICAgICAgICAgYnVpbGRlci5hcHBlbmRMaXRl cmFsKCJcIiB9Iik7CiAgICAgfQpAQCAtMTE2LDcgKzExNiw3IEBAIFN0cmluZyBXZWJJbnNwZWN0 b3JTZXJ2ZXI6Omluc3BlY3RvclNlcnZlckZpbGVzUGF0aCgpCiAgICAgaWYgKGVudmlyb25tZW50 UGF0aCAmJiBnX2ZpbGVfdGVzdChlbnZpcm9ubWVudFBhdGgsIEdfRklMRV9URVNUX0lTX0RJUikp CiAgICAgICAgIG1faW5zcGVjdG9yU2VydmVyRmlsZXNQYXRoID0gU3RyaW5nKGVudmlyb25tZW50 UGF0aCk7CiAgICAgZWxzZQotICAgICAgICBtX2luc3BlY3RvclNlcnZlckZpbGVzUGF0aCA9IFN0 cmluZyhXZWJDb3JlOjpzaGFyZWRSZXNvdXJjZXNQYXRoKCkuZGF0YSgpKTsKKyAgICAgICAgbV9p bnNwZWN0b3JTZXJ2ZXJGaWxlc1BhdGggPSBTdHJpbmcoV2ViQ29yZTo6c2hhcmVkUmVzb3VyY2Vz UGF0aCgpLmRhdGEoKSkgKyAiL3dlYmluc3BlY3RvciI7CiAKICAgICByZXR1cm4gbV9pbnNwZWN0 b3JTZXJ2ZXJGaWxlc1BhdGg7CiB9CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggYzM1ZTg2NzVmZjUxYWRkNWM5YTY0ZWJhM2ExMDljZTEwNzcyZWIy ZS4uZDNmOTg1YmJiNDRlZTI3MGQ5MTFkYjY3YmI3ZTJjZjI0ZTk3MThjNCAxMDA2NDQKLS0tIGEv VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisy MDEzLTA3LTE2ICBBbnRvbiBPYnpoaXJvdiAgPGEub2J6aGlyb3ZAc2Ftc3VuZy5jb20+CisKKyAg ICAgICAgW0dUS10gVGVzdEluc3BlY3RvclNlcnZlciB1bml0IHRlc3QgaXMgdGltaW5nIG91dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODY2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3J1bi1ndGstdGVzdHM6CisgICAgICAgIChUZXN0UnVubmVyKToKKwogMjAxMy0wNy0xNiAgQnJp YW4gSG9sdCAgPGJyaWFuLmhvbHRAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgY2hlY2std2Via2l0 LXN0eWxlOiAidXNpbmcgbmFtZXNwYWNlIGZvbzsiIHNob3VsZCBiZSBmbGFnZ2VkIGFzIGFuIGVy cm9yIGluIGhlYWRlcnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBi L1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRleCBjM2MwNzEyODQxMjg2ZjNlY2ZiOGY2 YTdmY2ExMjJkYWM3NDdkNmRjLi44ODNlZDU2ZTA4NTA1YzZhOTQwYmFmMjhkYjVkMjE1YzU1NGQ3 Zjg1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKKysrIGIvVG9vbHMv U2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC02Nyw3ICs2Nyw2IEBAIGNsYXNzIFRlc3RSdW5uZXI6 CiAgICAgICAgIFNraXBwZWRUZXN0KCJ1bml0dGVzdHMvdGVzdHdlYnJlc291cmNlIiwgIi93ZWJr aXQvd2VicmVzb3VyY2Uvc3ViX3Jlc291cmNlX2xvYWRpbmciLCAiVGVzdCBmYWlscyBpbiBHVEsg TGludXggNjQtYml0IFJlbGVhc2UgYm90IiwgODIzMzApLAogICAgICAgICBTa2lwcGVkVGVzdCgi dW5pdHRlc3RzL3Rlc3R3ZWJ2aWV3IiwgIi93ZWJraXQvd2Vidmlldy9pY29uLXVyaSIsICJUZXN0 IHRpbWVzIG91dCBpbiBHVEsgTGludXggNjQtYml0IFJlbGVhc2UgYm90IiwgODIzMjgpLAogICAg ICAgICBTa2lwcGVkVGVzdCgidW5pdHRlc3RzL3Rlc3RhdGsiLCAiL3dlYmtpdC9hdGsvZ2V0VGV4 dEluUGFyYWdyYXBoQW5kQm9keU1vZGVyYXRlIiwgIlRlc3QgZmFpbHMiLCAxMDU1MzgpLAotICAg ICAgICBTa2lwcGVkVGVzdCgiV2ViS2l0MkFQSVRlc3RzL1Rlc3RJbnNwZWN0b3JTZXJ2ZXIiLCBT a2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRpbWVzIG91dCIsIDEwNTg2NiksCiAgICAg ICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFJlc291cmNlcyIsICIvd2Via2l0 Mi9XZWJLaXRXZWJWaWV3L3Jlc291cmNlcyIsICJUZXN0IGlzIGZsYWt5IGluIEdUSyBMaW51eCAz Mi1iaXQgUmVsZWFzZSBib3QiLCA4Mjg2OCksCiAgICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQy QVBJVGVzdHMvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkiLCAiL3dlYmtpdDIvV2ViS2l0QWNjZXNz aWJpbGl0eS9hdHNwaS1iYXNpYy1oaWVyYXJjaHkiLCAiVGVzdCBmYWlscyIsIDEwMDQwOCksCiAg ICAgICAgIFNraXBwZWRUZXN0KCJXZWJLaXQyQVBJVGVzdHMvVGVzdFdlYktpdFdlYlZpZXciLCBT a2lwcGVkVGVzdC5FTlRJUkVfU1VJVEUsICJUZXN0IHRpbWVzIG91dCBhZnRlciByMTUwODkwIiwg MTE3Njg5KSwK