97621 2012-09-25 18:36:01 -0700 webkit-patch rebaseline-expectations should take a --platform arg 2012-11-05 11:26:54 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97623 1 dpranke dpranke abarth dglazkov ojan rniwa oldest_to_newest 728121 0 dpranke 2012-09-25 18:36:01 -0700 webkit-patch rebaseline-expectations should take a --platform arg 728122 1 165711 dpranke 2012-09-25 18:37:02 -0700 Created attachment 165711 Patch 728123 2 dpranke 2012-09-25 18:37:31 -0700 Note that this still needs a test ... 757857 3 172195 dpranke 2012-11-02 19:35:14 -0700 Created attachment 172195 Patch 757859 4 dpranke 2012-11-02 19:36:47 -0700 unfortunately, because of the way the code is structured (with the parallel fork of rebaseline-test-internal) it's hard to really test this very well. I don't think the unit tests for --platform=* add much. I did test a bunch by hand (which is how I discovered the locking problem). Let me know if you want me to split the locking code out into a separate patch. 757894 5 172195 ojan 2012-11-02 22:12:19 -0700 Comment on attachment 172195 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172195&action=review > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:157 > + try: Maybe add a FIXME to handle these the same way we do the SCM updates? 758672 6 dpranke 2012-11-05 10:34:31 -0800 (In reply to comment #5) > (From update of attachment 172195 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=172195&action=review > > > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:157 > > + try: > > Maybe add a FIXME to handle these the same way we do the SCM updates? Will do. I'm actually thinking about reworking the way we do parallelism differently; given that the slow part is fetching the URLs, maybe we should just do that in parallel and do the rest of the work all at once (as if we were rebaselining locally). I'll probably fool around with this approach and see how it goes ... 758733 7 dpranke 2012-11-05 11:26:54 -0800 Committed r133508: <http://trac.webkit.org/changeset/133508> 165711 2012-09-25 18:37:02 -0700 2012-11-02 19:35:10 -0700 Patch bug-97621-20120925183621.patch text/plain 5957 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5NTczCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGI1MWQwNGIyMDhmZWQxNzIwNmQ4NzJlZDgyYmNmMTEy MThjNWJkYS4uYWQxMzk2NjE0Y2NjZWRlYWFmMDQyNzVmZDg0NTFhOTA1ZjUyZTEwOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIx IEBACisyMDEyLTA5LTI1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4cGVjdGF0aW9ucyBzaG91bGQgdGFrZSBh IC0tcGxhdGZvcm0gYXJnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NzYyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIHNvIHRoYXQgd2UgY2FuIGxpbWl0IHdoaWNoIHBsYXRmb3JtcyB3ZSBhdHRlbXB0IHRv IHJlYmFzZWxpbmU7CisgICAgICAgIHRoaXMgY2FuIHJlZHVjZSB0aGUgbm9pc2UgdGhlIGNvbW1h bmQgcHJvZHVjZXMgaWYgc29tZSBwb3J0cworICAgICAgICBoYXZlIGVycm9ycyBvciB3YXJuaW5n cyBpbiB0aGVpciBUZXN0RXhwZWN0YXRpb25zIGZpbGVzIGFuZC9vcgorICAgICAgICBoZWxwIHBy b2R1Y2UgbW9yZSBwcmVkaWN0YWJsZSByZXN1bHRzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6CisgICAgICAgIChSZWJhc2VsaW5lRXhw ZWN0YXRpb25zLl9faW5pdF9fKToKKyAgICAgICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuZXhl Y3V0ZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxp bmVfdW5pdHRlc3QucHk6CisgICAgICAgIChfYXNzZXJ0X2NvbW1hbmQpOgorCiAyMDEyLTA5LTI1 ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCB0 aGUgYnVpbGQgYWZ0ZXIgcjEyOTU2Ni4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKaW5kZXggY2I4ZmEwMDFmNDJhZWVlZTNhNzkyMmMw YWYzY2M3MjgxMjYxY2JiZC4uMTdlZDI3NGU1MDcyZGMzMWEwOGEzOGNiOTYzOTJjY2JkZWQxMWJk MCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFz ZWxpbmUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFz ZWxpbmUucHkKQEAgLTI2LDYgKzI2LDcgQEAKICMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CiAKK2ltcG9ydCBmbm1hdGNoCiBpbXBvcnQganNvbgogaW1wb3J0IGxvZ2dpbmcKIGltcG9ydCBv cHRwYXJzZQpAQCAtNDUsNyArNDYsNyBAQCBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250 cm9sbGVycy50ZXN0X3Jlc3VsdF93cml0ZXIgaW1wb3J0IFRlc3RSZXN1bHRXcml0ZQogZnJvbSB3 ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X2ZhaWx1cmVzCiBmcm9tIHdl YmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9jb25maWd1cmF0aW9uIGltcG9ydCBUZXN0 Q29uZmlndXJhdGlvbgogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfZXhw ZWN0YXRpb25zIGltcG9ydCBUZXN0RXhwZWN0YXRpb25zLCBCQVNFTElORV9TVUZGSVhfTElTVAot ZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgYnVpbGRlcnMKK2Zyb20gd2Vi a2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGJ1aWxkZXJzLCBwb3J0X29wdGlvbnMKIGZy b20gd2Via2l0cHkudG9vbC5ncmFtbWFyIGltcG9ydCBwbHVyYWxpemUKIGZyb20gd2Via2l0cHku dG9vbC5tdWx0aWNvbW1hbmR0b29sIGltcG9ydCBBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZAog CkBAIC0zMjEsNiArMzIyLDkgQEAgY2xhc3MgUmViYXNlbGluZUV4cGVjdGF0aW9ucyhBYnN0cmFj dFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQpOgogICAgIG5hbWUgPSAicmViYXNlbGluZS1leHBl Y3RhdGlvbnMiCiAgICAgaGVscF90ZXh0ID0gIlJlYmFzZWxpbmVzIHRoZSB0ZXN0cyBpbmRpY2F0 ZWQgaW4gVGVzdEV4cGVjdGF0aW9ucy4iCiAKKyAgICBkZWYgX19pbml0X18oc2VsZik6CisgICAg ICAgIEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBvcHRp b25zPXBvcnRfb3B0aW9ucyhwbGF0Zm9ybT0ncG9ydC9wbGF0Zm9ybSB0byB1c2UuIFVzZSBnbG9i LXN0eWxlIHdpbGRjYXJkcyBmb3IgbXVsdGlwbGUgcG9ydHMnKSkKKwogICAgIGRlZiBfdXBkYXRl X2V4cGVjdGF0aW9uc19maWxlcyhzZWxmLCBwb3J0X25hbWUpOgogICAgICAgICBwb3J0ID0gc2Vs Zi5fdG9vbC5wb3J0X2ZhY3RvcnkuZ2V0KHBvcnRfbmFtZSkKIApAQCAtMzUzLDcgKzM1NywxNCBA QCBjbGFzcyBSZWJhc2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5l Q29tbWFuZCk6CiAKICAgICBkZWYgZXhlY3V0ZShzZWxmLCBvcHRpb25zLCBhcmdzLCB0b29sKToK ICAgICAgICAgc2VsZi5fdGVzdF9saXN0ID0ge30KLSAgICAgICAgZm9yIHBvcnRfbmFtZSBpbiB0 b29sLnBvcnRfZmFjdG9yeS5hbGxfcG9ydF9uYW1lcygpOgorICAgICAgICBpZiBvcHRpb25zLnBs YXRmb3JtOgorICAgICAgICAgICAgcG9ydF9uYW1lcyA9IGZubWF0Y2guZmlsdGVyKHRvb2wucG9y dF9mYWN0b3J5LmFsbF9wb3J0X25hbWVzKCksIG9wdGlvbnMucGxhdGZvcm0pCisgICAgICAgICAg ICBpZiBub3QgcG9ydF9uYW1lczoKKyAgICAgICAgICAgICAgICBwcmludCAiTm8gcG9ydCBuYW1l cyBtYXRjaCAnJXMnIiAlIG9wdGlvbnMucGxhdGZvcm0KKyAgICAgICAgZWxzZToKKyAgICAgICAg ICAgIHBvcnRfbmFtZXMgPSB0b29sLnBvcnRfZmFjdG9yeS5hbGxfcG9ydF9uYW1lcygpCisKKyAg ICAgICAgZm9yIHBvcnRfbmFtZSBpbiBwb3J0X25hbWVzOgogICAgICAgICAgICAgc2VsZi5fYWRk X3Rlc3RzX3RvX3JlYmFzZWxpbmVfZm9yX3BvcnQocG9ydF9uYW1lKQogICAgICAgICBpZiBub3Qg c2VsZi5fdGVzdF9saXN0OgogICAgICAgICAgICAgX2xvZy53YXJuaW5nKCJEaWQgbm90IGZpbmQg YW55IHRlc3RzIG1hcmtlZCBSZWJhc2VsaW5lLiIpCkBAIC0zNjEsNyArMzcyLDcgQEAgY2xhc3Mg UmViYXNlbGluZUV4cGVjdGF0aW9ucyhBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQp OgogCiAgICAgICAgIHNlbGYuX3JlYmFzZWxpbmUob3B0aW9ucywgc2VsZi5fdGVzdF9saXN0KQog Ci0gICAgICAgIGZvciBwb3J0X25hbWUgaW4gdG9vbC5wb3J0X2ZhY3RvcnkuYWxsX3BvcnRfbmFt ZXMoKToKKyAgICAgICAgZm9yIHBvcnRfbmFtZSBpbiBwb3J0X25hbWVzOgogICAgICAgICAgICAg c2VsZi5fdXBkYXRlX2V4cGVjdGF0aW9uc19maWxlcyhwb3J0X25hbWUpCiAKIApkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRl c3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91 bml0dGVzdC5weQppbmRleCAyMmZiMTcwNGI0N2E5N2YwNmVlY2MxYTI1MmMyMWVkNTJhOGExODYw Li43ZGFmNjU1YjJjMzBlNmZiNWRlMzRiODYyNmNmYmU4Njk5ODQ4NzhhIDEwMDY0NAotLS0gYS9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91 bml0dGVzdC5weQpAQCAtMjk1LDcgKzI5NSw3IEBAIE1PQ0sgcnVuX2NvbW1hbmQ6IFsncW1ha2Un LCAnLXYnXSwgY3dkPU5vbmUKICIiIgogCiAgICAgICAgIGNvbW1hbmQuX3Rlc3RzX3RvX3JlYmFz ZWxpbmUgPSBsYW1iZGEgcG9ydDogeyd1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCc6IHNl dChbJ3R4dCddKSwgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcnOiBzZXQoWydwbmcnXSl9Ci0gICAg ICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhzZWxmLCBjb21tYW5kLmV4ZWN1dGUs IFtNb2NrT3B0aW9ucyhvcHRpbWl6ZT1GYWxzZSksIFtdLCB0b29sXSwgZXhwZWN0ZWRfbG9ncz1l eHBlY3RlZF9sb2dzLCBleHBlY3RlZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0LCBleHBlY3RlZF9z dGRlcnI9ZXhwZWN0ZWRfc3RkZXJyKQorICAgICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291 dHB1dHMoc2VsZiwgY29tbWFuZC5leGVjdXRlLCBbTW9ja09wdGlvbnMob3B0aW1pemU9RmFsc2Us IHBsYXRmb3JtPU5vbmUpLCBbXSwgdG9vbF0sIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncywg ZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVkX3N0ZG91dCwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVk X3N0ZGVycikKIAogICAgICAgICBleHBlY3RlZF9zdGRlcnJfd2l0aF9vcHRpbWl6ZSA9ICIiIk1P Q0sgcnVuX2NvbW1hbmQ6IFsncW1ha2UnLCAnLXYnXSwgY3dkPU5vbmUKIE1PQ0sgcnVuX2NvbW1h bmQ6IFsncW1ha2UnLCAnLXYnXSwgY3dkPU5vbmUKQEAgLTMxMCwxMSArMzEwLDExIEBAIE1PQ0sg cnVuX2NvbW1hbmQ6IFsncW1ha2UnLCAnLXYnXSwgY3dkPU5vbmUKICIiIgogCiAgICAgICAgIGNv bW1hbmQuX3Rlc3RzX3RvX3JlYmFzZWxpbmUgPSBsYW1iZGEgcG9ydDogeyd1c2Vyc2NyaXB0cy9h bm90aGVyLXRlc3QuaHRtbCc6IHNldChbJ3R4dCddKSwgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcn OiBzZXQoWydwbmcnXSl9Ci0gICAgICAgIE91dHB1dENhcHR1cmUoKS5hc3NlcnRfb3V0cHV0cyhz ZWxmLCBjb21tYW5kLmV4ZWN1dGUsIFtNb2NrT3B0aW9ucyhvcHRpbWl6ZT1UcnVlKSwgW10sIHRv b2xdLCBleHBlY3RlZF9sb2dzPWV4cGVjdGVkX2xvZ3MsIGV4cGVjdGVkX3N0ZG91dD1leHBlY3Rl ZF9zdGRvdXQsIGV4cGVjdGVkX3N0ZGVycj1leHBlY3RlZF9zdGRlcnJfd2l0aF9vcHRpbWl6ZSkK KyAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIGNvbW1hbmQuZXhl Y3V0ZSwgW01vY2tPcHRpb25zKG9wdGltaXplPVRydWUsIHBsYXRmb3JtPU5vbmUpLCBbXSwgdG9v bF0sIGV4cGVjdGVkX2xvZ3M9ZXhwZWN0ZWRfbG9ncywgZXhwZWN0ZWRfc3Rkb3V0PWV4cGVjdGVk X3N0ZG91dCwgZXhwZWN0ZWRfc3RkZXJyPWV4cGVjdGVkX3N0ZGVycl93aXRoX29wdGltaXplKQog CiAgICAgZGVmIF9hc3NlcnRfY29tbWFuZChzZWxmLCBjb21tYW5kLCBvcHRpb25zPU5vbmUsIGFy Z3M9Tm9uZSwgZXhwZWN0ZWRfc3Rkb3V0PScnLCBleHBlY3RlZF9zdGRlcnI9JycsIGV4cGVjdGVk X2xvZ3M9JycpOgogICAgICAgICAjIEZJWE1FOiBnZW5lcmFsaXplIHNvIG1vcmUgdGVzdHMgdXNl IHRoaXMgdG8gZ2V0IHJpZCBvZiBib2lsZXJwbGF0ZS4KLSAgICAgICAgb3B0aW9ucyA9IG9wdGlv bnMgb3IgTW9ja09wdGlvbnMob3B0aW1pemU9VHJ1ZSwgYnVpbGRlcnM9Tm9uZSwgc3VmZml4ZXM9 Wyd0eHQnXSwgdmVyYm9zZT1GYWxzZSkKKyAgICAgICAgb3B0aW9ucyA9IG9wdGlvbnMgb3IgTW9j a09wdGlvbnMob3B0aW1pemU9VHJ1ZSwgcGxhdGZvcm09Tm9uZSwgYnVpbGRlcnM9Tm9uZSwgc3Vm Zml4ZXM9Wyd0eHQnXSwgdmVyYm9zZT1GYWxzZSkKICAgICAgICAgYXJncyA9IGFyZ3Mgb3IgW10K IAogICAgICAgICB0b29sID0gTW9ja1Rvb2woKQo= 172195 2012-11-02 19:35:14 -0700 2012-11-02 22:12:18 -0700 Patch bug-97621-20121102193332.patch text/plain 10065 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMzgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNGEwYjYxNTBlOTVhNWNiNTczNjNmZGM1ODcxZDNlZDky YWQ5ZmU2MS4uMzAyMDBlYmYxYTNmZWM2MWYyNmNhNjhkMzYzYWU4ODAxYTI0NjYyOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ1 IEBACiAyMDEyLTExLTAyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4cGVjdGF0aW9ucyBzaG91bGQgdGFrZSBh IC0tcGxhdGZvcm0gYXJnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD05NzYyMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFNvIHRoYXQgd2UgY2FuIGxpbWl0IHdoaWNoIHBsYXRmb3JtcyB3ZSBhdHRlbXB0IHRv IHJlYmFzZWxpbmU7CisgICAgICAgIHRoaXMgY2FuIHJlZHVjZSB0aGUgbm9pc2UgdGhlIGNvbW1h bmQgcHJvZHVjZXMgaWYgc29tZSBwb3J0cworICAgICAgICBoYXZlIGVycm9ycyBvciB3YXJuaW5n cyBpbiB0aGVpciBUZXN0RXhwZWN0YXRpb25zIGZpbGVzIGFuZC9vcgorICAgICAgICBoZWxwIHBy b2R1Y2UgbW9yZSBwcmVkaWN0YWJsZSByZXN1bHRzLgorCisgICAgICAgIEluIHRlc3RpbmcgdGhp cyBwYXRjaCwgSSByZWFsaXplZCB0aGF0IHRoZSByZWJhc2VsaW5lLWluLXBhcmFsbGVsCisgICAg ICAgIGNvbW1hbmRzIChyZWJhc2VsaW5lLWpzb24sIHJlYmFzZWxpbmUtZXhwZWN0YXRpb25zLCBl dGMuKSBjYW4KKyAgICAgICAgY2F1c2UgbXVsdGlwbGUgcmViYXNlbGluZS10ZXN0LWludGVybmFs IGNvbW1hbmRzIHRvIGF0dGVtcHQgdG8KKyAgICAgICAgbW9kaWZ5IHRoZSBUZXN0RXhwZWN0YXRp b25zIGZpbGVzIGNvbmN1cnJlbnRseSwgYW5kIHRoYXQgd2UgbmVlZGVkCisgICAgICAgIHRvIGxv Y2sgdGhlIGZpbGVzIHRvIHByZXZlbnQgY29ycnVwdGlvbjsgaXQgd291bGQgYmUgbmljZSBpZgor ICAgICAgICB3ZSBjYW4gc3BsaXQgdGhlIHVwZGF0aW5nLXRoZS1leHBlY3RhdGlvbnMtZmlsZXMg b3V0IHNlcGFyYXRlbHkKKyAgICAgICAgZnJvbSB1cGRhdGluZyB0aGUgZmlsZXN5c3RlbSAobXVj aCBsaWtlIHdlIGRvIHdpdGggdGhlIHNjbSB1cGRhdGVzKQorICAgICAgICB0byBhdm9pZCB0aGlz IGNvbmN1cnJlbmN5LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVt L2ZpbGVfbG9ja19tb2NrLnB5OiBBZGRlZC4KKyAgICAgICAgKE1vY2tGaWxlTG9jayk6CisgICAg ICAgIChNb2NrRmlsZUxvY2suX19pbml0X18pOgorICAgICAgICAoTW9ja0ZpbGVMb2NrLmFjcXVp cmVfbG9jayk6CisgICAgICAgIChNb2NrRmlsZUxvY2sucmVsZWFzZV9sb2NrKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vc3lzdGVtaG9zdC5weToKKyAgICAgICAg KFN5c3RlbUhvc3QuY29weV9jdXJyZW50X2Vudmlyb25tZW50KToKKyAgICAgICAgKFN5c3RlbUhv c3QpOgorICAgICAgICAoU3lzdGVtSG9zdC5tYWtlX2ZpbGVfbG9jayk6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3N5c3RlbWhvc3RfbW9jay5weToKKyAgICAgICAg KE1vY2tTeXN0ZW1Ib3N0LmNvcHlfY3VycmVudF9lbnZpcm9ubWVudCk6CisgICAgICAgIChNb2Nr U3lzdGVtSG9zdCk6CisgICAgICAgIChNb2NrU3lzdGVtSG9zdC5tYWtlX2ZpbGVfbG9jayk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHk6Cisg ICAgICAgIChSZWJhc2VsaW5lVGVzdC5fdXBkYXRlX2V4cGVjdGF0aW9uc19maWxlKToKKyAgICAg ICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuX19pbml0X18pOgorICAgICAgICAoUmViYXNlbGlu ZUV4cGVjdGF0aW9ucy5fYWRkX3Rlc3RzX3RvX3JlYmFzZWxpbmVfZm9yX3BvcnQpOgorICAgICAg ICAoUmViYXNlbGluZUV4cGVjdGF0aW9ucy5leGVjdXRlKToKKworMjAxMi0xMS0wMiAgRGlyayBQ cmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXRweTogY2xlYW4g dXAgb3B0aW9ucyBmb3Igc3BlY2lmeWluZyBtdWx0aXBsZSBwbGF0Zm9ybXMgYXQgb25jZQogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMTQwCiAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlX2xvY2tf bW9jay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9maWxlX2xvY2tf bW9jay5weQpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi5lMmMxZDVjZGZmNDNjMzVlZjNlYjFjZDk1YWY2NGQwZjdjNDhh ZTA2Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL2ZpbGVfbG9ja19tb2NrLnB5CkBAIC0wLDAgKzEsMzYgQEAKKyMhL3Vzci9iaW4vZW52IHB5 dGhvbgorIyBDb3B5cmlnaHQgKGMpIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KKyMKKyMgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworIyBhcmUgbWV0OgorIyAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25k aXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisjIDIuIFJlZGlzdHJpYnV0aW9u cyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lciBpbiB0aGUKKyMgICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHBy b3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyMKKyMgVEhJUyBTT0ZUV0FSRSBJUyBQUk9W SURFRCBCWSBVTklWRVJTSVRZIE9GIFNaRUdFRCBgYEFTIElTJycgQU5EIEFOWQorIyBFWFBSRVNT IE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRI RQorIyBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyMgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNI QUxMIFVOSVZFUlNJVFkgT0YgU1pFR0VEIE9SCisjIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorIyBFWEVNUExBUlks IE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s CisjIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0Yg VVNFLCBEQVRBLCBPUgorIyBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VW RVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisjIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBD T05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorIyAoSU5DTFVESU5HIE5FR0xJR0VO Q0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0Yg VEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNI IERBTUFHRS4KKworCitjbGFzcyBNb2NrRmlsZUxvY2sob2JqZWN0KToKKyAgICBkZWYgX19pbml0 X18oc2VsZiwgbG9ja19maWxlX3BhdGgsIG1heF93YWl0X3RpbWVfc2VjPTIwKToKKyAgICAgICAg cGFzcworCisgICAgZGVmIGFjcXVpcmVfbG9jayhzZWxmKToKKyAgICAgICAgcGFzcworCisgICAg ZGVmIHJlbGVhc2VfbG9jayhzZWxmKToKKyAgICAgICAgcGFzcwpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3N5c3RlbWhvc3QucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vc3lzdGVtaG9zdC5weQppbmRleCAzYjQ0MzllZTQ3 ODViZGMyMjBlZTcyMzMzMTc5MjY4NDk5YWQxMmEzLi5kZmVjNjhiYzE3YzIwYzFlZjUwMDFlZDlh ZjM5YzI2ZjQ5YTllZTMwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vc3lzdGVtaG9zdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vc3lzdGVtaG9zdC5weQpAQCAtMzAsNyArMzAsNyBAQCBpbXBvcnQgb3MKIGltcG9y dCBwbGF0Zm9ybQogaW1wb3J0IHN5cwogCi1mcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1w b3J0IGVudmlyb25tZW50LCBleGVjdXRpdmUsIGZpbGVzeXN0ZW0sIHBsYXRmb3JtaW5mbywgdXNl ciwgd29ya3NwYWNlCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IGVudmlyb25t ZW50LCBleGVjdXRpdmUsIGZpbGVfbG9jaywgZmlsZXN5c3RlbSwgcGxhdGZvcm1pbmZvLCB1c2Vy LCB3b3Jrc3BhY2UKIAogCiBjbGFzcyBTeXN0ZW1Ib3N0KG9iamVjdCk6CkBAIC00MywzICs0Myw2 IEBAIGNsYXNzIFN5c3RlbUhvc3Qob2JqZWN0KToKIAogICAgIGRlZiBjb3B5X2N1cnJlbnRfZW52 aXJvbm1lbnQoc2VsZik6CiAgICAgICAgIHJldHVybiBlbnZpcm9ubWVudC5FbnZpcm9ubWVudChv cy5lbnZpcm9uLmNvcHkoKSkKKworICAgIGRlZiBtYWtlX2ZpbGVfbG9jayhzZWxmLCBwYXRoKToK KyAgICAgICAgcmV0dXJuIGZpbGVfbG9jay5GaWxlTG9jayhwYXRoKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3N5c3RlbWhvc3RfbW9jay5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9zeXN0ZW1ob3N0X21vY2sucHkKaW5k ZXggNDY2N2IwOGI5YWI4ZGYyNGFiNjE1MWE3MWRjNTMzZTQyNTY3ZmU5ZS4uYTUyOWYzNDgzMTI4 NmU5YTRjODkzZGQwMDhkOWExNzQxMWRhNTJkZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9jb21tb24vc3lzdGVtL3N5c3RlbWhvc3RfbW9jay5weQorKysgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vc3lzdGVtaG9zdF9tb2NrLnB5CkBAIC0yOSw2ICsy OSw3IEBACiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZW52aXJvbm1lbnQgaW1wb3J0IEVu dmlyb25tZW50CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX21vY2sgaW1w b3J0IE1vY2tFeGVjdXRpdmUKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbS5maWxlc3lzdGVt X21vY2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVtCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0u ZmlsZV9sb2NrX21vY2sgaW1wb3J0IE1vY2tGaWxlTG9jawogZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLnBsYXRmb3JtaW5mb19tb2NrIGltcG9ydCBNb2NrUGxhdGZvcm1JbmZvCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi5zeXN0ZW0udXNlcl9tb2NrIGltcG9ydCBNb2NrVXNlcgogZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtLndvcmtzcGFjZV9tb2NrIGltcG9ydCBNb2NrV29ya3NwYWNlCkBA IC01MCwzICs1MSw2IEBAIGNsYXNzIE1vY2tTeXN0ZW1Ib3N0KG9iamVjdCk6CiAKICAgICBkZWYg Y29weV9jdXJyZW50X2Vudmlyb25tZW50KHNlbGYpOgogICAgICAgICByZXR1cm4gRW52aXJvbm1l bnQoeyJNT0NLX0VOVklST05fQ09QWSI6ICcxJ30pCisKKyAgICBkZWYgbWFrZV9maWxlX2xvY2so c2VsZiwgcGF0aCk6CisgICAgICAgIHJldHVybiBNb2NrRmlsZUxvY2socGF0aCkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKaW5kZXgg YjRmMjk2ZDRiM2EyYTI5MGFhNTNmMTdmZDBjN2Y1ZTM5Y2I5MTYxOC4uZTFmYzI3YzY3OTMyMzE0 MTI4ZDk2Mjk5NWY1ZTM3Nzc2MGVhN2Y5ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUucHkKQEAgLTE1MCwxMyArMTUwLDIyIEBAIGNs YXNzIFJlYmFzZWxpbmVUZXN0KEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAKICAgICBk ZWYgX3VwZGF0ZV9leHBlY3RhdGlvbnNfZmlsZShzZWxmLCBidWlsZGVyX25hbWUsIHRlc3RfbmFt ZSk6CiAgICAgICAgIHBvcnQgPSBzZWxmLl90b29sLnBvcnRfZmFjdG9yeS5nZXRfZnJvbV9idWls ZGVyX25hbWUoYnVpbGRlcl9uYW1lKQotICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0 YXRpb25zKHBvcnQsIGluY2x1ZGVfb3ZlcnJpZGVzPUZhbHNlKQogCi0gICAgICAgIGZvciB0ZXN0 X2NvbmZpZ3VyYXRpb24gaW4gcG9ydC5hbGxfdGVzdF9jb25maWd1cmF0aW9ucygpOgotICAgICAg ICAgICAgaWYgdGVzdF9jb25maWd1cmF0aW9uLnZlcnNpb24gPT0gcG9ydC50ZXN0X2NvbmZpZ3Vy YXRpb24oKS52ZXJzaW9uOgotICAgICAgICAgICAgICAgIGV4cGVjdGF0aW9uc1N0cmluZyA9IGV4 cGVjdGF0aW9ucy5yZW1vdmVfY29uZmlndXJhdGlvbl9mcm9tX3Rlc3QodGVzdF9uYW1lLCB0ZXN0 X2NvbmZpZ3VyYXRpb24pCi0KLSAgICAgICAgc2VsZi5fdG9vbC5maWxlc3lzdGVtLndyaXRlX3Rl eHRfZmlsZShwb3J0LnBhdGhfdG9fdGVzdF9leHBlY3RhdGlvbnNfZmlsZSgpLCBleHBlY3RhdGlv bnNTdHJpbmcpCisgICAgICAgICMgU2luY2UgcmViYXNlbGluZS10ZXN0LWludGVybmFsIGNhbiBi ZSBjYWxsZWQgbXVsdGlwbGUgdGltZXMgaW4gcGFyYWxsZWwsCisgICAgICAgICMgd2UgbmVlZCB0 byBlbnN1cmUgdGhhdCB3ZSdyZSBub3QgdHJ5aW5nIHRvIHVwZGF0ZSB0aGUgZXhwZWN0YXRpb25z IGZpbGUKKyAgICAgICAgIyBjb25jdXJyZW50bHkgYXMgd2VsbC4KKyAgICAgICAgdHJ5OgorICAg ICAgICAgICAgcGF0aCA9IHBvcnQucGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKCkKKyAg ICAgICAgICAgIGxvY2sgPSBzZWxmLl90b29sLm1ha2VfZmlsZV9sb2NrKHBhdGggKyAnLmxvY2sn KQorICAgICAgICAgICAgbG9jay5hY3F1aXJlX2xvY2soKQorICAgICAgICAgICAgZXhwZWN0YXRp b25zID0gVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCBpbmNsdWRlX292ZXJyaWRlcz1GYWxzZSkKKyAg ICAgICAgICAgIGZvciB0ZXN0X2NvbmZpZ3VyYXRpb24gaW4gcG9ydC5hbGxfdGVzdF9jb25maWd1 cmF0aW9ucygpOgorICAgICAgICAgICAgICAgIGlmIHRlc3RfY29uZmlndXJhdGlvbi52ZXJzaW9u ID09IHBvcnQudGVzdF9jb25maWd1cmF0aW9uKCkudmVyc2lvbjoKKyAgICAgICAgICAgICAgICAg ICAgZXhwZWN0YXRpb25zU3RyaW5nID0gZXhwZWN0YXRpb25zLnJlbW92ZV9jb25maWd1cmF0aW9u X2Zyb21fdGVzdCh0ZXN0X25hbWUsIHRlc3RfY29uZmlndXJhdGlvbikKKworICAgICAgICAgICAg c2VsZi5fdG9vbC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShwYXRoLCBleHBlY3RhdGlvbnNT dHJpbmcpCisgICAgICAgIGZpbmFsbHk6CisgICAgICAgICAgICBsb2NrLnJlbGVhc2VfbG9jaygp CiAKICAgICBkZWYgX3Rlc3Rfcm9vdChzZWxmLCB0ZXN0X25hbWUpOgogICAgICAgICByZXR1cm4g b3MucGF0aC5zcGxpdGV4dCh0ZXN0X25hbWUpWzBdCkBAIC0zNjgsMTEgKzM3NywxMCBAQCBjbGFz cyBSZWJhc2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0UGFyYWxsZWxSZWJhc2VsaW5lQ29tbWFu ZCk6CiAgICAgaGVscF90ZXh0ID0gIlJlYmFzZWxpbmVzIHRoZSB0ZXN0cyBpbmRpY2F0ZWQgaW4g VGVzdEV4cGVjdGF0aW9ucy4iCiAKICAgICBkZWYgX19pbml0X18oc2VsZik6Ci0gICAgICAgICMg RklYTUU6IFdlIHNob3VsZCBhbHNvIHN1cHBvcnQgcGxhdGZvcm1fb3B0aW9ucyBoZXJlIHNvIHRo YXQgd2Ugb25seSBsb29rIGF0IHNvbWUgVGVzdEV4cGVjdGF0aW9ucyBmaWxlcyBpbnN0ZWFkIG9m IGFsbCBvZiB0aGVtLgotICAgICAgICByZXR1cm4gc3VwZXIoUmViYXNlbGluZUV4cGVjdGF0aW9u cywgc2VsZikuX19pbml0X18ob3B0aW9ucz1bCisgICAgICAgIHN1cGVyKFJlYmFzZWxpbmVFeHBl Y3RhdGlvbnMsIHNlbGYpLl9faW5pdF9fKG9wdGlvbnM9WwogICAgICAgICAgICAgc2VsZi5tb3Zl X292ZXJ3cml0dGVuX2Jhc2VsaW5lc19vcHRpb24sCiAgICAgICAgICAgICBzZWxmLm5vX29wdGlt aXplX29wdGlvbiwKLSAgICAgICAgICAgIF0pCisgICAgICAgICAgICBdICsgc2VsZi5wbGF0Zm9y bV9vcHRpb25zKQogCiAgICAgZGVmIF91cGRhdGVfZXhwZWN0YXRpb25zX2ZpbGVzKHNlbGYsIHBv cnRfbmFtZSk6CiAgICAgICAgIHBvcnQgPSBzZWxmLl90b29sLnBvcnRfZmFjdG9yeS5nZXQocG9y dF9uYW1lKQpAQCAtMzk2LDcgKzQwNCw3IEBAIGNsYXNzIFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMo QWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKToKICAgICAgICAgdGVzdHMgPSBzZWxm Ll90ZXN0c190b19yZWJhc2VsaW5lKHNlbGYuX3Rvb2wucG9ydF9mYWN0b3J5LmdldChwb3J0X25h bWUpKS5pdGVtcygpCiAKICAgICAgICAgaWYgdGVzdHM6Ci0gICAgICAgICAgICBfbG9nLmRlYnVn KCJSZXRyaWV2aW5nIHJlc3VsdHMgZm9yICVzIGZyb20gJXMuIiAlIChwb3J0X25hbWUsIGJ1aWxk ZXJfbmFtZSkpCisgICAgICAgICAgICBfbG9nLmluZm8oIlJldHJpZXZpbmcgcmVzdWx0cyBmb3Ig JXMgZnJvbSAlcy4iICUgKHBvcnRfbmFtZSwgYnVpbGRlcl9uYW1lKSkKIAogICAgICAgICBmb3Ig dGVzdF9uYW1lLCBzdWZmaXhlcyBpbiB0ZXN0czoKICAgICAgICAgICAgIF9sb2cuaW5mbygiICAg ICVzICglcykiICUgKHRlc3RfbmFtZSwgJywnLmpvaW4oc3VmZml4ZXMpKSkKQEAgLTQwNyw3ICs0 MTUsOCBAQCBjbGFzcyBSZWJhc2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0UGFyYWxsZWxSZWJh c2VsaW5lQ29tbWFuZCk6CiAgICAgZGVmIGV4ZWN1dGUoc2VsZiwgb3B0aW9ucywgYXJncywgdG9v bCk6CiAgICAgICAgIG9wdGlvbnMucmVzdWx0c19kaXJlY3RvcnkgPSBOb25lCiAgICAgICAgIHNl bGYuX3Rlc3RfbGlzdCA9IHt9Ci0gICAgICAgIGZvciBwb3J0X25hbWUgaW4gdG9vbC5wb3J0X2Zh Y3RvcnkuYWxsX3BvcnRfbmFtZXMoKToKKyAgICAgICAgcG9ydF9uYW1lcyA9IHRvb2wucG9ydF9m YWN0b3J5LmFsbF9wb3J0X25hbWVzKG9wdGlvbnMucGxhdGZvcm0pCisgICAgICAgIGZvciBwb3J0 X25hbWUgaW4gcG9ydF9uYW1lczoKICAgICAgICAgICAgIHNlbGYuX2FkZF90ZXN0c190b19yZWJh c2VsaW5lX2Zvcl9wb3J0KHBvcnRfbmFtZSkKICAgICAgICAgaWYgbm90IHNlbGYuX3Rlc3RfbGlz dDoKICAgICAgICAgICAgIF9sb2cud2FybmluZygiRGlkIG5vdCBmaW5kIGFueSB0ZXN0cyBtYXJr ZWQgUmViYXNlbGluZS4iKQpAQCAtNDE1LDcgKzQyNCw3IEBAIGNsYXNzIFJlYmFzZWxpbmVFeHBl Y3RhdGlvbnMoQWJzdHJhY3RQYXJhbGxlbFJlYmFzZWxpbmVDb21tYW5kKToKIAogICAgICAgICBz ZWxmLl9yZWJhc2VsaW5lKG9wdGlvbnMsIHNlbGYuX3Rlc3RfbGlzdCkKIAotICAgICAgICBmb3Ig cG9ydF9uYW1lIGluIHRvb2wucG9ydF9mYWN0b3J5LmFsbF9wb3J0X25hbWVzKCk6CisgICAgICAg IGZvciBwb3J0X25hbWUgaW4gcG9ydF9uYW1lczoKICAgICAgICAgICAgIHNlbGYuX3VwZGF0ZV9l eHBlY3RhdGlvbnNfZmlsZXMocG9ydF9uYW1lKQogCiAK