82473 2012-03-28 09:17:12 -0700 [GTK] Tools/Scripts/run-gtk-tests should not force you to use the WebKit jhbuild 2012-04-03 11:55:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia mrobinson mrobinson pnormand oldest_to_newest 590025 0 cgarcia 2012-03-28 09:17:12 -0700 We have Tools/gtk/run-with-jhbuild, so that whatever it needs to run with jhbuild can use that script. 590028 1 pnormand 2012-03-28 09:21:59 -0700 Can it by default use the wrapper unless some --no-jhbuild option is passed? 590029 2 134311 cgarcia 2012-03-28 09:22:07 -0700 Created attachment 134311 Patch This way people not using jhbuild can use run-gtk-tests too, and we don't need a special case for when run-gtk-tests is executed by make check. 590034 3 cgarcia 2012-03-28 09:23:11 -0700 (In reply to comment #1) > Can it by default use the wrapper unless some --no-jhbuild option is passed? I don't think we need another command line option for this 590037 4 pnormand 2012-03-28 09:26:34 -0700 (In reply to comment #3) > (In reply to comment #1) > > Can it by default use the wrapper unless some --no-jhbuild option is passed? > > I don't think we need another command line option for this This won't work on the bots, I'm afraid. 590043 5 cgarcia 2012-03-28 09:29:52 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #1) > > > Can it by default use the wrapper unless some --no-jhbuild option is passed? > > > > I don't think we need another command line option for this > > This won't work on the bots, I'm afraid. why? I updated the bot config to use run-with-jhbuild 590044 6 pnormand 2012-03-28 09:32:48 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > (In reply to comment #1) > > > > Can it by default use the wrapper unless some --no-jhbuild option is passed? > > > > > > I don't think we need another command line option for this > > > > This won't work on the bots, I'm afraid. > > why? I updated the bot config to use run-with-jhbuild Right, I missed that! Anyway, we discussed some time ago about being smart and detect if WebKitBuild/Dependencies are there and in that case run in jhbuild by default. Maybe we could start doing that? 590048 7 cgarcia 2012-03-28 09:36:43 -0700 (In reply to comment #6) > (In reply to comment #5) > > (In reply to comment #4) > > > (In reply to comment #3) > > > > (In reply to comment #1) > > > > > Can it by default use the wrapper unless some --no-jhbuild option is passed? > > > > > > > > I don't think we need another command line option for this > > > > > > This won't work on the bots, I'm afraid. > > > > why? I updated the bot config to use run-with-jhbuild > > Right, I missed that! > Anyway, we discussed some time ago about being smart and detect if WebKitBuild/Dependencies are there and in that case run in jhbuild by default. Maybe we could start doing that? why running every command inside run-gtk-test with jhbuild when you can tun the whole script? 590049 8 cgarcia 2012-03-28 09:37:54 -0700 Btw, I think we should so the same for build-webkit 590063 9 134311 mrobinson 2012-03-28 09:58:19 -0700 Comment on attachment 134311 Patch I don't really understand this patch. Do you mind explaining it a bit better? It seems like it will make it more inconvenient for people using the WebKit jhbuild. The script already has the logic to avoid running jhbuild when it isn't there. What does it buy us? 590130 10 mrobinson 2012-03-28 10:50:24 -0700 After talking with Carlos, it seems any solution that doesn't force him to use the WebKit jhbuild is okay. Instead of making it more inconvenient to use the WebKit jhbuild, it should just be possible to avoid using it. I think the tools can be smart enough to make the decision automatically. I'll upload a new patch shortly. 590209 11 134355 mrobinson 2012-03-28 11:43:03 -0700 Created attachment 134355 Patch 590878 12 134355 cgarcia 2012-03-28 23:33:13 -0700 Comment on attachment 134355 Patch Yeah, I think this is enough for me, thanks! 591939 13 134355 pnormand 2012-03-30 01:01:36 -0700 Comment on attachment 134355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134355&action=review Can you fix the floowing little nit before landing? > Tools/ChangeLog:8 > + Only use jhbuild if WebKitBuild/Dependencies (if update- This seems to be truncated 594701 14 mrobinson 2012-04-03 11:55:06 -0700 Committed r113066: <http://trac.webkit.org/changeset/113066> 134311 2012-03-28 09:22:07 -0700 2012-03-28 11:42:54 -0700 Patch wk-run-gtk-tests-no-jhbuild.diff text/plain 5566 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29u ZmlnL21hc3Rlci5jZmcgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3Jn LWNvbmZpZy9tYXN0ZXIuY2ZnCmluZGV4IDQxYmMxYmEuLjdmMTJlYjEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmctY29uZmlnL21hc3Rlci5jZmcK KysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvbWFz dGVyLmNmZwpAQCAtNTIzLDcgKzUyMyw3IEBAIGNsYXNzIFJ1bkd0a0FQSVRlc3RzKHNoZWxsLlRl c3QpOgogICAgIG5hbWUgPSAiQVBJIHRlc3RzIgogICAgIGRlc2NyaXB0aW9uID0gWyJBUEkgdGVz dHMgcnVubmluZyJdCiAgICAgZGVzY3JpcHRpb25Eb25lID0gWyJBUEkgdGVzdHMiXQotICAgIGNv bW1hbmQgPSBbInB5dGhvbiIsICIuL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyIsICItLXZl cmJvc2UiLCBXaXRoUHJvcGVydGllcygiLS0lKGNvbmZpZ3VyYXRpb24pcyIpXQorICAgIGNvbW1h bmQgPSBbInB5dGhvbiIsICIuL1Rvb2xzL2d0ay9ydW4td2l0aC1qaGJ1aWxkIiwgIi4vVG9vbHMv U2NyaXB0cy9ydW4tZ3RrLXRlc3RzIiwgIi0tdmVyYm9zZSIsIFdpdGhQcm9wZXJ0aWVzKCItLSUo Y29uZmlndXJhdGlvbilzIildCiAKICAgICBkZWYgY29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCk6 CiAgICAgICAgIHNoZWxsLlRlc3QuY29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCkKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5NmFhMGVhLi45MTYw NGFiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjMgQEAKIDIwMTItMDMtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNp YUBpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIERvIG5vdCB1c2UgdGhlIGpoYnVpbGQgd3Jh cHBlciBpbiBUb29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJr aXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnOgorICAgICAgICAoUnVuR3RrQVBJVGVzdHMpOiBVc2Ug VG9vbHMvZ3RrL3J1bi13aXRoLWpoYnVpbGQgc2NyaXB0IHRvIHJ1bgorICAgICAgICBHVEsrIEFQ SSB0ZXN0cy4KKyAgICAgICAgKiBTY3JpcHRzL3J1bi1ndGstdGVzdHM6CisgICAgICAgIChUZXN0 UnVubmVyLl9faW5pdF9fKTogUmVtb3ZlIF9qaGJ1aWxkX3BhdGguCisgICAgICAgIChUZXN0UnVu bmVyLl9sb29rdXBfYXRzcGkyX2JpbmFyeSk6IFVzZSBzdWJwcm9jZXNzLlBvcGVuIGluc3RlYWQK KyAgICAgICAgb2YgX2NyZWF0ZV9wcm9jZXNzKCkuCisgICAgICAgIChUZXN0UnVubmVyLl9zdGFy dF9hY2Nlc3NpYmlsaXR5X2RhZW1vbnMpOiBEaXR0by4KKyAgICAgICAgKFRlc3RSdW5uZXIuX3Nl dHVwX3Rlc3RpbmdfZW52aXJvbm1lbnQpOiBEaXR0by4KKyAgICAgICAgKFRlc3RSdW5uZXIuX3J1 bl90ZXN0KTogRGl0dG8uCisKKzIwMTItMDMtMjggIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dh cmNpYUBpZ2FsaWEuY29tPgorCiAgICAgICAgIFtHVEtdIEFkZCAtLXNraXBwZWQgY29tbWFuZCBs aW5lIG9wdGlvbiB0byBUb29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyMzQxCiAKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwpp bmRleCAxYzIwOWFlLi43MDc1N2IxIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1bi1ndGst dGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC03OCwxMSArNzgsNiBA QCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICBzZWxmLl9zcGlfcmVnaXN0cnlkID0gTm9uZQog ICAgICAgICBzZWxmLl9zcGlfYnVzX2xhdW5jaGVyID0gTm9uZQogCi0gICAgICAgICMgcnVuLWd0 ay10ZXN0cyBtYXkgYmUgcnVuIGR1cmluZyBtYWtlIGRpc3RjaGVjaywgd2hpY2ggZG9lc24ndCBp bmNsdWRlIGpoYnVpbGQuCi0gICAgICAgIHNlbGYuX2poYnVpbGRfcGF0aCA9IG9zLnBhdGguam9p bihzZWxmLl9ndGtfdG9vbHNfZGlyZWN0b3J5LCAicnVuLXdpdGgtamhidWlsZCIpCi0gICAgICAg IGlmIG5vdCBvcy5wYXRoLmV4aXN0cyhzZWxmLl9qaGJ1aWxkX3BhdGgpOgotICAgICAgICAgICAg c2VsZi5famhidWlsZF9wYXRoID0gTm9uZQotCiAgICAgZGVmIF9nZXRfdG9wX2xldmVsX2RpcmVj dG9yeShzZWxmKToKICAgICAgICAgcmV0dXJuIG9zLnBhdGgubm9ybXBhdGgob3MucGF0aC5qb2lu KG9zLnBhdGguZGlybmFtZShfX2ZpbGVfXyksICIuLiIsICIuLiIpKQogCkBAIC0xMjIsMTMgKzEx Nyw4IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICAgICAgICAgICAgIHRlc3RzLmFwcGVu ZCh0ZXN0X3BhdGgpCiAgICAgICAgIHJldHVybiB0ZXN0cwogCi0gICAgZGVmIF9jcmVhdGVfcHJv Y2VzcyhzZWxmLCBjb21tYW5kLCBzdGRvdXQ9Tm9uZSwgc3RkZXJyPU5vbmUsIGVudj1vcy5lbnZp cm9uKToKLSAgICAgICAgaWYgc2VsZi5famhidWlsZF9wYXRoOgotICAgICAgICAgICAgY29tbWFu ZC5pbnNlcnQoMCwgc2VsZi5famhidWlsZF9wYXRoKQotICAgICAgICByZXR1cm4gc3VicHJvY2Vz cy5Qb3Blbihjb21tYW5kLCBzdGRvdXQ9c3Rkb3V0LCBzdGRlcnI9c3RkZXJyLCBlbnY9ZW52KQot CiAgICAgZGVmIF9sb29rdXBfYXRzcGkyX2JpbmFyeShzZWxmLCBmaWxlbmFtZSk6Ci0gICAgICAg IHByb2Nlc3MgPSBzZWxmLl9jcmVhdGVfcHJvY2VzcyhbJ3BrZy1jb25maWcnLCAnLS12YXJpYWJs ZT1leGVjX3ByZWZpeCcsICdhdHNwaS0yJ10sIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpCisgICAg ICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsncGtnLWNvbmZpZycsICctLXZhcmlhYmxl PWV4ZWNfcHJlZml4JywgJ2F0c3BpLTInXSwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkKICAgICAg ICAgc3Rkb3V0ID0gcHJvY2Vzcy5jb21tdW5pY2F0ZSgpWzBdCiAgICAgICAgIGV4ZWNfcHJlZml4 ID0gc3Rkb3V0LnJzdHJpcCgnXHJcbicpCiAgICAgICAgIGZvciBwYXRoIGluIFsgJ2xpYmV4ZWMn LCAnbGliL2F0LXNwaTItY29yZScsICdsaWIzMi9hdC1zcGkyLWNvcmUnLCAnbGliNjQvYXQtc3Bp Mi1jb3JlJyBdOgpAQCAtMTM5LDE2ICsxMjksMTMgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAg ICAgcmV0dXJuIE5vbmUKIAogICAgIGRlZiBfc3RhcnRfYWNjZXNzaWJpbGl0eV9kYWVtb25zKHNl bGYpOgotICAgICAgICBpZiBub3Qgc2VsZi5famhidWlsZF9wYXRoOgotICAgICAgICAgICAgcmV0 dXJuIEZhbHNlCi0KICAgICAgICAgc3BpX2J1c19sYXVuY2hlcl9wYXRoID0gc2VsZi5fbG9va3Vw X2F0c3BpMl9iaW5hcnkoJ2F0LXNwaS1idXMtbGF1bmNoZXInKQogICAgICAgICBzcGlfcmVnaXN0 cnlkX3BhdGggPSBzZWxmLl9sb29rdXBfYXRzcGkyX2JpbmFyeSgnYXQtc3BpMi1yZWdpc3RyeWQn KQogICAgICAgICBpZiBub3Qgc3BpX2J1c19sYXVuY2hlcl9wYXRoIG9yIG5vdCBzcGlfcmVnaXN0 cnlkX3BhdGg6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgICAgICB0cnk6Ci0gICAg ICAgICAgICBzZWxmLl9hbGx5X2J1c19sYXVuY2hlciA9IHNlbGYuX2NyZWF0ZV9wcm9jZXNzKFtz cGlfYnVzX2xhdW5jaGVyX3BhdGhdLCBlbnY9c2VsZi5fdGVzdF9lbnYpCisgICAgICAgICAgICBz ZWxmLl9hbGx5X2J1c19sYXVuY2hlciA9IHN1YnByb2Nlc3MuUG9wZW4oW3NwaV9idXNfbGF1bmNo ZXJfcGF0aF0sIGVudj1zZWxmLl90ZXN0X2VudikKICAgICAgICAgZXhjZXB0OgogICAgICAgICAg ICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIGxhdW5jaCB0aGUgYWNjZXNzaWJpbGl0eSBi dXNcbiIpCiAgICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKQEAgLTE2Miw3ICsxNDksNyBA QCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICBsb29wLnJ1bigpCiAKICAgICAgICAgdHJ5Ogot ICAgICAgICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5ZCA9IHNlbGYuX2NyZWF0ZV9wcm9jZXNzKFtz cGlfcmVnaXN0cnlkX3BhdGhdLCBlbnY9c2VsZi5fdGVzdF9lbnYpCisgICAgICAgICAgICBzZWxm Ll9zcGlfcmVnaXN0cnlkID0gc3VicHJvY2Vzcy5Qb3Blbihbc3BpX3JlZ2lzdHJ5ZF9wYXRoXSwg ZW52PXNlbGYuX3Rlc3RfZW52KQogICAgICAgICBleGNlcHQ6CiAgICAgICAgICAgICBzeXMuc3Rk ZXJyLndyaXRlKCJGYWlsZWQgdG8gbGF1bmNoIHRoZSBhY2Nlc3NpYmlsaXR5IHJlZ2lzdHJ5XG4i KQogICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCkBAIC0xNzcsOCArMTY0LDggQEAgY2xh c3MgVGVzdFJ1bm5lcjoKICAgICAgICAgc2VsZi5fdGVzdF9lbnZbJ0dTRVRUSU5HU19CQUNLRU5E J10gPSAnbWVtb3J5JwogCiAgICAgICAgIHRyeToKLSAgICAgICAgICAgIHNlbGYuX3h2ZmIgPSBz ZWxmLl9jcmVhdGVfcHJvY2VzcyhbIlh2ZmIiLCBzZWxmLl9vcHRpb25zLmRpc3BsYXksICItc2Ny ZWVuIiwgIjAiLCAiODAweDYwMHgyNCIsICItbm9saXN0ZW4iLCAidGNwIl0sCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnByb2Nlc3MuUElQ RSwgc3RkZXJyPXN1YnByb2Nlc3MuUElQRSkKKyAgICAgICAgICAgIHNlbGYuX3h2ZmIgPSBzdWJw cm9jZXNzLlBvcGVuKFsiWHZmYiIsIHNlbGYuX29wdGlvbnMuZGlzcGxheSwgIi1zY3JlZW4iLCAi MCIsICI4MDB4NjAweDI0IiwgIi1ub2xpc3RlbiIsICJ0Y3AiXSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0ZGVycj1z dWJwcm9jZXNzLlBJUEUpCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAg ICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byBydW4gWHZmYjogJXNcbiIsIGUpCiAgICAg ICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKQEAgLTIzNCw3ICsyMjEsNyBAQCBjbGFzcyBUZXN0 UnVubmVyOgogICAgICAgICAgICAgdGVzdGVyX2NvbW1hbmQuZXh0ZW5kKFsnLXMnLCB0ZXN0X2Nh c2VdKQogICAgICAgICB0ZXN0ZXJfY29tbWFuZC5hcHBlbmQodGVzdCkKIAotICAgICAgICByZXR1 cm4gbm90IHNlbGYuX2NyZWF0ZV9wcm9jZXNzKHRlc3Rlcl9jb21tYW5kLCBlbnY9c2VsZi5fdGVz dF9lbnYpLndhaXQoKQorICAgICAgICByZXR1cm4gbm90IHN1YnByb2Nlc3MuUG9wZW4odGVzdGVy X2NvbW1hbmQsIGVudj1zZWxmLl90ZXN0X2Vudikud2FpdCgpCiAKICAgICBkZWYgcnVuX3Rlc3Rz KHNlbGYpOgogICAgICAgICBpZiBub3Qgc2VsZi5fdGVzdHM6Cg== 134355 2012-03-28 11:43:03 -0700 2012-03-30 08:33:13 -0700 Patch bug-82473-20120328114301.patch text/plain 1690 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMTExCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODkwNzQ4MDk4MjIyMDJjZWMxYTJkMjVjODRiZWZhZGVj ODdhNDIzMS4uYTc0Y2M1Yjk1ZGU4MTA2N2I2ODM2ZDcyY2VjMDEyZDJlNmM5MWY3YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDEyLTAzLTI4ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXSBUb29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMgc2hvdWxkIG5vdCBm b3JjZSB5b3UgdG8gdXNlIHRoZSBXZWJLaXQgamhidWlsZAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODI0NzMKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBPbmx5IHVzZSBqaGJ1aWxkIGlmIFdlYktpdEJ1aWxk L0RlcGVuZGVuY2llcyAoaWYgdXBkYXRlLQorCisgICAgICAgICogZ3RrL3J1bi13aXRoLWpoYnVp bGQ6IEluc3RlYWQgb2YgdXNpbmcgamhidWlsZCB1bmNvbmRpdGlvbmFsbHksIGZpcnN0CisgICAg ICAgIGNoZWNrIGlmIHRoZSB1c2VyIGhhcyBldmVyIHJ1biB1cGRhdGUtZ3RrLWxpYnMgYW5kLCBp ZiBzbywgdGhlbiB1c2UgamhidWlsZC4KKwogMjAxMi0wMy0yNiAgTGVvIFlhbmcgIDxsZW8ueWFu Z0B0b3JjaG1vYmlsZS5jb20uY24+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFNrZWxldG9uIGNv ZGUgb2YgQXN5bmNGaWxlU3lzdGVtQmxhY2tCZXJyeS5jcHAKZGlmZiAtLWdpdCBhL1Rvb2xzL2d0 ay9ydW4td2l0aC1qaGJ1aWxkIGIvVG9vbHMvZ3RrL3J1bi13aXRoLWpoYnVpbGQKaW5kZXggOWZm MDAzNGJhZDU4YWU1MWFkMTg5ODEwYTA1MmNiMTdjMTcyNzZmOC4uMzRmZWUxYjIxNzk3YmM3YzU2 ZmVjOTg0N2JmMmJmMGJjZDY3MWRmNyAxMDA3NTUKLS0tIGEvVG9vbHMvZ3RrL3J1bi13aXRoLWpo YnVpbGQKKysrIGIvVG9vbHMvZ3RrL3J1bi13aXRoLWpoYnVpbGQKQEAgLTE4LDEwICsxOCwxMyBA QAogIyBGb3VuZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLCBC b3N0b24sIE1BICAwMjExMC0xMzAxICBVU0EKIAogaW1wb3J0IGNvbW1vbgoraW1wb3J0IG9zCiBp bXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogCi1qaGJ1aWxkX3dyYXBwZXIgPSBjb21tb24u dG9wX2xldmVsX3BhdGgoJ1Rvb2xzJywgJ2poYnVpbGQnLCAnamhidWlsZC13cmFwcGVyJykKLXBy b2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFtqaGJ1aWxkX3dyYXBwZXIsICctLWd0aycsICdydW4n XSArIHN5cy5hcmd2WzE6XSkKK2lmIG5vdCBvcy5wYXRoLmV4aXN0cyhjb21tb24udG9wX2xldmVs X3BhdGgoJ1dlYktpdEJ1aWxkJywgJ0RlcGVuZGVuY2llcycpKToKKyAgICBwcm9jZXNzID0gc3Vi cHJvY2Vzcy5Qb3BlbihzeXMuYXJndlsxOl0pCitlbHNlOgorICAgIHByb2Nlc3MgPSBzdWJwcm9j ZXNzLlBvcGVuKFtjb21tb24udG9wX2xldmVsX3BhdGgoJ1Rvb2xzJywgJ2poYnVpbGQnLCAnamhi dWlsZC13cmFwcGVyJyksICctLWd0aycsICdydW4nXSArIHN5cy5hcmd2WzE6XSkKIHByb2Nlc3Mu d2FpdCgpCiBzeXMuZXhpdChwcm9jZXNzLnJldHVybmNvZGUpCg==