100800 2012-10-30 17:36:05 -0700 webkitpy: refactor common command line arguments for --platform, rebaseline commands 2012-10-31 11:32:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony webkit.review.bot oldest_to_newest 754828 0 dpranke 2012-10-30 17:36:05 -0700 webkitpy: refactor common command line arguments for --platform, rebaseline commands 754829 1 171557 dpranke 2012-10-30 17:37:07 -0700 Created attachment 171557 Patch 754922 2 171557 ojan 2012-10-30 20:49:44 -0700 Comment on attachment 171557 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171557&action=review > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:63 > + move_overwritten_baselines_option = optparse.make_option("--move-overwritten-baselines", action="store_true", default=False, This is unused? > Tools/Scripts/webkitpy/tool/commands/rebaseline.py:70 > + platform_options = factory.platform_options() This is unused? 754934 3 171557 dpranke 2012-10-30 21:20:47 -0700 Comment on attachment 171557 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171557&action=review >> Tools/Scripts/webkitpy/tool/commands/rebaseline.py:70 >> + platform_options = factory.platform_options() > > This is unused? Yeah, these are both used in the next patch (for garden-o-matic and its called commands). I'll delete them for now. 754949 4 171557 ojan 2012-10-30 21:49:59 -0700 Comment on attachment 171557 Patch r=me with the unused bits deleted 755492 5 dpranke 2012-10-31 11:32:31 -0700 Committed r133051: <http://trac.webkit.org/changeset/133051> 171557 2012-10-30 17:37:07 -0700 2012-10-30 21:49:59 -0700 Patch bug-100800-20121030173532.patch text/plain 15339 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODQyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTM2MGMzYmVhODFkNzhjMTIxNGUwM2FjM2RmYzczYjRj YzRiNGNiNi4uMzQ0Nzc5NWE2OWJlOTlmZDZkY2RiYWI4NDk0YTQ1ZmFiNzc4OTkzNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4 IEBACiAyMDEyLTEwLTMwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiByZWZhY3RvciBjb21tb24gY29tbWFuZCBsaW5lIGFyZ3VtZW50cyBm b3IgLS1wbGF0Zm9ybSwgcmViYXNlbGluZSBjb21tYW5kcworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwODAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBjaGFuZ2Ugc2h1ZmZsZXMgYXJvdW5kIGhv dyB3ZSBzaGFyZSBjb21tYW5kLWxpbmUgb3B0aW9ucworICAgICAgICBiZXR3ZWVuIE5SV1QgYW5k IHRoZSB2YXJpb3VzIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5pbmcgY29tbWFuZHMuCisKKyAgICAg ICAgVGhlcmUgYXJlIG5vIGZ1bmN0aW9uYWwgY2hhbmdlcyBpbiB0aGlzIHBhdGNoIGJ1dCBpdCBz aG91bGQgbWFrZQorICAgICAgICB0aGluZ3MgY2xlYXJlciBhbmQgd2lsbCBiZSB1c2VmdWwgaW4g YSBjb3VwbGUgb2YgdXBjb21pbmcgcGF0Y2hlcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3BvcnQvX19pbml0X18ucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5OgorICAgICAgICAocGxhdGZvcm1fb3B0 aW9ucyk6CisgICAgICAgIChjb25maWd1cmF0aW9uX29wdGlvbnMpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6CisgICAgICAgIChw YXJzZV9hcmdzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVl cmllcy5weToKKyAgICAgICAgKFByaW50RXhwZWN0YXRpb25zLl9faW5pdF9fKToKKyAgICAgICAg KFByaW50QmFzZWxpbmVzLl9faW5pdF9fKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rv b2wvY29tbWFuZHMvcmViYXNlbGluZS5weToKKyAgICAgICAgKEFic3RyYWN0UmViYXNlbGluaW5n Q29tbWFuZCk6CisgICAgICAgIChBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1hbmQuX19pbml0X18p OgorICAgICAgICAoUmViYXNlbGluZVRlc3QuX19pbml0X18pOgorICAgICAgICAoT3B0aW1pemVC YXNlbGluZXMuX19pbml0X18pOgorICAgICAgICAoQW5hbHl6ZUJhc2VsaW5lcy5fX2luaXRfXyk6 CisgICAgICAgIChBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQpOgorICAgICAgICAo UmViYXNlbGluZUpzb24uX19pbml0X18pOgorICAgICAgICAoUmViYXNlbGluZUV4cGVjdGF0aW9u cy5fX2luaXRfXyk6CisgICAgICAgIChSZWJhc2VsaW5lLl9faW5pdF9fKToKKworMjAxMi0xMC0z MCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXQt cGF0Y2ggcmViYXNlbGluZSo6IGFkZCBtb3JlIGhlbHBmdWwgbG9nZ2luZwogICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNTYyCiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvX19pbml0X18ucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L19faW5pdF9fLnB5CmluZGV4 IDkzYmRhOWY1NjBiN2I4Mzc0YzZkM2EyMTk2YjYzMGVhMjZmYmU3YjkuLjYzNjViNGNlODcxMGVl YjI3NmQ3ODNmMjVhYWY5NGIxNGY1MThhNDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvX19pbml0X18ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9fX2luaXRfXy5weQpAQCAtMzMsNCArMzMsNCBAQCBp bXBvcnQgYnVpbGRlcnMgICMgV2h5IGlzIHRoaXMgaW4gcG9ydD8KIAogZnJvbSBiYXNlIGltcG9y dCBQb3J0ICAjIEl0J3MgcG9zc2libGUgd2UgZG9uJ3QgbmVlZCB0byBleHBvcnQgdGhpcyB2aXJ0 dWFsIGJhc2VjbGFzcyBvdXRzaWRlIHRoZSBtb2R1bGUuCiBmcm9tIGRyaXZlciBpbXBvcnQgRHJp dmVyLCBEcml2ZXJJbnB1dCwgRHJpdmVyT3V0cHV0Ci1mcm9tIGZhY3RvcnkgaW1wb3J0IHBvcnRf b3B0aW9ucworZnJvbSBmYWN0b3J5IGltcG9ydCBwbGF0Zm9ybV9vcHRpb25zLCBjb25maWd1cmF0 aW9uX29wdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvZmFjdG9yeS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvZmFjdG9yeS5weQppbmRleCA3ZTQ3NTAyMTkwOGE1ZmQ2ZjI2MDgyYjdmOTcxNDc4Yjdj YmI0ZDI4Li5mNjgxNjRlZjJmMWViZmNmYTM0YTFkYzkwZmI0MWI1ZTM4NzM0M2NiIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2ZhY3RvcnkucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9mYWN0b3J5LnB5 CkBAIC0zNSwxNSArMzUsOCBAQCBpbXBvcnQgcmUKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3Rz LnBvcnQgaW1wb3J0IGJ1aWxkZXJzCiAKIAotZGVmIHBvcnRfb3B0aW9ucygqKmhlbHBfc3RyaW5n cyk6CitkZWYgcGxhdGZvcm1fb3B0aW9ucygqKmhlbHBfc3RyaW5ncyk6CiAgICAgcmV0dXJuIFsK LSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi10IiwgIi0tdGFyZ2V0IiwgZGVzdD0iY29u ZmlndXJhdGlvbiIsCi0gICAgICAgICAgICBoZWxwPSIoREVQUkVDQVRFRCkiKSwKLSAgICAgICAg IyBGSVhNRTogLS1oZWxwIHNob3VsZCBkaXNwbGF5IHdoaWNoIGNvbmZpZ3VyYXRpb24gaXMgZGVm YXVsdC4KLSAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tZGVidWcnLCBhY3Rpb249J3N0 b3JlX2NvbnN0JywgY29uc3Q9J0RlYnVnJywgZGVzdD0iY29uZmlndXJhdGlvbiIsCi0gICAgICAg ICAgICBoZWxwPSdTZXQgdGhlIGNvbmZpZ3VyYXRpb24gdG8gRGVidWcnKSwKLSAgICAgICAgb3B0 cGFyc2UubWFrZV9vcHRpb24oJy0tcmVsZWFzZScsIGFjdGlvbj0nc3RvcmVfY29uc3QnLCBjb25z dD0nUmVsZWFzZScsIGRlc3Q9ImNvbmZpZ3VyYXRpb24iLAotICAgICAgICAgICAgaGVscD0nU2V0 IHRoZSBjb25maWd1cmF0aW9uIHRvIFJlbGVhc2UnKSwKICAgICAgICAgb3B0cGFyc2UubWFrZV9v cHRpb24oJy0tcGxhdGZvcm0nLCBhY3Rpb249J3N0b3JlJywKICAgICAgICAgICAgIGhlbHA9aGVs cF9zdHJpbmdzLmdldCgncGxhdGZvcm0nLCAnUGxhdGZvcm0vUG9ydCBiZWluZyB0ZXN0ZWQgKGUu Zy4sICJtYWMtbGlvbiIpJykpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1jaHJv bWl1bScsIGFjdGlvbj0nc3RvcmVfY29uc3QnLCBjb25zdD0nY2hyb21pdW0nLCBkZXN0PSdwbGF0 Zm9ybScsCkBAIC01Niw4ICs0OSwyMSBAQCBkZWYgcG9ydF9vcHRpb25zKCoqaGVscF9zdHJpbmdz KToKICAgICAgICAgICAgIGhlbHA9J0FsaWFzIGZvciAtLXBsYXRmb3JtPWd0aycpLAogICAgICAg ICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1xdCcsIGFjdGlvbj0nc3RvcmVfY29uc3QnLCBjb25z dD0ncXQnLCBkZXN0PSJwbGF0Zm9ybSIsCiAgICAgICAgICAgICBoZWxwPSdBbGlhcyBmb3IgLS1w bGF0Zm9ybT1xdCcpLAorICAgICAgICBdCisKKworZGVmIGNvbmZpZ3VyYXRpb25fb3B0aW9ucygp OgorICAgIHJldHVybiBbCisgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItdCIsICItLXRh cmdldCIsIGRlc3Q9ImNvbmZpZ3VyYXRpb24iLCBoZWxwPSIoREVQUkVDQVRFRCkiKSwKKyAgICAg ICAgIyBGSVhNRTogLS1oZWxwIHNob3VsZCBkaXNwbGF5IHdoaWNoIGNvbmZpZ3VyYXRpb24gaXMg ZGVmYXVsdC4KKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tZGVidWcnLCBhY3Rpb249 J3N0b3JlX2NvbnN0JywgY29uc3Q9J0RlYnVnJywgZGVzdD0iY29uZmlndXJhdGlvbiIsCisgICAg ICAgICAgICBoZWxwPSdTZXQgdGhlIGNvbmZpZ3VyYXRpb24gdG8gRGVidWcnKSwKKyAgICAgICAg b3B0cGFyc2UubWFrZV9vcHRpb24oJy0tcmVsZWFzZScsIGFjdGlvbj0nc3RvcmVfY29uc3QnLCBj b25zdD0nUmVsZWFzZScsIGRlc3Q9ImNvbmZpZ3VyYXRpb24iLAorICAgICAgICAgICAgaGVscD0n U2V0IHRoZSBjb25maWd1cmF0aW9uIHRvIFJlbGVhc2UnKSwKICAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oJy0tMzItYml0JywgYWN0aW9uPSdzdG9yZV9jb25zdCcsIGNvbnN0PSd4ODYnLCBk ZWZhdWx0PU5vbmUsIGRlc3Q9ImFyY2hpdGVjdHVyZSIsCi0gICAgICAgICAgICBoZWxwPSd1c2Ug MzItYml0IGJpbmFyaWVzIGJ5IGRlZmF1bHQgKHg4NiBpbnN0ZWFkIG9mIHg4Nl82NCknKV0KKyAg ICAgICAgICAgIGhlbHA9J3VzZSAzMi1iaXQgYmluYXJpZXMgYnkgZGVmYXVsdCAoeDg2IGluc3Rl YWQgb2YgeDg2XzY0KScpLAorICAgICAgICBdCisKIAogCiBkZWYgX2J1aWxkZXJfb3B0aW9ucyhi dWlsZGVyX25hbWUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggNDUwMGJhMGM3ZjdiOTIxYTVmMjVjNGI1 MGVlYTZhYWFiMjc3YTY2ZS4uMWM4ZTczMjFhZGNmNThhNzY4ZGNjNzNiMjA4ZWFkN2MxMjA0NzZj OSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dl YmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9y dW5fd2Via2l0X3Rlc3RzLnB5CkBAIC00MSw3ICs0MSw3IEBAIGZyb20gd2Via2l0cHkuY29tbW9u Lmhvc3QgaW1wb3J0IEhvc3QKIGZyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBvcnQgc3Rh Y2tfdXRpbHMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmNvbnRyb2xsZXJzLm1hbmFnZXIg aW1wb3J0IE1hbmFnZXIsIFdvcmtlckV4Y2VwdGlvbiwgVGVzdFJ1bkludGVycnVwdGVkRXhjZXB0 aW9uCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfZXhwZWN0 YXRpb25zCi1mcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBwb3J0X29wdGlv bnMKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGNvbmZpZ3VyYXRpb25f b3B0aW9ucywgcGxhdGZvcm1fb3B0aW9ucwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMudmll d3MgaW1wb3J0IHByaW50aW5nCiAKIApAQCAtMjAxLDcgKzIwMSw4IEBAIGRlZiBwYXJzZV9hcmdz KGFyZ3M9Tm9uZSk6CiAKICAgICBvcHRpb25fZ3JvdXBfZGVmaW5pdGlvbnMgPSBbXQogCi0gICAg b3B0aW9uX2dyb3VwX2RlZmluaXRpb25zLmFwcGVuZCgoIkNvbmZpZ3VyYXRpb24gb3B0aW9ucyIs IHBvcnRfb3B0aW9ucygpKSkKKyAgICBvcHRpb25fZ3JvdXBfZGVmaW5pdGlvbnMuYXBwZW5kKCgi UGxhdGZvcm0gb3B0aW9ucyIsIHBsYXRmb3JtX29wdGlvbnMoKSkpCisgICAgb3B0aW9uX2dyb3Vw X2RlZmluaXRpb25zLmFwcGVuZCgoIkNvbmZpZ3VyYXRpb24gb3B0aW9ucyIsIGNvbmZpZ3VyYXRp b25fb3B0aW9ucygpKSkKICAgICBvcHRpb25fZ3JvdXBfZGVmaW5pdGlvbnMuYXBwZW5kKCgiUHJp bnRpbmcgT3B0aW9ucyIsIHByaW50aW5nLnByaW50X29wdGlvbnMoKSkpCiAKICAgICAjIEZJWE1F OiBUaGVzZSBvcHRpb25zIHNob3VsZCBtb3ZlIG9udG8gdGhlIENocm9taXVtUG9ydC4KZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWVyaWVzLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKaW5kZXggOWZl OGVmMzUzMjQ2ZjFiZWJmNWU1OGZkNmFhZmNiMzQxMjJjN2UyZi4uOTEwODNmNTg1ZWJmMzljZjFm ZGY3N2I1YjZkODg4YmMzN2ZkNDAxMSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL2NvbW1hbmRzL3F1ZXJpZXMucHkKQEAgLTQ3LDcgKzQ3LDcgQEAgZnJvbSB3ZWJraXRweS50 b29sLmdyYW1tYXIgaW1wb3J0IHBsdXJhbGl6ZQogZnJvbSB3ZWJraXRweS50b29sLm11bHRpY29t bWFuZHRvb2wgaW1wb3J0IEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kCiBmcm9tIHdlYmtpdHB5 LmNvbW1vbi5zeXN0ZW0uZGVwcmVjYXRlZF9sb2dnaW5nIGltcG9ydCBsb2cKIGZyb20gd2Via2l0 cHkubGF5b3V0X3Rlc3RzLm1vZGVscy50ZXN0X2V4cGVjdGF0aW9ucyBpbXBvcnQgVGVzdEV4cGVj dGF0aW9ucwotZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBvcnQgcG9ydF9vcHRp b25zCitmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBwbGF0Zm9ybV9vcHRp b25zLCBjb25maWd1cmF0aW9uX29wdGlvbnMKIAogCiBjbGFzcyBTdWdnZXN0UmV2aWV3ZXJzKEFi c3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKQEAgLTQ0MCw3ICs0NDAsNyBAQCBjbGFzcyBQcmlu dEV4cGVjdGF0aW9ucyhBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CiAgICAgICAgICAgICAg ICAgICAgICAgICBoZWxwPSdQcmludCBhIENTVi1zdHlsZSByZXBvcnQgdGhhdCBpbmNsdWRlcyB0 aGUgcG9ydCBuYW1lLCBtb2RpZmllcnMsIHRlc3RzLCBhbmQgZXhwZWN0YXRpb25zJyksCiAgICAg ICAgICAgICBtYWtlX29wdGlvbignLWYnLCAnLS1mdWxsJywgYWN0aW9uPSdzdG9yZV90cnVlJywg ZGVmYXVsdD1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J1ByaW50IGEgZnVs bCBUZXN0RXhwZWN0YXRpb25zLXN0eWxlIGxpbmUgZm9yIGV2ZXJ5IG1hdGNoJyksCi0gICAgICAg IF0gKyBwb3J0X29wdGlvbnMocGxhdGZvcm09J3BvcnQvcGxhdGZvcm0gdG8gdXNlLiBVc2UgZ2xv Yi1zdHlsZSB3aWxkY2FyZHMgZm9yIG11bHRpcGxlIHBvcnRzIChpbXBsaWVzIC0tY3N2KScpCisg ICAgICAgIF0gKyBwbGF0Zm9ybV9vcHRpb25zKHBsYXRmb3JtPSdwb3J0L3BsYXRmb3JtIHRvIHVz ZS4gVXNlIGdsb2Itc3R5bGUgd2lsZGNhcmRzIGZvciBtdWx0aXBsZSBwb3J0cyAoaW1wbGllcyAt LWNzdiknKSArIGNvbmZpZ3VyYXRpb25fb3B0aW9ucygpCiAKICAgICAgICAgQWJzdHJhY3REZWNs YXJhdGl2ZUNvbW1hbmQuX19pbml0X18oc2VsZiwgb3B0aW9ucz1vcHRpb25zKQogICAgICAgICBz ZWxmLl9leHBlY3RhdGlvbl9tb2RlbHMgPSB7fQpAQCAtNTE5LDcgKzUxOSw3IEBAIGNsYXNzIFBy aW50QmFzZWxpbmVzKEFic3RyYWN0RGVjbGFyYXRpdmVDb21tYW5kKToKICAgICAgICAgICAgICAg ICAgICAgICAgIGhlbHA9J1ByaW50IGEgQ1NWLXN0eWxlIHJlcG9ydCB0aGF0IGluY2x1ZGVzIHRo ZSBwb3J0IG5hbWUsIHRlc3RfbmFtZSwgdGVzdCBwbGF0Zm9ybSwgYmFzZWxpbmUgdHlwZSwgYmFz ZWxpbmUgbG9jYXRpb24sIGFuZCBiYXNlbGluZSBwbGF0Zm9ybScpLAogICAgICAgICAgICAgbWFr ZV9vcHRpb24oJy0taW5jbHVkZS12aXJ0dWFsLXRlc3RzJywgYWN0aW9uPSdzdG9yZV90cnVlJywK ICAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J0luY2x1ZGUgdmlydHVhbCB0ZXN0cycpLAot ICAgICAgICBdICsgcG9ydF9vcHRpb25zKHBsYXRmb3JtPSdwb3J0L3BsYXRmb3JtIHRvIHVzZS4g VXNlIGdsb2Itc3R5bGUgd2lsZGNhcmRzIGZvciBtdWx0aXBsZSBwb3J0cyAoaW1wbGllcyAtLWNz diknKQorICAgICAgICBdICsgcGxhdGZvcm1fb3B0aW9ucyhwbGF0Zm9ybT0ncG9ydC9wbGF0Zm9y bSB0byB1c2UuIFVzZSBnbG9iLXN0eWxlIHdpbGRjYXJkcyBmb3IgbXVsdGlwbGUgcG9ydHMgKGlt cGxpZXMgLS1jc3YpJykgKyBjb25maWd1cmF0aW9uX29wdGlvbnMoKQogICAgICAgICBBYnN0cmFj dERlY2xhcmF0aXZlQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMpCiAgICAg ICAgIHNlbGYuX3BsYXRmb3JtX3JlZ2V4cCA9IHJlLmNvbXBpbGUoJ3BsYXRmb3JtLyhbXlwvXSsp LyguKyknKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFu ZHMvcmViYXNlbGluZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9y ZWJhc2VsaW5lLnB5CmluZGV4IDQ0MjYwZWE1ZTRkYzNjYjRjZDZhZDEzOGY4NzYyZThhNjY4MmVk NWEuLjcxMDY4NTNjY2E0Y2NhYmQ4MjYxYjY1NGIwMWQ5NjU1NmNiMzc0NzAgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9yZWJhc2VsaW5lLnB5CkBAIC00 NiwyNCArNDYsMzQgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0 ZXN0X2ZhaWx1cmVzCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMudGVzdF9jb25m aWd1cmF0aW9uIGltcG9ydCBUZXN0Q29uZmlndXJhdGlvbgogZnJvbSB3ZWJraXRweS5sYXlvdXRf dGVzdHMubW9kZWxzLnRlc3RfZXhwZWN0YXRpb25zIGltcG9ydCBUZXN0RXhwZWN0YXRpb25zLCBC QVNFTElORV9TVUZGSVhfTElTVAogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMucG9ydCBpbXBv cnQgYnVpbGRlcnMKK2Zyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLnBvcnQgaW1wb3J0IGZhY3Rv cnkKIGZyb20gd2Via2l0cHkudG9vbC5ncmFtbWFyIGltcG9ydCBwbHVyYWxpemUKIGZyb20gd2Vi a2l0cHkudG9vbC5tdWx0aWNvbW1hbmR0b29sIGltcG9ydCBBYnN0cmFjdERlY2xhcmF0aXZlQ29t bWFuZAogCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAorCiAjIEZJWE1F OiBTaG91bGQgVGVzdFJlc3VsdFdyaXRlciBrbm93IGhvdyB0byBjb21wdXRlIHRoaXMgc3RyaW5n PwogZGVmIF9iYXNlbGluZV9uYW1lKGZzLCB0ZXN0X25hbWUsIHN1ZmZpeCk6CiAgICAgcmV0dXJu IGZzLnNwbGl0ZXh0KHRlc3RfbmFtZSlbMF0gKyBUZXN0UmVzdWx0V3JpdGVyLkZJTEVOQU1FX1NV RkZJWF9FWFBFQ1RFRCArICIuIiArIHN1ZmZpeAogCiAKIGNsYXNzIEFic3RyYWN0UmViYXNlbGlu aW5nQ29tbWFuZChBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFuZCk6CisgICAgbW92ZV9vdmVyd3Jp dHRlbl9iYXNlbGluZXNfb3B0aW9uID0gb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tbW92ZS1vdmVy d3JpdHRlbi1iYXNlbGluZXMiLCBhY3Rpb249InN0b3JlX3RydWUiLCBkZWZhdWx0PUZhbHNlLAor ICAgICAgICBoZWxwPSJNb3ZlIG92ZXJ3cml0dGVuIGJhc2VsaW5lcyBlbHNld2hlcmUgaW4gdGhl IGJhc2VsaW5lIHBhdGguIFRoaXMgaXMgZm9yIGJyaW5naW5nIHVwIG5ldyBwb3J0cy4iKQorCisg ICAgbm9fb3B0aW1pemVfb3B0aW9uID0gb3B0cGFyc2UubWFrZV9vcHRpb24oJy0tbm8tb3B0aW1p emUnLCBkZXN0PSdvcHRpbWl6ZScsIGFjdGlvbj0nc3RvcmVfZmFsc2UnLCBkZWZhdWx0PVRydWUs CisgICAgICAgIGhlbHA9KCdEbyBub3Qgb3B0aW1pemUvZGUtZHVwIHRoZSBleHBlY3RhdGlvbnMg YWZ0ZXIgcmViYXNlbGluaW5nIChkZWZhdWx0IGlzIHRvIGRlLWR1cCBhdXRvbWF0aWNhbGx5KS4g JworICAgICAgICAgICAgICAnWW91IGNhbiB1c2UgIndlYmtpdC1wYXRjaCBvcHRpbWl6ZS1iYXNl bGluZXMiIHRvIG9wdGltaXplIHNlcGFyYXRlbHkuJykpCisKKyAgICBwbGF0Zm9ybV9vcHRpb25z ID0gZmFjdG9yeS5wbGF0Zm9ybV9vcHRpb25zKCkKKworICAgIHN1ZmZpeGVzX29wdGlvbiA9IG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLXN1ZmZpeGVzIiwgZGVmYXVsdD0nLCcuam9pbihCQVNFTElO RV9TVUZGSVhfTElTVCksIGFjdGlvbj0ic3RvcmUiLAorICAgICAgICBoZWxwPSJDb21tYS1zZXBh cmF0ZWQtbGlzdCBvZiBmaWxlIHR5cGVzIHRvIHJlYmFzZWxpbmUiKQorCiAgICAgZGVmIF9faW5p dF9fKHNlbGYsIG9wdGlvbnM9Tm9uZSk6Ci0gICAgICAgIG9wdGlvbnMgPSBvcHRpb25zIG9yIFtd Ci0gICAgICAgIG9wdGlvbnMuZXh0ZW5kKFsKLSAgICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0 aW9uKCctLXN1ZmZpeGVzJywgZGVmYXVsdD0nLCcuam9pbihCQVNFTElORV9TVUZGSVhfTElTVCks IGFjdGlvbj0nc3RvcmUnLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0n ZmlsZSB0eXBlcyB0byByZWJhc2VsaW5lJyldKQotICAgICAgICBBYnN0cmFjdERlY2xhcmF0aXZl Q29tbWFuZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMpCisgICAgICAgIHN1cGVyKEFi c3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCwgc2VsZikuX19pbml0X18ob3B0aW9ucz1vcHRpb25z KQogICAgICAgICBzZWxmLl9iYXNlbGluZV9zdWZmaXhfbGlzdCA9IEJBU0VMSU5FX1NVRkZJWF9M SVNUCiAKIApAQCAtNzIsMTMgKzgyLDE0IEBAIGNsYXNzIFJlYmFzZWxpbmVUZXN0KEFic3RyYWN0 UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgaGVscF90ZXh0ID0gIlJlYmFzZWxpbmUgYSBzaW5n bGUgdGVzdCBmcm9tIGEgYnVpbGRib3QuIE9ubHkgaW50ZW5kZWQgZm9yIHVzZSBieSBvdGhlciB3 ZWJraXQtcGF0Y2ggY29tbWFuZHMuIgogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgotICAgICAg ICBvcHRpb25zID0gWworICAgICAgICBzdXBlcihSZWJhc2VsaW5lVGVzdCwgc2VsZikuX19pbml0 X18ob3B0aW9ucz1bCisgICAgICAgICAgICBzZWxmLm5vX29wdGltaXplX29wdGlvbiwKKyAgICAg ICAgICAgIHNlbGYuc3VmZml4ZXNfb3B0aW9uLAogICAgICAgICAgICAgb3B0cGFyc2UubWFrZV9v cHRpb24oIi0tYnVpbGRlciIsIGhlbHA9IkJ1aWxkZXIgdG8gcHVsbCBuZXcgYmFzZWxpbmVzIGZy b20iKSwKICAgICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW1vdmUtb3ZlcndyaXR0 ZW4tYmFzZWxpbmVzLXRvIiwgYWN0aW9uPSJhcHBlbmQiLCBkZWZhdWx0PVtdLAogICAgICAgICAg ICAgICAgIGhlbHA9IlBsYXRmb3JtIHRvIG1vdmUgZXhpc3RpbmcgYmFzZWxpbmVzIHRvIGJlZm9y ZSByZWJhc2VsaW5pbmcuIFRoaXMgaXMgZm9yIGJyaW5naW5nIHVwIG5ldyBwb3J0cy4iKSwKICAg ICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXRlc3QiLCBoZWxwPSJUZXN0IHRvIHJl YmFzZWxpbmUiKSwKLSAgICAgICAgXQotICAgICAgICBBYnN0cmFjdFJlYmFzZWxpbmluZ0NvbW1h bmQuX19pbml0X18oc2VsZiwgb3B0aW9ucz1vcHRpb25zKQorICAgICAgICAgICAgXSkKICAgICAg ICAgc2VsZi5fc2NtX2NoYW5nZXMgPSB7J2FkZCc6IFtdfQogCiAgICAgZGVmIF9yZXN1bHRzX3Vy bChzZWxmLCBidWlsZGVyX25hbWUpOgpAQCAtMTgyLDYgKzE5Myw5IEBAIGNsYXNzIE9wdGltaXpl QmFzZWxpbmVzKEFic3RyYWN0UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgaGVscF90ZXh0ID0g IlJlc2h1ZmZsZXMgdGhlIGJhc2VsaW5lcyBmb3IgdGhlIGdpdmVuIHRlc3RzIHRvIHVzZSBhcyBs aXR0ZSBzcGFjZSBvbiBkaXNrIGFzIHBvc3NpYmxlLiIKICAgICBhcmd1bWVudF9uYW1lcyA9ICJU RVNUX05BTUVTIgogCisgICAgZGVmIF9faW5pdF9fKHNlbGYpOgorICAgICAgICByZXR1cm4gc3Vw ZXIoT3B0aW1pemVCYXNlbGluZXMsIHNlbGYpLl9faW5pdF9fKG9wdGlvbnM9W3NlbGYuc3VmZml4 ZXNfb3B0aW9uXSkKKwogICAgIGRlZiBfb3B0aW1pemVfYmFzZWxpbmUoc2VsZiwgdGVzdF9uYW1l KToKICAgICAgICAgZm9yIHN1ZmZpeCBpbiBzZWxmLl9iYXNlbGluZV9zdWZmaXhfbGlzdDoKICAg ICAgICAgICAgIGJhc2VsaW5lX25hbWUgPSBfYmFzZWxpbmVfbmFtZShzZWxmLl90b29sLmZpbGVz eXN0ZW0sIHRlc3RfbmFtZSwgc3VmZml4KQpAQCAtMjAzLDYgKzIxNyw5IEBAIGNsYXNzIEFuYWx5 emVCYXNlbGluZXMoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKICAgICBoZWxwX3RleHQg PSAiQW5hbHl6ZXMgdGhlIGJhc2VsaW5lcyBmb3IgdGhlIGdpdmVuIHRlc3RzIGFuZCBwcmludHMg cmVzdWx0cyB0aGF0IGFyZSBpZGVudGljYWwuIgogICAgIGFyZ3VtZW50X25hbWVzID0gIlRFU1Rf TkFNRVMiCiAKKyAgICBkZWYgX19pbml0X18oc2VsZik6CisgICAgICAgIHJldHVybiBzdXBlcihB bmFseXplQmFzZWxpbmVzLCBzZWxmKS5fX2luaXRfXyhvcHRpb25zPVtzZWxmLnN1ZmZpeGVzX29w dGlvbl0pCisKICAgICBkZWYgX3ByaW50KHNlbGYsIGJhc2VsaW5lX25hbWUsIGRpcmVjdG9yaWVz X2J5X3Jlc3VsdCk6CiAgICAgICAgIGZvciByZXN1bHQsIGRpcmVjdG9yaWVzIGluIGRpcmVjdG9y aWVzX2J5X3Jlc3VsdC5pdGVtcygpOgogICAgICAgICAgICAgaWYgbGVuKGRpcmVjdG9yaWVzKSA8 PSAxOgpAQCAtMjI1LDE1ICsyNDIsNyBAQCBjbGFzcyBBbmFseXplQmFzZWxpbmVzKEFic3RyYWN0 UmViYXNlbGluaW5nQ29tbWFuZCk6CiAgICAgICAgICAgICBzZWxmLl9hbmFseXplX2Jhc2VsaW5l KHRlc3RfbmFtZSkKIAogCi1jbGFzcyBBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQo QWJzdHJhY3REZWNsYXJhdGl2ZUNvbW1hbmQpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBvcHRp b25zPU5vbmUpOgotICAgICAgICBvcHRpb25zID0gb3B0aW9ucyBvciBbXQotICAgICAgICBvcHRp b25zLmV4dGVuZChbCi0gICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbignLS1uby1vcHRp bWl6ZScsIGRlc3Q9J29wdGltaXplJywgYWN0aW9uPSdzdG9yZV9mYWxzZScsIGRlZmF1bHQ9VHJ1 ZSwKLSAgICAgICAgICAgICAgICBoZWxwPSgnRG8gbm90IG9wdGltaXplL2RlLWR1cCB0aGUgZXhw ZWN0YXRpb25zIGFmdGVyIHJlYmFzZWxpbmluZyAnCi0gICAgICAgICAgICAgICAgICAgICAgJyhk ZWZhdWx0IGlzIHRvIGRlLWR1cCBhdXRvbWF0aWNhbGx5KS4gJwotICAgICAgICAgICAgICAgICAg ICAgICdZb3UgY2FuIHVzZSAid2Via2l0LXBhdGNoIG9wdGltaXplLWJhc2VsaW5lcyIgdG8gb3B0 aW1pemUgc2VwYXJhdGVseS4nKSldKQotICAgICAgICBBYnN0cmFjdERlY2xhcmF0aXZlQ29tbWFu ZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMpCitjbGFzcyBBYnN0cmFjdFBhcmFsbGVs UmViYXNlbGluZUNvbW1hbmQoQWJzdHJhY3RSZWJhc2VsaW5pbmdDb21tYW5kKToKIAogICAgIGRl ZiBfcnVuX3dlYmtpdF9wYXRjaChzZWxmLCBhcmdzLCB2ZXJib3NlKToKICAgICAgICAgdHJ5OgpA QCAtMzM0LDYgKzM0Myw5IEBAIGNsYXNzIFJlYmFzZWxpbmVKc29uKEFic3RyYWN0UGFyYWxsZWxS ZWJhc2VsaW5lQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJyZWJhc2VsaW5lLWpzb24iCiAgICAgaGVs cF90ZXh0ID0gIlJlYmFzZWxpbmUgYmFzZWQgb2ZmIEpTT04gcGFzc2VkIHRvIHN0ZGluLiBJbnRl bmRlZCB0byBvbmx5IGJlIGNhbGxlZCBmcm9tIG90aGVyIHNjcmlwdHMuIgogCisgICAgZGVmIF9f aW5pdF9fKHNlbGYpOgorICAgICAgICByZXR1cm4gc3VwZXIoUmViYXNlbGluZUpzb24sIHNlbGYp Ll9faW5pdF9fKG9wdGlvbnM9W3NlbGYubm9fb3B0aW1pemVfb3B0aW9uXSkKKwogICAgIGRlZiBl eGVjdXRlKHNlbGYsIG9wdGlvbnMsIGFyZ3MsIHRvb2wpOgogICAgICAgICBzZWxmLl9yZWJhc2Vs aW5lKG9wdGlvbnMsIGpzb24ubG9hZHMoc3lzLnN0ZGluLnJlYWQoKSkpCiAKQEAgLTM0Miw2ICsz NTQsOSBAQCBjbGFzcyBSZWJhc2VsaW5lRXhwZWN0YXRpb25zKEFic3RyYWN0UGFyYWxsZWxSZWJh c2VsaW5lQ29tbWFuZCk6CiAgICAgbmFtZSA9ICJyZWJhc2VsaW5lLWV4cGVjdGF0aW9ucyIKICAg ICBoZWxwX3RleHQgPSAiUmViYXNlbGluZXMgdGhlIHRlc3RzIGluZGljYXRlZCBpbiBUZXN0RXhw ZWN0YXRpb25zLiIKIAorICAgIGRlZiBfX2luaXRfXyhzZWxmKToKKyAgICAgICAgcmV0dXJuIHN1 cGVyKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMsIHNlbGYpLl9faW5pdF9fKG9wdGlvbnM9W3NlbGYu bm9fb3B0aW1pemVfb3B0aW9uXSkKKwogICAgIGRlZiBfdXBkYXRlX2V4cGVjdGF0aW9uc19maWxl cyhzZWxmLCBwb3J0X25hbWUpOgogICAgICAgICBwb3J0ID0gc2VsZi5fdG9vbC5wb3J0X2ZhY3Rv cnkuZ2V0KHBvcnRfbmFtZSkKIApAQCAtMzkyLDExICs0MDcsMTIgQEAgY2xhc3MgUmViYXNlbGlu ZShBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQpOgogICAgIGFyZ3VtZW50X25hbWVz ID0gIltURVNUX05BTUVTXSIKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmKToKLSAgICAgICAgb3B0 aW9ucyA9IFsKKyAgICAgICAgc3VwZXIoUmViYXNlbGluZSwgc2VsZikuX19pbml0X18ob3B0aW9u cz1bCisgICAgICAgICAgICBzZWxmLm5vX29wdGltaXplX29wdGlvbiwKKyAgICAgICAgICAgICMg RklYTUU6IHNob3VsZCB3ZSBzdXBwb3J0IHRoZSBwbGF0Zm9ybSBvcHRpb25zIGluIGFkZGl0aW9u IHRvIChvciBpbnN0ZWFkIG9mKSAtLWJ1aWxkZXJzPworICAgICAgICAgICAgc2VsZi5zdWZmaXhl c19vcHRpb24sCiAgICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1idWlsZGVycyIs IGRlZmF1bHQ9Tm9uZSwgYWN0aW9uPSJhcHBlbmQiLCBoZWxwPSJDb21tYS1zZXBhcmF0ZWQtbGlz dCBvZiBidWlsZGVycyB0byBwdWxsIG5ldyBiYXNlbGluZXMgZnJvbSAoY2FuIGFsc28gYmUgcHJv dmlkZWQgbXVsdGlwbGUgdGltZXMpIiksCi0gICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlv bigiLS1zdWZmaXhlcyIsIGRlZmF1bHQ9QkFTRUxJTkVfU1VGRklYX0xJU1QsIGFjdGlvbj0iYXBw ZW5kIiwgaGVscD0iQ29tbWEtc2VwYXJhdGVkLWxpc3Qgb2YgZmlsZSB0eXBlcyB0byByZWJhc2Vs aW5lIChjYW4gYWxzbyBiZSBwcm92aWRlZCBtdWx0aXBsZSB0aW1lcykiKSwKLSAgICAgICAgXQot ICAgICAgICBBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGluZUNvbW1hbmQuX19pbml0X18oc2VsZiwg b3B0aW9ucz1vcHRpb25zKQorICAgICAgICAgICAgXSkKIAogICAgIGRlZiBfYnVpbGRlcnNfdG9f cHVsbF9mcm9tKHNlbGYpOgogICAgICAgICBjaHJvbWl1bV9idWlsZGJvdF9idWlsZGVyX25hbWVz ID0gW10K