40009 2010-06-01 10:48:09 -0700 [Gtk] Make DRT more coherent with other ports to allow reusing more tests 2010-06-29 09:26:34 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 39997 0 mario webkit-unassigned abarth commit-queue eric webkit.review.bot oldest_to_newest 232832 0 mario 2010-06-01 10:48:09 -0700 I recently found there are some differences between different versions of the DRT (in special between Mac and GTK versions) that makes cumbersome at some points to share some tests and their expected results, as is the case for instance of the accessibility/aria-checkbox-text.html test. In this specific case, the test expects that the output of getting the accessible title for some checkboxes follows a pattern like "AXTitle: MyTitle", where "AXTitle: " is a prefix Mac's DRT adds to "MyName", which is meant to be the accessible title for a given object. However, GTK's DRT would return just "MyTitle" (without the prefix) which makes that the aria-checkbox-text.html test can not be reused even if we had a specific aria-checkbox-text-expected.txt file under platform/gtk/accessibility. So, to avoid this my proposal would be to make sure GTK's DRT behaves exactly the same way than Mac's DRT when it comes to adding these kind of prefix to certain accessible attributes (which so far would be role, subrole, roledescription, title, description, language and helptext) and fix the affected tests currently under platform/gtk/accessibility to take into account this new way of naming those attributes' values in DRT. This should help fixing bug 39997, as well as to ease the implementation of new tests in the future. 232849 1 57569 mario 2010-06-01 11:08:26 -0700 Created attachment 57569 Patch proposal This patch makes sure the role(), title() and description() functions in GTK's DRT (the only ones implemented so far from those affected by this bug) return their values with a proper prefix, as stated above. It's partially inspired in the first version of the first patch for bug 39997 which, after filing this new one, became dependant on it. 232882 2 57569 mrobinson 2010-06-01 11:53:11 -0700 Comment on attachment 57569 Patch proposal I like this approach a lot better! > - return JSStringCreateWithUTF8CString(atk_role_get_name(role)); > + const gchar* roleName = atk_role_get_name(role); > + GOwnPtr<gchar> axRole(g_strdup_printf("AXRole: %s", roleName)); > + > + return JSStringCreateWithUTF8CString(axRole.get()); > } Only one small nit. You don't need roleName here. You can simply use atk_role_get_name(...) in g_strdup_printf. 232956 3 mario 2010-06-01 14:28:13 -0700 (In reply to comment #2) > (From update of attachment 57569 [details]) > I like this approach a lot better! > > > - return JSStringCreateWithUTF8CString(atk_role_get_name(role)); > > + const gchar* roleName = atk_role_get_name(role); > > + GOwnPtr<gchar> axRole(g_strdup_printf("AXRole: %s", roleName)); > > + > > + return JSStringCreateWithUTF8CString(axRole.get()); > > } > > Only one small nit. You don't need roleName here. You can simply > use atk_role_get_name(...) in g_strdup_printf. Yeah, I know. Just did it that way to avoid having a too long line. But I can make the change if that fits better in WebKit codebase, no problem. 244209 4 57569 xan.lopez 2010-06-29 04:56:56 -0700 Comment on attachment 57569 Patch proposal Looks good. 244254 5 57569 commit-queue 2010-06-29 06:28:07 -0700 Comment on attachment 57569 Patch proposal Clearing flags on attachment: 57569 Committed r62111: <http://trac.webkit.org/changeset/62111> 244255 6 commit-queue 2010-06-29 06:28:11 -0700 All reviewed patches have been landed. Closing bug. 244262 7 webkit.review.bot 2010-06-29 06:47:24 -0700 http://trac.webkit.org/changeset/62111 might have broken GTK Linux 32-bit Release 244326 8 mario 2010-06-29 09:26:34 -0700 (In reply to comment #7) > http://trac.webkit.org/changeset/62111 might have broken GTK Linux 32-bit Release Filed a new bug to fix this small issue, which happened due to being working in paralell in this bug and bug 36128, basically (a new test added along with bug 36128 needs updating according to this one): https://bugs.webkit.org/show_bug.cgi?id=41355 57569 2010-06-01 11:08:26 -0700 2010-06-29 06:28:07 -0700 Patch proposal 0001-2010-06-01-Mario-Sanchez-Prada-msanchez-igalia.com.patch text/plain 19821 mario RnJvbSAxNjA4OWFlNTU5MWRhNjE0MTRjNzRiMTA1NDhiNjYwMTU0Zjc1ZDQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBUdWUsIDEgSnVuIDIwMTAgMTk6NTI6MDEgKzAyMDAKU3ViamVjdDogMjAxMC0w Ni0wMSAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CgogICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBbR3RrXSBNYWtlIERSVCBtb3Jl IGNvaGVyZW50IHdpdGggb3RoZXIgcG9ydHMgdG8gYWxsb3cgcmV1c2luZyBtb3JlIHRlc3RzCiAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMDA5CgogICAg ICAgIE1ha2Ugc3VyZSAiQVhSb2xlOiAiLCAiQVhUaXRsZTogIiBhbmQgIkFYRGVzY3JpcHRpb246 ICIgcHJlZml4ZXMKICAgICAgICBhcmUgdXNlZCB3aGVuIHJldHVybmluZyB0aG9zZSB2YWx1ZXMs IGZvciBjb2hlcmVuY3kgd2l0aCBvdGhlciBwb3J0cy4KCiAgICAgICAgKiBEdW1wUmVuZGVyVHJl ZS9ndGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEd0ay5jcHA6CiAgICAgICAgKEFjY2Vzc2liaWxp dHlVSUVsZW1lbnQ6OnJvbGUpOgogICAgICAgIChBY2Nlc3NpYmlsaXR5VUlFbGVtZW50Ojp0aXRs ZSk6CiAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmRlc2NyaXB0aW9uKToKCjIwMTAt MDYtMDEgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgoKICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCiAgICAgICAgW0d0a10gTWFrZSBEUlQgbW9y ZSBjb2hlcmVudCB3aXRoIG90aGVyIHBvcnRzIHRvIGFsbG93IHJldXNpbmcgbW9yZSB0ZXN0cwog ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDAwOQoKICAg ICAgICBVcGRhdGUgR1RLIGExMXkgdGVzdHMgdG8gZm9sbG93IG5ldyBwcmVmaXhlcyBjb21pbmcg ZnJvbSBEUlQKCiAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9vYmplY3QtYXR0 cmlidXRlcy1leHBlY3RlZC50eHQ6CiAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0 eS9vYmplY3QtYXR0cmlidXRlcy5odG1sOgogICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2li aWxpdHkvb2JqZWN0LXdpdGgtdGl0bGUtZXhwZWN0ZWQudHh0OgogICAgICAgICogcGxhdGZvcm0v Z3RrL2FjY2Vzc2liaWxpdHkvb2JqZWN0LXdpdGgtdGl0bGUuaHRtbDoKICAgICAgICAqIHBsYXRm b3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RhYmxlLWhpZXJhcmNoeS1leHBlY3RlZC50eHQ6CiAgICAg ICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90YWJsZS1oaWVyYXJjaHkuaHRtbDoKICAg ICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RpdGxlLWFuZC1hbHQtZXhwZWN0ZWQu dHh0OgogICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGl0bGUtYW5kLWFsdC5o dG1sOgotLS0KIExheW91dFRlc3RzL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAxOCArKysrKysrKysKIC4uLi9hY2Nlc3NpYmlsaXR5L29iamVjdC1hdHRyaWJ1dGVz LWV4cGVjdGVkLnR4dCAgIHwgICAxOCArKysrLS0tLQogLi4uL2d0ay9hY2Nlc3NpYmlsaXR5L29i amVjdC1hdHRyaWJ1dGVzLmh0bWwgICAgICAgfCAgIDE4ICsrKystLS0tCiAuLi4vYWNjZXNzaWJp bGl0eS9vYmplY3Qtd2l0aC10aXRsZS1leHBlY3RlZC50eHQgICB8ICAgIDYgKy0KIC4uLi9ndGsv YWNjZXNzaWJpbGl0eS9vYmplY3Qtd2l0aC10aXRsZS5odG1sICAgICAgIHwgICAgNiArLQogLi4u L2d0ay9hY2Nlc3NpYmlsaXR5L3RhYmxlLWhpZXJhcmNoeS1leHBlY3RlZC50eHQgfCAgIDQwICsr KysrKysrKystLS0tLS0tLS0tCiAuLi4vZ3RrL2FjY2Vzc2liaWxpdHkvdGFibGUtaGllcmFyY2h5 Lmh0bWwgICAgICAgICB8ICAgMTYgKysrKy0tLS0KIC4uLi9ndGsvYWNjZXNzaWJpbGl0eS90aXRs ZS1hbmQtYWx0LWV4cGVjdGVkLnR4dCAgIHwgICAxNiArKysrLS0tLQogLi4uL3BsYXRmb3JtL2d0 ay9hY2Nlc3NpYmlsaXR5L3RpdGxlLWFuZC1hbHQuaHRtbCAgfCAgIDE2ICsrKystLS0tCiBXZWJL aXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTUgKysr KysrKwogLi4uL2d0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50R3RrLmNwcCAgICAgICAgICAgICAg fCAgIDE0ICsrKysrLQogMTEgZmlsZXMgY2hhbmdlZCwgMTEyIGluc2VydGlvbnMoKyksIDcxIGRl bGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwppbmRleCBiNjZlMTk3Li5hMGRhMDYwIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTAtMDYtMDEgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtd IE1ha2UgRFJUIG1vcmUgY29oZXJlbnQgd2l0aCBvdGhlciBwb3J0cyB0byBhbGxvdyByZXVzaW5n IG1vcmUgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQwMDA5CisKKyAgICAgICAgVXBkYXRlIEdUSyBhMTF5IHRlc3RzIHRvIGZvbGxvdyBuZXcg cHJlZml4ZXMgY29taW5nIGZyb20gRFJUCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9vYmplY3QtYXR0cmlidXRlcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogcGxhdGZv cm0vZ3RrL2FjY2Vzc2liaWxpdHkvb2JqZWN0LWF0dHJpYnV0ZXMuaHRtbDoKKyAgICAgICAgKiBw bGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9vYmplY3Qtd2l0aC10aXRsZS1leHBlY3RlZC50eHQ6 CisgICAgICAgICogcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvb2JqZWN0LXdpdGgtdGl0bGUu aHRtbDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90YWJsZS1oaWVyYXJj aHktZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3Rh YmxlLWhpZXJhcmNoeS5odG1sOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5 L3RpdGxlLWFuZC1hbHQtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9hY2Nl c3NpYmlsaXR5L3RpdGxlLWFuZC1hbHQuaHRtbDoKKwogMjAxMC0wNS0yOCAgU2h1IENoYW5nICA8 Y2hhbmcuc2h1QG5va2lhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvb2JqZWN0LWF0dHJpYnV0ZXMt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvb2Jq ZWN0LWF0dHJpYnV0ZXMtZXhwZWN0ZWQudHh0CmluZGV4IDNjZDMzMGYuLmYyOTY4MmYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L29iamVjdC1hdHRy aWJ1dGVzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9vYmplY3QtYXR0cmlidXRlcy1leHBlY3RlZC50eHQKQEAgLTI2LDIzICsyNiwyMyBA QCBUaGlzIHRlc3RzIHRoZSBleHBvc3VyZSBvZiBBdGsgb2JqZWN0IGF0dHJpYnV0ZXMuCiBPbiBz dWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dl ZCBieSAiVEVTVCBDT01QTEVURSIuCiAKIAotUEFTUyBjaGlsZC5yb2xlIGlzICdoZWFkaW5nJwor UEFTUyBjaGlsZC5yb2xlIGlzICdBWFJvbGU6IGhlYWRpbmcnCiBQQVNTIGNoaWxkLmFsbEF0dHJp YnV0ZXMoKSBpcyAnbGV2ZWw6MSwgdG9vbGtpdDpXZWJLaXRHdGsnCi1QQVNTIGNoaWxkLnJvbGUg aXMgJ2hlYWRpbmcnCitQQVNTIGNoaWxkLnJvbGUgaXMgJ0FYUm9sZTogaGVhZGluZycKIFBBU1Mg Y2hpbGQuYWxsQXR0cmlidXRlcygpIGlzICdsZXZlbDoyLCB0b29sa2l0OldlYktpdEd0aycKLVBB U1MgY2hpbGQucm9sZSBpcyAnaGVhZGluZycKK1BBU1MgY2hpbGQucm9sZSBpcyAnQVhSb2xlOiBo ZWFkaW5nJwogUEFTUyBjaGlsZC5hbGxBdHRyaWJ1dGVzKCkgaXMgJ2xldmVsOjMsIHRvb2xraXQ6 V2ViS2l0R3RrJwotUEFTUyBjaGlsZC5yb2xlIGlzICdoZWFkaW5nJworUEFTUyBjaGlsZC5yb2xl IGlzICdBWFJvbGU6IGhlYWRpbmcnCiBQQVNTIGNoaWxkLmFsbEF0dHJpYnV0ZXMoKSBpcyAnbGV2 ZWw6NCwgdG9vbGtpdDpXZWJLaXRHdGsnCi1QQVNTIGNoaWxkLnJvbGUgaXMgJ2hlYWRpbmcnCitQ QVNTIGNoaWxkLnJvbGUgaXMgJ0FYUm9sZTogaGVhZGluZycKIFBBU1MgY2hpbGQuYWxsQXR0cmli dXRlcygpIGlzICdsZXZlbDo1LCB0b29sa2l0OldlYktpdEd0aycKLVBBU1MgY2hpbGQucm9sZSBp cyAnaGVhZGluZycKK1BBU1MgY2hpbGQucm9sZSBpcyAnQVhSb2xlOiBoZWFkaW5nJwogUEFTUyBj aGlsZC5hbGxBdHRyaWJ1dGVzKCkgaXMgJ2xldmVsOjYsIHRvb2xraXQ6V2ViS2l0R3RrJwotUEFT UyBjaGlsZC5yb2xlIGlzICdsaW5rJworUEFTUyBjaGlsZC5yb2xlIGlzICdBWFJvbGU6IGxpbmsn CiBQQVNTIGNoaWxkLmFsbEF0dHJpYnV0ZXMoKSBpcyAndG9vbGtpdDpXZWJLaXRHdGsnCi1QQVNT IGNoaWxkLnJvbGUgaXMgJ3RhYmxlJworUEFTUyBjaGlsZC5yb2xlIGlzICdBWFJvbGU6IHRhYmxl JwogUEFTUyBjaGlsZC5hbGxBdHRyaWJ1dGVzKCkgaXMgJ3Rvb2xraXQ6V2ViS2l0R3RrJwotUEFT UyBjaGlsZC5yb2xlIGlzICd0YWJsZScKK1BBU1MgY2hpbGQucm9sZSBpcyAnQVhSb2xlOiB0YWJs ZScKIFBBU1MgY2hpbGQuYWxsQXR0cmlidXRlcygpIGlzICd0b29sa2l0OldlYktpdEd0aycKIFBB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvb2JqZWN0LWF0dHJpYnV0ZXMuaHRtbCBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L29iamVjdC1hdHRyaWJ1dGVzLmh0bWwK aW5kZXggOTQ1YmNhZi4uNDU5YTc4NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL2FjY2Vzc2liaWxpdHkvb2JqZWN0LWF0dHJpYnV0ZXMuaHRtbAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9vYmplY3QtYXR0cmlidXRlcy5odG1sCkBAIC0z MywzMSArMzMsMzEgQEAgdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOwogICAgICAgICBk b2N1bWVudC5nZXRFbGVtZW50QnlJZCgiYm9keSIpLmZvY3VzKCk7CiAgICAgICAgIHZhciB3ZWJB cmVhID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuZm9jdXNlZEVsZW1lbnQ7CiAgICAgICAgIHZh ciBjaGlsZCA9IHdlYkFyZWEuY2hpbGRBdEluZGV4KDApOwotICAgICAgICBzaG91bGRCZSgiY2hp bGQucm9sZSIsICInaGVhZGluZyciKTsKKyAgICAgICAgc2hvdWxkQmUoImNoaWxkLnJvbGUiLCAi J0FYUm9sZTogaGVhZGluZyciKTsKICAgICAgICAgc2hvdWxkQmUoImNoaWxkLmFsbEF0dHJpYnV0 ZXMoKSIsICInbGV2ZWw6MSwgdG9vbGtpdDpXZWJLaXRHdGsnIik7CiAgICAgICAgIGNoaWxkID0g d2ViQXJlYS5jaGlsZEF0SW5kZXgoMSk7Ci0gICAgICAgIHNob3VsZEJlKCJjaGlsZC5yb2xlIiwg IidoZWFkaW5nJyIpOworICAgICAgICBzaG91bGRCZSgiY2hpbGQucm9sZSIsICInQVhSb2xlOiBo ZWFkaW5nJyIpOwogICAgICAgICBzaG91bGRCZSgiY2hpbGQuYWxsQXR0cmlidXRlcygpIiwgIids ZXZlbDoyLCB0b29sa2l0OldlYktpdEd0ayciKTsKICAgICAgICAgY2hpbGQgPSB3ZWJBcmVhLmNo aWxkQXRJbmRleCgyKTsKLSAgICAgICAgc2hvdWxkQmUoImNoaWxkLnJvbGUiLCAiJ2hlYWRpbmcn Iik7CisgICAgICAgIHNob3VsZEJlKCJjaGlsZC5yb2xlIiwgIidBWFJvbGU6IGhlYWRpbmcnIik7 CiAgICAgICAgIHNob3VsZEJlKCJjaGlsZC5hbGxBdHRyaWJ1dGVzKCkiLCAiJ2xldmVsOjMsIHRv b2xraXQ6V2ViS2l0R3RrJyIpOwogICAgICAgICBjaGlsZCA9IHdlYkFyZWEuY2hpbGRBdEluZGV4 KDMpOwotICAgICAgICBzaG91bGRCZSgiY2hpbGQucm9sZSIsICInaGVhZGluZyciKTsKKyAgICAg ICAgc2hvdWxkQmUoImNoaWxkLnJvbGUiLCAiJ0FYUm9sZTogaGVhZGluZyciKTsKICAgICAgICAg c2hvdWxkQmUoImNoaWxkLmFsbEF0dHJpYnV0ZXMoKSIsICInbGV2ZWw6NCwgdG9vbGtpdDpXZWJL aXRHdGsnIik7CiAgICAgICAgIGNoaWxkID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoNCk7Ci0gICAg ICAgIHNob3VsZEJlKCJjaGlsZC5yb2xlIiwgIidoZWFkaW5nJyIpOworICAgICAgICBzaG91bGRC ZSgiY2hpbGQucm9sZSIsICInQVhSb2xlOiBoZWFkaW5nJyIpOwogICAgICAgICBzaG91bGRCZSgi Y2hpbGQuYWxsQXR0cmlidXRlcygpIiwgIidsZXZlbDo1LCB0b29sa2l0OldlYktpdEd0ayciKTsK ICAgICAgICAgY2hpbGQgPSB3ZWJBcmVhLmNoaWxkQXRJbmRleCg1KTsKLSAgICAgICAgc2hvdWxk QmUoImNoaWxkLnJvbGUiLCAiJ2hlYWRpbmcnIik7CisgICAgICAgIHNob3VsZEJlKCJjaGlsZC5y b2xlIiwgIidBWFJvbGU6IGhlYWRpbmcnIik7CiAgICAgICAgIHNob3VsZEJlKCJjaGlsZC5hbGxB dHRyaWJ1dGVzKCkiLCAiJ2xldmVsOjYsIHRvb2xraXQ6V2ViS2l0R3RrJyIpOwogICAgICAgICBj aGlsZCA9IHdlYkFyZWEuY2hpbGRBdEluZGV4KDYpOwotICAgICAgICBzaG91bGRCZSgiY2hpbGQu cm9sZSIsICInbGluayciKTsKKyAgICAgICAgc2hvdWxkQmUoImNoaWxkLnJvbGUiLCAiJ0FYUm9s ZTogbGluayciKTsKICAgICAgICAgc2hvdWxkQmUoImNoaWxkLmFsbEF0dHJpYnV0ZXMoKSIsICIn dG9vbGtpdDpXZWJLaXRHdGsnIik7CiAgICAgICAgIGNoaWxkID0gd2ViQXJlYS5jaGlsZEF0SW5k ZXgoNyk7Ci0gICAgICAgIHNob3VsZEJlKCJjaGlsZC5yb2xlIiwgIid0YWJsZSciKTsKKyAgICAg ICAgc2hvdWxkQmUoImNoaWxkLnJvbGUiLCAiJ0FYUm9sZTogdGFibGUnIik7CiAgICAgICAgIHNo b3VsZEJlKCJjaGlsZC5hbGxBdHRyaWJ1dGVzKCkiLCAiJ3Rvb2xraXQ6V2ViS2l0R3RrJyIpOwog ICAgICAgICBjaGlsZCA9IHdlYkFyZWEuY2hpbGRBdEluZGV4KDgpOwotICAgICAgICBzaG91bGRC ZSgiY2hpbGQucm9sZSIsICIndGFibGUnIik7CisgICAgICAgIHNob3VsZEJlKCJjaGlsZC5yb2xl IiwgIidBWFJvbGU6IHRhYmxlJyIpOwogICAgICAgICBzaG91bGRCZSgiY2hpbGQuYWxsQXR0cmli dXRlcygpIiwgIid0b29sa2l0OldlYktpdEd0ayciKTsKICAgICB9CiAgICAgc3VjY2Vzc2Z1bGx5 UGFyc2VkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nl c3NpYmlsaXR5L29iamVjdC13aXRoLXRpdGxlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L29iamVjdC13aXRoLXRpdGxlLWV4cGVjdGVkLnR4dApp bmRleCBmOWZiZWYxLi43ZDg5ZDIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvYWNjZXNzaWJpbGl0eS9vYmplY3Qtd2l0aC10aXRsZS1leHBlY3RlZC50eHQKKysrIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvb2JqZWN0LXdpdGgtdGl0bGUtZXhw ZWN0ZWQudHh0CkBAIC03LDkgKzcsOSBAQCBUaGlzIHRlc3RzIHRoZSBpbmNsdXNpb24gb2Ygb2Jq ZWN0cyB3aXRoIGEgdGl0bGUgYXR0cmlidXRlLgogT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEg c2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgog CiAKLVBBU1MgY2hpbGQucm9sZSBpcyAnbGlzdCcKLVBBU1MgY2hpbGQucm9sZSBpcyAnc2VjdGlv bicKLVBBU1MgY2hpbGQucm9sZSBpcyAnbGlzdCcKK1BBU1MgY2hpbGQucm9sZSBpcyAnQVhSb2xl OiBsaXN0JworUEFTUyBjaGlsZC5yb2xlIGlzICdBWFJvbGU6IHNlY3Rpb24nCitQQVNTIGNoaWxk LnJvbGUgaXMgJ0FYUm9sZTogbGlzdCcKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUK IAogVEVTVCBDT01QTEVURQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Fj Y2Vzc2liaWxpdHkvb2JqZWN0LXdpdGgtdGl0bGUuaHRtbCBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9hY2Nlc3NpYmlsaXR5L29iamVjdC13aXRoLXRpdGxlLmh0bWwKaW5kZXggMDE5MmQ3Yy4u NTdiMDAwZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxp dHkvb2JqZWN0LXdpdGgtdGl0bGUuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv YWNjZXNzaWJpbGl0eS9vYmplY3Qtd2l0aC10aXRsZS5odG1sCkBAIC0yNCwxMyArMjQsMTMgQEAg dmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOwogICAgICAgICB2YXIgd2ViQXJlYSA9IGFj Y2Vzc2liaWxpdHlDb250cm9sbGVyLmZvY3VzZWRFbGVtZW50OwogCiAgICAgICAgIHZhciBjaGls ZCA9IHdlYkFyZWEuY2hpbGRBdEluZGV4KDApOwotICAgICAgICBzaG91bGRCZSgiY2hpbGQucm9s ZSIsICInbGlzdCciKTsKKyAgICAgICAgc2hvdWxkQmUoImNoaWxkLnJvbGUiLCAiJ0FYUm9sZTog bGlzdCciKTsKIAogICAgICAgICBjaGlsZCA9IHdlYkFyZWEuY2hpbGRBdEluZGV4KDEpOwotICAg ICAgICBzaG91bGRCZSgiY2hpbGQucm9sZSIsICInc2VjdGlvbiciKTsKKyAgICAgICAgc2hvdWxk QmUoImNoaWxkLnJvbGUiLCAiJ0FYUm9sZTogc2VjdGlvbiciKTsKIAogICAgICAgICBjaGlsZCA9 IGNoaWxkLmNoaWxkQXRJbmRleCgwKTsKLSAgICAgICAgc2hvdWxkQmUoImNoaWxkLnJvbGUiLCAi J2xpc3QnIik7CisgICAgICAgIHNob3VsZEJlKCJjaGlsZC5yb2xlIiwgIidBWFJvbGU6IGxpc3Qn Iik7CiAgICAgfQogICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CiA8L3NjcmlwdD4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RhYmxlLWhp ZXJhcmNoeS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJp bGl0eS90YWJsZS1oaWVyYXJjaHktZXhwZWN0ZWQudHh0CmluZGV4IDFiYTMzNDUuLmQ1N2NmODUg MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5L3RhYmxl LWhpZXJhcmNoeS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2Fj Y2Vzc2liaWxpdHkvdGFibGUtaGllcmFyY2h5LWV4cGVjdGVkLnR4dApAQCAtMTcsMzggKzE3LDM4 IEBAIFRoaXMgdGVzdHMgdGhlIEF0ayB0YWJsZSBoaWVyYXJoeS4KIE9uIHN1Y2Nlc3MsIHlvdSB3 aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENP TVBMRVRFIi4KIAogCi1QQVNTIHRhYmxlMS5yb2xlIGlzICd0YWJsZScKK1BBU1MgdGFibGUxLnJv bGUgaXMgJ0FYUm9sZTogdGFibGUnCiBQQVNTIHRhYmxlMS5yb3dDb3VudCBpcyAxCiBQQVNTIHRh YmxlMS5jb2x1bW5Db3VudCBpcyAyCi1QQVNTIHRhYmxlMi5yb2xlIGlzICd0YWJsZScKK1BBU1Mg dGFibGUyLnJvbGUgaXMgJ0FYUm9sZTogdGFibGUnCiBQQVNTIHRhYmxlMi5yb3dDb3VudCBpcyAz CiBQQVNTIHRhYmxlMi5jb2x1bW5Db3VudCBpcyAyCi1QQVNTIHRhYmxlMy5yb2xlIGlzICd0YWJs ZScKK1BBU1MgdGFibGUzLnJvbGUgaXMgJ0FYUm9sZTogdGFibGUnCiBQQVNTIHRhYmxlMy5yb3dD b3VudCBpcyAxCiBQQVNTIHRhYmxlMy5jb2x1bW5Db3VudCBpcyAyCi1QQVNTIHRhYmxlNC5yb2xl IGlzICd0YWJsZScKK1BBU1MgdGFibGU0LnJvbGUgaXMgJ0FYUm9sZTogdGFibGUnCiBQQVNTIHRh YmxlNC5yb3dDb3VudCBpcyAzCiBQQVNTIHRhYmxlNC5jb2x1bW5Db3VudCBpcyAyCiBQQVNTIGNo aWxkcmVuIGlzIDIKLVBBU1MgdGFibGUxLmNoaWxkQXRJbmRleChpKS5yb2xlIGlzICd0YWJsZSBj ZWxsJwotUEFTUyB0YWJsZTEuY2hpbGRBdEluZGV4KGkpLnJvbGUgaXMgJ3RhYmxlIGNlbGwnCitQ QVNTIHRhYmxlMS5jaGlsZEF0SW5kZXgoaSkucm9sZSBpcyAnQVhSb2xlOiB0YWJsZSBjZWxsJwor UEFTUyB0YWJsZTEuY2hpbGRBdEluZGV4KGkpLnJvbGUgaXMgJ0FYUm9sZTogdGFibGUgY2VsbCcK IFBBU1MgY2hpbGRyZW4gaXMgNgotUEFTUyB0YWJsZTIuY2hpbGRBdEluZGV4KGkpLnJvbGUgaXMg J3RhYmxlIGNlbGwnCi1QQVNTIHRhYmxlMi5jaGlsZEF0SW5kZXgoaSkucm9sZSBpcyAndGFibGUg Y2VsbCcKLVBBU1MgdGFibGUyLmNoaWxkQXRJbmRleChpKS5yb2xlIGlzICd0YWJsZSBjZWxsJwot UEFTUyB0YWJsZTIuY2hpbGRBdEluZGV4KGkpLnJvbGUgaXMgJ3RhYmxlIGNlbGwnCi1QQVNTIHRh YmxlMi5jaGlsZEF0SW5kZXgoaSkucm9sZSBpcyAndGFibGUgY2VsbCcKLVBBU1MgdGFibGUyLmNo aWxkQXRJbmRleChpKS5yb2xlIGlzICd0YWJsZSBjZWxsJworUEFTUyB0YWJsZTIuY2hpbGRBdElu ZGV4KGkpLnJvbGUgaXMgJ0FYUm9sZTogdGFibGUgY2VsbCcKK1BBU1MgdGFibGUyLmNoaWxkQXRJ bmRleChpKS5yb2xlIGlzICdBWFJvbGU6IHRhYmxlIGNlbGwnCitQQVNTIHRhYmxlMi5jaGlsZEF0 SW5kZXgoaSkucm9sZSBpcyAnQVhSb2xlOiB0YWJsZSBjZWxsJworUEFTUyB0YWJsZTIuY2hpbGRB dEluZGV4KGkpLnJvbGUgaXMgJ0FYUm9sZTogdGFibGUgY2VsbCcKK1BBU1MgdGFibGUyLmNoaWxk QXRJbmRleChpKS5yb2xlIGlzICdBWFJvbGU6IHRhYmxlIGNlbGwnCitQQVNTIHRhYmxlMi5jaGls ZEF0SW5kZXgoaSkucm9sZSBpcyAnQVhSb2xlOiB0YWJsZSBjZWxsJwogUEFTUyBjaGlsZHJlbiBp cyAyCi1QQVNTIHRhYmxlMy5jaGlsZEF0SW5kZXgoaSkucm9sZSBpcyAndGFibGUgY2VsbCcKLVBB U1MgdGFibGUzLmNoaWxkQXRJbmRleChpKS5yb2xlIGlzICd0YWJsZSBjZWxsJworUEFTUyB0YWJs ZTMuY2hpbGRBdEluZGV4KGkpLnJvbGUgaXMgJ0FYUm9sZTogdGFibGUgY2VsbCcKK1BBU1MgdGFi bGUzLmNoaWxkQXRJbmRleChpKS5yb2xlIGlzICdBWFJvbGU6IHRhYmxlIGNlbGwnCiBQQVNTIGNo aWxkcmVuIGlzIDYKLVBBU1MgdGFibGU0LmNoaWxkQXRJbmRleChpKS5yb2xlIGlzICd0YWJsZSBj ZWxsJwotUEFTUyB0YWJsZTQuY2hpbGRBdEluZGV4KGkpLnJvbGUgaXMgJ3RhYmxlIGNlbGwnCi1Q QVNTIHRhYmxlNC5jaGlsZEF0SW5kZXgoaSkucm9sZSBpcyAndGFibGUgY2VsbCcKLVBBU1MgdGFi bGU0LmNoaWxkQXRJbmRleChpKS5yb2xlIGlzICd0YWJsZSBjZWxsJwotUEFTUyB0YWJsZTQuY2hp bGRBdEluZGV4KGkpLnJvbGUgaXMgJ3RhYmxlIGNlbGwnCi1QQVNTIHRhYmxlNC5jaGlsZEF0SW5k ZXgoaSkucm9sZSBpcyAndGFibGUgY2VsbCcKK1BBU1MgdGFibGU0LmNoaWxkQXRJbmRleChpKS5y b2xlIGlzICdBWFJvbGU6IHRhYmxlIGNlbGwnCitQQVNTIHRhYmxlNC5jaGlsZEF0SW5kZXgoaSku cm9sZSBpcyAnQVhSb2xlOiB0YWJsZSBjZWxsJworUEFTUyB0YWJsZTQuY2hpbGRBdEluZGV4KGkp LnJvbGUgaXMgJ0FYUm9sZTogdGFibGUgY2VsbCcKK1BBU1MgdGFibGU0LmNoaWxkQXRJbmRleChp KS5yb2xlIGlzICdBWFJvbGU6IHRhYmxlIGNlbGwnCitQQVNTIHRhYmxlNC5jaGlsZEF0SW5kZXgo aSkucm9sZSBpcyAnQVhSb2xlOiB0YWJsZSBjZWxsJworUEFTUyB0YWJsZTQuY2hpbGRBdEluZGV4 KGkpLnJvbGUgaXMgJ0FYUm9sZTogdGFibGUgY2VsbCcKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2Vk IGlzIHRydWUKIAogVEVTVCBDT01QTEVURQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGFibGUtaGllcmFyY2h5Lmh0bWwgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90YWJsZS1oaWVyYXJjaHkuaHRtbAppbmRleCA3NTA3 ZmZlLi5hNGFjNWRlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS90YWJsZS1oaWVyYXJjaHkuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvYWNjZXNzaWJpbGl0eS90YWJsZS1oaWVyYXJjaHkuaHRtbApAQCAtMzYsNDEgKzM2LDQxIEBA IHZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSBmYWxzZTsKICAgICAgICAgdmFyIHdlYkFyZWEgPSBh Y2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudDsKIAogICAgICAgICB2YXIgdGFi bGUxID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMCk7Ci0gICAgICAgIHNob3VsZEJlKCJ0YWJsZTEu cm9sZSIsICIndGFibGUnIik7CisgICAgICAgIHNob3VsZEJlKCJ0YWJsZTEucm9sZSIsICInQVhS b2xlOiB0YWJsZSciKTsKICAgICAgICAgc2hvdWxkQmUoInRhYmxlMS5yb3dDb3VudCIsICIxIik7 CiAgICAgICAgIHNob3VsZEJlKCJ0YWJsZTEuY29sdW1uQ291bnQiLCAiMiIpOwogICAgICAgICB2 YXIgdGFibGUyID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMSk7Ci0gICAgICAgIHNob3VsZEJlKCJ0 YWJsZTIucm9sZSIsICIndGFibGUnIik7CisgICAgICAgIHNob3VsZEJlKCJ0YWJsZTIucm9sZSIs ICInQVhSb2xlOiB0YWJsZSciKTsKICAgICAgICAgc2hvdWxkQmUoInRhYmxlMi5yb3dDb3VudCIs ICIzIik7CiAgICAgICAgIHNob3VsZEJlKCJ0YWJsZTIuY29sdW1uQ291bnQiLCAiMiIpOwogICAg ICAgICB2YXIgdGFibGUzID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMik7Ci0gICAgICAgIHNob3Vs ZEJlKCJ0YWJsZTMucm9sZSIsICIndGFibGUnIik7CisgICAgICAgIHNob3VsZEJlKCJ0YWJsZTMu cm9sZSIsICInQVhSb2xlOiB0YWJsZSciKTsKICAgICAgICAgc2hvdWxkQmUoInRhYmxlMy5yb3dD b3VudCIsICIxIik7CiAgICAgICAgIHNob3VsZEJlKCJ0YWJsZTMuY29sdW1uQ291bnQiLCAiMiIp OwogICAgICAgICB2YXIgdGFibGU0ID0gd2ViQXJlYS5jaGlsZEF0SW5kZXgoMyk7Ci0gICAgICAg IHNob3VsZEJlKCJ0YWJsZTQucm9sZSIsICIndGFibGUnIik7CisgICAgICAgIHNob3VsZEJlKCJ0 YWJsZTQucm9sZSIsICInQVhSb2xlOiB0YWJsZSciKTsKICAgICAgICAgc2hvdWxkQmUoInRhYmxl NC5yb3dDb3VudCIsICIzIik7CiAgICAgICAgIHNob3VsZEJlKCJ0YWJsZTQuY29sdW1uQ291bnQi LCAiMiIpOwogCiAgICAgICAgIHZhciBjaGlsZHJlbiA9IHRhYmxlMS5jaGlsZHJlbkNvdW50Owog ICAgICAgICBzaG91bGRCZSgiY2hpbGRyZW4iLCAiMiIpOwogICAgICAgICBmb3IgKGkgPSAwOyBp IDwgY2hpbGRyZW47ICsraSkgewotICAgICAgICAgICAgc2hvdWxkQmUoInRhYmxlMS5jaGlsZEF0 SW5kZXgoaSkucm9sZSIsICIndGFibGUgY2VsbCciKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJ0 YWJsZTEuY2hpbGRBdEluZGV4KGkpLnJvbGUiLCAiJ0FYUm9sZTogdGFibGUgY2VsbCciKTsKICAg ICAgICAgfQogICAgICAgICBjaGlsZHJlbiA9IHRhYmxlMi5jaGlsZHJlbkNvdW50OwogICAgICAg ICBzaG91bGRCZSgiY2hpbGRyZW4iLCAiNiIpOwogICAgICAgICBmb3IgKGkgPSAwOyBpIDwgY2hp bGRyZW47ICsraSkgewotICAgICAgICAgICAgc2hvdWxkQmUoInRhYmxlMi5jaGlsZEF0SW5kZXgo aSkucm9sZSIsICIndGFibGUgY2VsbCciKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJ0YWJsZTIu Y2hpbGRBdEluZGV4KGkpLnJvbGUiLCAiJ0FYUm9sZTogdGFibGUgY2VsbCciKTsKICAgICAgICAg fQogICAgICAgICBjaGlsZHJlbiA9IHRhYmxlMy5jaGlsZHJlbkNvdW50OwogICAgICAgICBzaG91 bGRCZSgiY2hpbGRyZW4iLCAiMiIpOwogICAgICAgICBmb3IgKGkgPSAwOyBpIDwgY2hpbGRyZW47 ICsraSkgewotICAgICAgICAgICAgc2hvdWxkQmUoInRhYmxlMy5jaGlsZEF0SW5kZXgoaSkucm9s ZSIsICIndGFibGUgY2VsbCciKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJ0YWJsZTMuY2hpbGRB dEluZGV4KGkpLnJvbGUiLCAiJ0FYUm9sZTogdGFibGUgY2VsbCciKTsKICAgICAgICAgfQogICAg ICAgICBjaGlsZHJlbiA9IHRhYmxlNC5jaGlsZHJlbkNvdW50OwogICAgICAgICBzaG91bGRCZSgi Y2hpbGRyZW4iLCAiNiIpOwogICAgICAgICBmb3IgKGkgPSAwOyBpIDwgY2hpbGRyZW47ICsraSkg ewotICAgICAgICAgICAgc2hvdWxkQmUoInRhYmxlNC5jaGlsZEF0SW5kZXgoaSkucm9sZSIsICIn dGFibGUgY2VsbCciKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJ0YWJsZTQuY2hpbGRBdEluZGV4 KGkpLnJvbGUiLCAiJ0FYUm9sZTogdGFibGUgY2VsbCciKTsKICAgICAgICAgfQogICAgIH0KICAg ICBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGl0bGUtYW5kLWFsdC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90aXRsZS1hbmQtYWx0LWV4cGVjdGVk LnR4dAppbmRleCAyYzU0YWMxLi4xZGM1MzAyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90aXRsZS1hbmQtYWx0LWV4cGVjdGVkLnR4dAorKysgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS90aXRsZS1hbmQtYWx0LWV4cGVj dGVkLnR4dApAQCAtNSwxNCArNSwxNCBAQCBUaGlzIHRlc3RzIHRoZSBleHBvc3VyZSBvZiBhbHQg YW5kIHRpdGxlIGluZm9ybWF0aW9uLgogT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVz IG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgogCiAKLVBB U1MgaW1hZ2UudGl0bGUgaXMgJ0ltYWdlIGFsdCBhdHRyJwotUEFTUyBpbWFnZS5kZXNjcmlwdGlv biBpcyAnSW1hZ2UgdGl0bGUgYXR0cicKLVBBU1MgbGluay50aXRsZSBpcyAnJwotUEFTUyBsaW5r LmRlc2NyaXB0aW9uIGlzICdMaW5rIHRpdGxlIGF0dHInCi1QQVNTIGVudHJ5LnRpdGxlIGlzICcn Ci1QQVNTIGVudHJ5LmRlc2NyaXB0aW9uIGlzICdFbnRyeSB0aXRsZSBhdHRyJwotUEFTUyBidXR0 b24udGl0bGUgaXMgJ1N1Ym1pdCcKLVBBU1MgYnV0dG9uLmRlc2NyaXB0aW9uIGlzICdTdWJtaXQg YnV0dG9uIHRpdGxlIGF0dHInCitQQVNTIGltYWdlLnRpdGxlIGlzICdBWFRpdGxlOiBJbWFnZSBh bHQgYXR0cicKK1BBU1MgaW1hZ2UuZGVzY3JpcHRpb24gaXMgJ0FYRGVzY3JpcHRpb246IEltYWdl IHRpdGxlIGF0dHInCitQQVNTIGxpbmsudGl0bGUgaXMgJ0FYVGl0bGU6ICcKK1BBU1MgbGluay5k ZXNjcmlwdGlvbiBpcyAnQVhEZXNjcmlwdGlvbjogTGluayB0aXRsZSBhdHRyJworUEFTUyBlbnRy eS50aXRsZSBpcyAnQVhUaXRsZTogJworUEFTUyBlbnRyeS5kZXNjcmlwdGlvbiBpcyAnQVhEZXNj cmlwdGlvbjogRW50cnkgdGl0bGUgYXR0cicKK1BBU1MgYnV0dG9uLnRpdGxlIGlzICdBWFRpdGxl OiBTdWJtaXQnCitQQVNTIGJ1dHRvbi5kZXNjcmlwdGlvbiBpcyAnQVhEZXNjcmlwdGlvbjogU3Vi bWl0IGJ1dHRvbiB0aXRsZSBhdHRyJwogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQog CiBURVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNj ZXNzaWJpbGl0eS90aXRsZS1hbmQtYWx0Lmh0bWwgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv YWNjZXNzaWJpbGl0eS90aXRsZS1hbmQtYWx0Lmh0bWwKaW5kZXggYWE5MWU3YS4uNjA0OTNiYiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2liaWxpdHkvdGl0bGUt YW5kLWFsdC5odG1sCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9hY2Nlc3NpYmlsaXR5 L3RpdGxlLWFuZC1hbHQuaHRtbApAQCAtMjIsMjAgKzIyLDIwIEBAIHZhciBzdWNjZXNzZnVsbHlQ YXJzZWQgPSBmYWxzZTsKICAgICAgICAgdmFyIHdlYkFyZWEgPSBhY2Nlc3NpYmlsaXR5Q29udHJv bGxlci5mb2N1c2VkRWxlbWVudDsKIAogICAgICAgICB2YXIgaW1hZ2UgPSB3ZWJBcmVhLmNoaWxk QXRJbmRleCgwKTsKLSAgICAgICAgc2hvdWxkQmUoImltYWdlLnRpdGxlIiwgIidJbWFnZSBhbHQg YXR0ciciKTsKLSAgICAgICAgc2hvdWxkQmUoImltYWdlLmRlc2NyaXB0aW9uIiwgIidJbWFnZSB0 aXRsZSBhdHRyJyIpOworICAgICAgICBzaG91bGRCZSgiaW1hZ2UudGl0bGUiLCAiJ0FYVGl0bGU6 IEltYWdlIGFsdCBhdHRyJyIpOworICAgICAgICBzaG91bGRCZSgiaW1hZ2UuZGVzY3JpcHRpb24i LCAiJ0FYRGVzY3JpcHRpb246IEltYWdlIHRpdGxlIGF0dHInIik7CiAKICAgICAgICAgdmFyIGxp bmsgPSB3ZWJBcmVhLmNoaWxkQXRJbmRleCgxKTsKLSAgICAgICAgc2hvdWxkQmUoImxpbmsudGl0 bGUiLCAiJyciKTsKLSAgICAgICAgc2hvdWxkQmUoImxpbmsuZGVzY3JpcHRpb24iLCAiJ0xpbmsg dGl0bGUgYXR0ciciKTsKKyAgICAgICAgc2hvdWxkQmUoImxpbmsudGl0bGUiLCAiJ0FYVGl0bGU6 ICciKTsKKyAgICAgICAgc2hvdWxkQmUoImxpbmsuZGVzY3JpcHRpb24iLCAiJ0FYRGVzY3JpcHRp b246IExpbmsgdGl0bGUgYXR0ciciKTsKIAogICAgICAgICB2YXIgZW50cnkgPSB3ZWJBcmVhLmNo aWxkQXRJbmRleCgyKTsKLSAgICAgICAgc2hvdWxkQmUoImVudHJ5LnRpdGxlIiwgIicnIik7Ci0g ICAgICAgIHNob3VsZEJlKCJlbnRyeS5kZXNjcmlwdGlvbiIsICInRW50cnkgdGl0bGUgYXR0cici KTsKKyAgICAgICAgc2hvdWxkQmUoImVudHJ5LnRpdGxlIiwgIidBWFRpdGxlOiAnIik7CisgICAg ICAgIHNob3VsZEJlKCJlbnRyeS5kZXNjcmlwdGlvbiIsICInQVhEZXNjcmlwdGlvbjogRW50cnkg dGl0bGUgYXR0ciciKTsKIAogICAgICAgICB2YXIgYnV0dG9uID0gd2ViQXJlYS5jaGlsZEF0SW5k ZXgoNCk7Ci0gICAgICAgIHNob3VsZEJlKCJidXR0b24udGl0bGUiLCAiJ1N1Ym1pdCciKTsKLSAg ICAgICAgc2hvdWxkQmUoImJ1dHRvbi5kZXNjcmlwdGlvbiIsICInU3VibWl0IGJ1dHRvbiB0aXRs ZSBhdHRyJyIpOworICAgICAgICBzaG91bGRCZSgiYnV0dG9uLnRpdGxlIiwgIidBWFRpdGxlOiBT dWJtaXQnIik7CisgICAgICAgIHNob3VsZEJlKCJidXR0b24uZGVzY3JpcHRpb24iLCAiJ0FYRGVz Y3JpcHRpb246IFN1Ym1pdCBidXR0b24gdGl0bGUgYXR0ciciKTsKICAgICAgICAgfQogICAgIHN1 Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CiA8L3NjcmlwdD4KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCA0NzY4OTAxLi44NThi OGRhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDYtMDEgIE1hcmlvIFNhbmNoZXogUHJh ZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHdGtdIE1ha2UgRFJUIG1vcmUgY29oZXJlbnQgd2l0aCBvdGhl ciBwb3J0cyB0byBhbGxvdyByZXVzaW5nIG1vcmUgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMDA5CisKKyAgICAgICAgTWFrZSBzdXJlICJB WFJvbGU6ICIsICJBWFRpdGxlOiAiIGFuZCAiQVhEZXNjcmlwdGlvbjogIiBwcmVmaXhlcworICAg ICAgICBhcmUgdXNlZCB3aGVuIHJldHVybmluZyB0aG9zZSB2YWx1ZXMsIGZvciBjb2hlcmVuY3kg d2l0aCBvdGhlciBwb3J0cy4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9BY2Nlc3Np YmlsaXR5VUlFbGVtZW50R3RrLmNwcDoKKyAgICAgICAgKEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6 OnJvbGUpOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6dGl0bGUpOgorICAgICAg ICAoQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6ZGVzY3JpcHRpb24pOgorCiAyMDEwLTA1LTI4ICBZ YWVsIEFoYXJvbiAgPHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBi eSBMYXN6bG8gR29tYm9zLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv Z3RrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRHdGsuY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvZ3RrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRHdGsuY3BwCmluZGV4IDM3MzVkMGEuLmZk YWFkOWMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9BY2Nlc3Np YmlsaXR5VUlFbGVtZW50R3RrLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9n dGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEd0ay5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKIAogI2lu Y2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIkFjY2Vzc2liaWxpdHlVSUVsZW1lbnQuaCIKKyNp bmNsdWRlICJHT3duUHRyLmgiCiAjaW5jbHVkZSAiR1JlZlB0ci5oIgogCiAjaW5jbHVkZSA8SmF2 YVNjcmlwdENvcmUvSlNTdHJpbmdSZWYuaD4KQEAgLTE5Miw3ICsxOTMsMTAgQEAgSlNTdHJpbmdS ZWYgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6cm9sZSgpCiAgICAgaWYgKCFyb2xlKQogICAgICAg ICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVycygwLCAwKTsKIAotICAgIHJldHVy biBKU1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZyhhdGtfcm9sZV9nZXRfbmFtZShyb2xlKSk7 CisgICAgY29uc3QgZ2NoYXIqIHJvbGVOYW1lID0gYXRrX3JvbGVfZ2V0X25hbWUocm9sZSk7Cisg ICAgR093blB0cjxnY2hhcj4gYXhSb2xlKGdfc3RyZHVwX3ByaW50ZigiQVhSb2xlOiAlcyIsIHJv bGVOYW1lKSk7CisKKyAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoYXhS b2xlLmdldCgpKTsKIH0KIAogSlNTdHJpbmdSZWYgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6c3Vi cm9sZSgpCkBAIC0yMTIsNyArMjE2LDkgQEAgSlNTdHJpbmdSZWYgQWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6dGl0bGUoKQogICAgIGlmICghbmFtZSkKICAgICAgICAgcmV0dXJuIEpTU3RyaW5nQ3Jl YXRlV2l0aENoYXJhY3RlcnMoMCwgMCk7CiAKLSAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRo VVRGOENTdHJpbmcobmFtZSk7CisgICAgR093blB0cjxnY2hhcj4gYXhUaXRsZShnX3N0cmR1cF9w cmludGYoIkFYVGl0bGU6ICVzIiwgbmFtZSkpOworCisgICAgcmV0dXJuIEpTU3RyaW5nQ3JlYXRl V2l0aFVURjhDU3RyaW5nKGF4VGl0bGUuZ2V0KCkpOwogfQogCiBKU1N0cmluZ1JlZiBBY2Nlc3Np YmlsaXR5VUlFbGVtZW50OjpkZXNjcmlwdGlvbigpCkBAIC0yMjIsNyArMjI4LDkgQEAgSlNTdHJp bmdSZWYgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6ZGVzY3JpcHRpb24oKQogICAgIGlmICghZGVz Y3JpcHRpb24pCiAgICAgICAgIHJldHVybiBKU1N0cmluZ0NyZWF0ZVdpdGhDaGFyYWN0ZXJzKDAs IDApOwogCi0gICAgcmV0dXJuIEpTU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKGRlc2NyaXB0 aW9uKTsKKyAgICBHT3duUHRyPGdjaGFyPiBheERlc2MoZ19zdHJkdXBfcHJpbnRmKCJBWERlc2Ny aXB0aW9uOiAlcyIsIGRlc2NyaXB0aW9uKSk7CisKKyAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcoYXhEZXNjLmdldCgpKTsKIH0KIAogSlNTdHJpbmdSZWYgQWNjZXNzaWJp bGl0eVVJRWxlbWVudDo6c3RyaW5nVmFsdWUoKQotLSAKMS43LjAuNAoK