188295 2018-08-02 19:09:38 -0700 [ews-build] Add build step to Check Patch Relevance 2018-08-03 16:22:29 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain aakash_jain lforschler webkit-bug-importer oldest_to_newest 1447489 0 aakash_jain 2018-08-02 19:09:38 -0700 There are certain builders (e.g.: webkitpy, jsc) which should build only when patch is relevant to them, i.e.: when the patch modifies specific files. If the patch is not relevant, it should be skipped. This would help in efficiently using the resources to build patches which we need to. We should add a build-step in order to achieve the above. 1447490 1 346444 aakash_jain 2018-08-02 19:13:00 -0700 Created attachment 346444 WIP 1447663 2 346500 aakash_jain 2018-08-03 10:08:31 -0700 Created attachment 346500 Proposed patch Sample runs: Patch without relevant changes: http://ews-build.webkit-uat.org/#/builders/16/builds/28 Patch with relevant changes: http://ews-build.webkit-uat.org/#/builders/16/builds/29 1447678 3 346500 lforschler 2018-08-03 10:41:04 -0700 Comment on attachment 346500 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=346500&action=review > Tools/BuildSlaveSupport/ews-build/steps.py:116 > + Please add a comment that these paths came from https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/tool/steps/checkpatchrelevance.py#L41 It would be nice if we only had one place in source for this knowledge to live. As it is now, someone will need to keep the two in sync. Maybe we can have future unit test check to ensure they contain the same data? > Tools/BuildSlaveSupport/ews-build/steps.py:154 > + # This build doesn't have an patch, it might be a force build. nit: this build doesn't have "a" patch 1447781 4 aakash_jain 2018-08-03 14:35:47 -0700 (In reply to Lucas Forschler from comment #3) > Please add a comment that these paths came from > https://trac.webkit.org/browser/webkit/trunk/Tools/Scripts/webkitpy/tool/ > steps/checkpatchrelevance.py#L41 > It would be nice if we only had one place in source for this knowledge to live. As it is now, someone will need to keep the two in sync. Maybe we can have future unit test check to ensure they contain the same data? The code in webkitpy/tool/steps/checkpatchrelevance.py would be deprecated, so we do not need to keep them in sync. > nit: this build doesn't have "a" patch Fixed. 1447782 5 aakash_jain 2018-08-03 14:36:25 -0700 Committed r234559: <https://trac.webkit.org/changeset/234559> 1447820 6 webkit-bug-importer 2018-08-03 16:22:29 -0700 <rdar://problem/42918696> 346444 2018-08-02 19:13:00 -0700 2018-08-03 10:08:31 -0700 WIP ews_checkPatchRelevance.patch text/plain 5906 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNDUzNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE4LTA4LTAyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBBZGQgYnVpbGQgc3RlcCB0byBDaGVjayBQYXRjaCBS ZWxldmFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4ODI5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQ2hlY2tQ YXRjaFJlbGV2YW5jZSk6IEFkZGVkIHN0ZXAgdG8gY2hlY2sgcGF0Y2ggcmVsZXZhbmNlLgorICAg ICAgICAoQ2hlY2tQYXRjaFJlbGV2YW5jZS5fY2hhbmdlZF9maWxlcyk6CisgICAgICAgIChDaGVj a1BhdGNoUmVsZXZhbmNlLl9wYXRjaF9pc19yZWxldmFudCk6IENoZWNrcyBpZiB0aGUgcGF0Y2gg aXMgcmVsZXZhbnQuCisgICAgICAgIChDaGVja1BhdGNoUmVsZXZhbmNlLl9nZXRfcGF0Y2gpOiBS ZXRyaWV2ZXMgdGhlIHBhdGNoIGZyb20gYnVpbGRib3QuCisgICAgICAgIChDaGVja1BhdGNoUmVs ZXZhbmNlLl9hZGRUb0xvZyk6IEFkZCB0aGUgbG9nIG1lc3NhZ2UuCisgICAgICAgIChDaGVja1Bh dGNoUmVsZXZhbmNlLnN0YXJ0KToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvZmFjdG9yaWVzLnB5OiBBZGRlZCBDaGVja1BhdGNoUmVsZXZhbmNlIHN0ZXAgYXBwcm9wcmlh dGVseS4KKwogMjAxOC0wOC0wMiAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgogCiAgICAg ICAgIEFYOiBbaU9TXSBhZGQgc3VwcG9ydCB0byByZXR1cm4gdGhlIGF0dHJpYnV0ZWQgc3RyaW5n IHVuZGVyIHRoZSBlbGVtZW50CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlzaW9uIDIzNDUzNCkKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYg KzQ1LDcgQEAgY2xhc3MgU3R5bGVGYWN0b3J5KEZhY3RvcnkpOgogY2xhc3MgQmluZGluZ3NGYWN0 b3J5KEZhY3RvcnkpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJh dGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwg Kiprd2FyZ3MpOgogICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKKyAg ICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKICAgICAgICAgc2VsZi5h ZGRTdGVwKFJ1bkJpbmRpbmdzVGVzdHMoKSkKIAogCkBAIC01Nyw2ICs1OCw3IEBAIGNsYXNzIFdl YktpdFBlcmxGYWN0b3J5KEZhY3RvcnkpOgogY2xhc3MgV2ViS2l0UHlGYWN0b3J5KEZhY3Rvcnkp OgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBh cmNoaXRlY3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgog ICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBh cmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKKyAgICAgICAgc2VsZi5h ZGRTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldl YktpdFB5VGVzdHMoKSkKIAogCkBAIC04Niw2ICs4OCw3IEBAIGNsYXNzIEJ1aWxkRmFjdG9yeShG YWN0b3J5KToKIGNsYXNzIEpTQ1Rlc3RzRmFjdG9yeShGYWN0b3J5KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVz PU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBGYWN0 b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz LCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKKyAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNr UGF0Y2hSZWxldmFuY2UoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVKU0NPbmx5KCkp CiAgICAgICAgIHNlbGYuYWRkU3RlcChVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKCkpCiAgICAgICAg IHNlbGYuYWRkU3RlcChDb21waWxlSlNDT25seVRvVCgpKQpJbmRleDogVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24gMjM0NTM0KQorKysgVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC03 Niw2ICs3Niw5OSBAQCBjbGFzcyBDaGVja091dFNvdXJjZShzdm4uU1ZOKToKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICoqa3dhcmdzKQogCiAKK2NsYXNz IENoZWNrUGF0Y2hSZWxldmFuY2UoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CisgICAgbmFtZSA9ICdj aGVjay1wYXRjaC1yZWxldmFuY2UnCisgICAgZGVzY3JpcHRpb24gPSBbJ2NoZWNrLXBhdGNoLXJl bGV2YW5jZSBydW5uaW5nJ10KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ2NoZWNrLXBhdGNoLXJl bGV2YW5jZSddCisgICAgZmx1bmtPbkZhaWx1cmUgPSBUcnVlCisgICAgaGFsdE9uRmFpbHVyZSA9 IFRydWUKKworICAgIGJpbmRpbmdzX3BhdGhzID0gWworICAgICAgICAiU291cmNlL1dlYkNvcmUi LAorICAgICAgICAiVG9vbHMiLAorICAgIF0KKworICAgIGpzY19wYXRocyA9IFsKKyAgICAgICAg IkpTVGVzdHMvIiwKKyAgICAgICAgIlNvdXJjZS9KYXZhU2NyaXB0Q29yZS8iLAorICAgICAgICAi U291cmNlL1dURi8iLAorICAgICAgICAiU291cmNlL2JtYWxsb2MvIiwKKyAgICAgICAgIk1ha2Vm aWxlIiwKKyAgICAgICAgIk1ha2VmaWxlLnNoYXJlZCIsCisgICAgICAgICJTb3VyY2UvTWFrZWZp bGUiLAorICAgICAgICAiU291cmNlL01ha2VmaWxlLnNoYXJlZCIsCisgICAgICAgICJUb29scy9T Y3JpcHRzL2J1aWxkLXdlYmtpdCIsCisgICAgICAgICJUb29scy9TY3JpcHRzL2J1aWxkLWpzYyIs CisgICAgICAgICJUb29scy9TY3JpcHRzL2pzYy1zdHJlc3MtdGVzdC1oZWxwZXJzLyIsCisgICAg ICAgICJUb29scy9TY3JpcHRzL3J1bi1qc2MiLAorICAgICAgICAiVG9vbHMvU2NyaXB0cy9ydW4t anNjLWJlbmNobWFya3MiLAorICAgICAgICAiVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10 ZXN0cyIsCisgICAgICAgICJUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyIs CisgICAgICAgICJUb29scy9TY3JpcHRzL3J1bi1sYXlvdXQtanNjIiwKKyAgICAgICAgIlRvb2xz L1NjcmlwdHMvdXBkYXRlLWphdmFzY3JpcHRjb3JlLXRlc3QtcmVzdWx0cyIsCisgICAgICAgICJU b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0iLAorICAgIF0KKworICAgIHdlYmtpdHB5X3BhdGhz ID0gWworICAgICAgICAiVG9vbHMvU2NyaXB0cy93ZWJraXRweS8iLAorICAgICAgICAiVG9vbHMv UXVldWVTdGF0dXNTZXJ2ZXIvIiwKKyAgICBdCisKKyAgICBncm91cF90b19wYXRoc19tYXBwaW5n ID0geworICAgICAgICAnYmluZGluZ3MnOiBiaW5kaW5nc19wYXRocywKKyAgICAgICAgJ2pzYyc6 IGpzY19wYXRocywKKyAgICAgICAgJ3dlYmtpdHB5Jzogd2Via2l0cHlfcGF0aHMsCisgICAgfQor CisgICAgZGVmIF9jaGFuZ2VkX2ZpbGVzKHNlbGYsIHBhdGNoKToKKyAgICAgICAgcmV0dXJuIHBh dGNoLnNwbGl0bGluZXMoKQorCisgICAgZGVmIF9wYXRjaF9pc19yZWxldmFudChzZWxmLCBwYXRj aCwgYnVpbGRlck5hbWUpOgorICAgICAgICAjIEluIHRoZSBkZWZhdWx0IGNhc2UsIGFsbCBwYXRj aGVzIGFyZSByZWxldmFudAorICAgICAgICBncm91cCA9IFtncm91cCBmb3IgZ3JvdXAgaW4gc2Vs Zi5ncm91cF90b19wYXRoc19tYXBwaW5nLmtleXMoKSBpZiBncm91cCBpbiBidWlsZGVyTmFtZS5s b3dlcigpXQorICAgICAgICBpZiBub3QgZ3JvdXA6CisgICAgICAgICAgICByZXR1cm4gVHJ1ZQor CisgICAgICAgIGNoYW5nZWRfZmlsZXMgPSBzZWxmLl9jaGFuZ2VkX2ZpbGVzKHBhdGNoKQorICAg ICAgICBwYXR0ZXJucyA9IHNlbGYuZ3JvdXBfdG9fcGF0aHNfbWFwcGluZ1tncm91cFswXV0KKwor ICAgICAgICBmb3IgY2hhbmdlZF9maWxlIGluIGNoYW5nZWRfZmlsZXM6CisgICAgICAgICAgICBm b3IgcGF0dGVybiBpbiBwYXR0ZXJuczoKKyAgICAgICAgICAgICAgICBpZiByZS5zZWFyY2gocGF0 dGVybiwgY2hhbmdlZF9maWxlLCByZS5JR05PUkVDQVNFKToKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIFRydWUKKyAgICAgICAgcmV0dXJuIEZhbHNlCisKKyAgICBkZWYgX2dldF9wYXRjaChz ZWxmKToKKyAgICAgICAgc291cmNlc3RhbXAgPSBzZWxmLmJ1aWxkLmdldFNvdXJjZVN0YW1wKCkK KyAgICAgICAgaWYgbm90IHNvdXJjZXN0YW1wIG9yIG5vdCBzb3VyY2VzdGFtcC5wYXRjaDoKKyAg ICAgICAgICAgIHJldHVybiBOb25lCisgICAgICAgIHJldHVybiBzb3VyY2VzdGFtcC5wYXRjaFsx XQorCisgICAgQGRlZmVyLmlubGluZUNhbGxiYWNrcworICAgIGRlZiBfYWRkVG9Mb2coc2VsZiwg bG9nTmFtZSwgbWVzc2FnZSk6CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIGxvZyA9IHNlbGYu Z2V0TG9nKGxvZ05hbWUpCisgICAgICAgIGV4Y2VwdCBLZXlFcnJvcjoKKyAgICAgICAgICAgIGxv ZyA9IHlpZWxkIHNlbGYuYWRkTG9nKGxvZ05hbWUpCisgICAgICAgIGxvZy5hZGRTdGRvdXQobWVz c2FnZSkKKworICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgcGF0Y2ggPSBzZWxmLl9nZXRf cGF0Y2goKQorICAgICAgICBpZiBub3QgcGF0Y2g6CisgICAgICAgICAgICAjIFRoaXMgYnVpbGQg ZG9lc24ndCBoYXZlIGFuIHBhdGNoLCBpdCBtaWdodCBiZSBhIGZvcmNlIGJ1aWxkLgorICAgICAg ICAgICAgc2VsZi5maW5pc2hlZChTVUNDRVNTKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKwor ICAgICAgICBpZiBzZWxmLl9wYXRjaF9pc19yZWxldmFudChwYXRjaCwgc2VsZi5nZXRQcm9wZXJ0 eSgnYnVpbGRlcm5hbWUnLCAnJykpOgorICAgICAgICAgICAgc2VsZi5fYWRkVG9Mb2coJ3N0ZGlv JywgJ1RoaXMgcGF0Y2ggY29udGFpbnMgcmVsZXZhbnQgY2hhbmdlcy4nKQorICAgICAgICAgICAg c2VsZi5maW5pc2hlZChTVUNDRVNTKQorICAgICAgICAgICAgcmV0dXJuIE5vbmUKKworICAgICAg ICBzZWxmLl9hZGRUb0xvZygnc3RkaW8nLCAnVGhpcyBwYXRjaCBkb2VzIG5vdCBoYXZlIHJlbGV2 YW50IGNoYW5nZXMuJykKKyAgICAgICAgc2VsZi5maW5pc2hlZChGQUlMVVJFKQorICAgICAgICBy ZXR1cm4gTm9uZQorCisKIGNsYXNzIFVuQXBwbHlQYXRjaElmUmVxdWlyZWQoQ2hlY2tPdXRTb3Vy Y2UpOgogICAgIG5hbWUgPSAndW5hcHBseS1wYXRjaCcKIAo= 346500 2018-08-03 10:08:31 -0700 2018-08-03 10:41:04 -0700 Proposed patch ews_checkPatchRelevance_v2.patch text/plain 5835 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzNDUzNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE4LTA4LTAyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbZXdzLWJ1aWxkXSBBZGQgYnVpbGQgc3RlcCB0byBDaGVjayBQYXRjaCBS ZWxldmFuY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4ODI5NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5OgorICAgICAgICAoQ2hlY2tQ YXRjaFJlbGV2YW5jZSk6IEFkZGVkIHN0ZXAgdG8gY2hlY2sgcGF0Y2ggcmVsZXZhbmNlLgorICAg ICAgICAoQ2hlY2tQYXRjaFJlbGV2YW5jZS5fY2hhbmdlZF9maWxlcyk6CisgICAgICAgIChDaGVj a1BhdGNoUmVsZXZhbmNlLl9wYXRjaF9pc19yZWxldmFudCk6IENoZWNrcyBpZiB0aGUgcGF0Y2gg aXMgcmVsZXZhbnQuCisgICAgICAgIChDaGVja1BhdGNoUmVsZXZhbmNlLl9nZXRfcGF0Y2gpOiBS ZXRyaWV2ZXMgdGhlIHBhdGNoIGZyb20gYnVpbGRib3QuCisgICAgICAgIChDaGVja1BhdGNoUmVs ZXZhbmNlLl9hZGRUb0xvZyk6IEFkZCB0aGUgbG9nIG1lc3NhZ2UuCisgICAgICAgIChDaGVja1Bh dGNoUmVsZXZhbmNlLnN0YXJ0KToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvZmFjdG9yaWVzLnB5OiBBZGRlZCBDaGVja1BhdGNoUmVsZXZhbmNlIHN0ZXAgYXBwcm9wcmlh dGVseS4KKwogMjAxOC0wOC0wMiAgTmFuIFdhbmcgIDxuX3dhbmdAYXBwbGUuY29tPgogCiAgICAg ICAgIEFYOiBbaU9TXSBhZGQgc3VwcG9ydCB0byByZXR1cm4gdGhlIGF0dHJpYnV0ZWQgc3RyaW5n IHVuZGVyIHRoZSBlbGVtZW50CkluZGV4OiBUb29scy9CdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVp bGQvZmFjdG9yaWVzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2V3 cy1idWlsZC9mYWN0b3JpZXMucHkJKHJldmlzaW9uIDIzNDUzNCkKKysrIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9mYWN0b3JpZXMucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDYg KzQ1LDcgQEAgY2xhc3MgU3R5bGVGYWN0b3J5KEZhY3RvcnkpOgogY2xhc3MgQmluZGluZ3NGYWN0 b3J5KEZhY3RvcnkpOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJh dGlvbj1Ob25lLCBhcmNoaXRlY3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwg Kiprd2FyZ3MpOgogICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25m aWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKKyAg ICAgICAgc2VsZi5hZGRTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKICAgICAgICAgc2VsZi5h ZGRTdGVwKFJ1bkJpbmRpbmdzVGVzdHMoKSkKIAogCkBAIC01Nyw2ICs1OCw3IEBAIGNsYXNzIFdl YktpdFBlcmxGYWN0b3J5KEZhY3RvcnkpOgogY2xhc3MgV2ViS2l0UHlGYWN0b3J5KEZhY3Rvcnkp OgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbj1Ob25lLCBh cmNoaXRlY3R1cmVzPU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgog ICAgICAgICBGYWN0b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBh cmNoaXRlY3R1cmVzLCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKKyAgICAgICAgc2VsZi5h ZGRTdGVwKENoZWNrUGF0Y2hSZWxldmFuY2UoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKFJ1bldl YktpdFB5VGVzdHMoKSkKIAogCkBAIC04Niw2ICs4OCw3IEBAIGNsYXNzIEJ1aWxkRmFjdG9yeShG YWN0b3J5KToKIGNsYXNzIEpTQ1Rlc3RzRmFjdG9yeShGYWN0b3J5KToKICAgICBkZWYgX19pbml0 X18oc2VsZiwgcGxhdGZvcm0sIGNvbmZpZ3VyYXRpb249J3JlbGVhc2UnLCBhcmNoaXRlY3R1cmVz PU5vbmUsIGFkZGl0aW9uYWxBcmd1bWVudHM9Tm9uZSwgKiprd2FyZ3MpOgogICAgICAgICBGYWN0 b3J5Ll9faW5pdF9fKHNlbGYsIHBsYXRmb3JtLCBjb25maWd1cmF0aW9uLCBhcmNoaXRlY3R1cmVz LCBGYWxzZSwgYWRkaXRpb25hbEFyZ3VtZW50cykKKyAgICAgICAgc2VsZi5hZGRTdGVwKENoZWNr UGF0Y2hSZWxldmFuY2UoKSkKICAgICAgICAgc2VsZi5hZGRTdGVwKENvbXBpbGVKU0NPbmx5KCkp CiAgICAgICAgIHNlbGYuYWRkU3RlcChVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKCkpCiAgICAgICAg IHNlbGYuYWRkU3RlcChDb21waWxlSlNDT25seVRvVCgpKQpJbmRleDogVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQkocmV2aXNpb24gMjM0NTM0KQorKysgVG9vbHMv QnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC03 Niw2ICs3Niw5NSBAQCBjbGFzcyBDaGVja091dFNvdXJjZShzdm4uU1ZOKToKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICoqa3dhcmdzKQogCiAKK2NsYXNz IENoZWNrUGF0Y2hSZWxldmFuY2UoYnVpbGRzdGVwLkJ1aWxkU3RlcCk6CisgICAgbmFtZSA9ICdj aGVjay1wYXRjaC1yZWxldmFuY2UnCisgICAgZGVzY3JpcHRpb24gPSBbJ2NoZWNrLXBhdGNoLXJl bGV2YW5jZSBydW5uaW5nJ10KKyAgICBkZXNjcmlwdGlvbkRvbmUgPSBbJ2NoZWNrLXBhdGNoLXJl bGV2YW5jZSddCisgICAgZmx1bmtPbkZhaWx1cmUgPSBUcnVlCisgICAgaGFsdE9uRmFpbHVyZSA9 IFRydWUKKworICAgIGJpbmRpbmdzX3BhdGhzID0gWworICAgICAgICAiU291cmNlL1dlYkNvcmUi LAorICAgICAgICAiVG9vbHMiLAorICAgIF0KKworICAgIGpzY19wYXRocyA9IFsKKyAgICAgICAg IkpTVGVzdHMvIiwKKyAgICAgICAgIlNvdXJjZS9KYXZhU2NyaXB0Q29yZS8iLAorICAgICAgICAi U291cmNlL1dURi8iLAorICAgICAgICAiU291cmNlL2JtYWxsb2MvIiwKKyAgICAgICAgIk1ha2Vm aWxlIiwKKyAgICAgICAgIk1ha2VmaWxlLnNoYXJlZCIsCisgICAgICAgICJTb3VyY2UvTWFrZWZp bGUiLAorICAgICAgICAiU291cmNlL01ha2VmaWxlLnNoYXJlZCIsCisgICAgICAgICJUb29scy9T Y3JpcHRzL2J1aWxkLXdlYmtpdCIsCisgICAgICAgICJUb29scy9TY3JpcHRzL2J1aWxkLWpzYyIs CisgICAgICAgICJUb29scy9TY3JpcHRzL2pzYy1zdHJlc3MtdGVzdC1oZWxwZXJzLyIsCisgICAg ICAgICJUb29scy9TY3JpcHRzL3J1bi1qc2MiLAorICAgICAgICAiVG9vbHMvU2NyaXB0cy9ydW4t anNjLWJlbmNobWFya3MiLAorICAgICAgICAiVG9vbHMvU2NyaXB0cy9ydW4tanNjLXN0cmVzcy10 ZXN0cyIsCisgICAgICAgICJUb29scy9TY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyIs CisgICAgICAgICJUb29scy9TY3JpcHRzL3J1bi1sYXlvdXQtanNjIiwKKyAgICAgICAgIlRvb2xz L1NjcmlwdHMvdXBkYXRlLWphdmFzY3JpcHRjb3JlLXRlc3QtcmVzdWx0cyIsCisgICAgICAgICJU b29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0iLAorICAgIF0KKworICAgIHdlYmtpdHB5X3BhdGhz ID0gWworICAgICAgICAiVG9vbHMvU2NyaXB0cy93ZWJraXRweS8iLAorICAgICAgICAiVG9vbHMv UXVldWVTdGF0dXNTZXJ2ZXIvIiwKKyAgICBdCisKKyAgICBncm91cF90b19wYXRoc19tYXBwaW5n ID0geworICAgICAgICAnYmluZGluZ3MnOiBiaW5kaW5nc19wYXRocywKKyAgICAgICAgJ2pzYyc6 IGpzY19wYXRocywKKyAgICAgICAgJ3dlYmtpdHB5Jzogd2Via2l0cHlfcGF0aHMsCisgICAgfQor CisgICAgZGVmIF9wYXRjaF9pc19yZWxldmFudChzZWxmLCBwYXRjaCwgYnVpbGRlck5hbWUpOgor ICAgICAgICBncm91cCA9IFtncm91cCBmb3IgZ3JvdXAgaW4gc2VsZi5ncm91cF90b19wYXRoc19t YXBwaW5nLmtleXMoKSBpZiBncm91cCBpbiBidWlsZGVyTmFtZS5sb3dlcigpXQorICAgICAgICBp ZiBub3QgZ3JvdXA6CisgICAgICAgICAgICAjIFRoaXMgYnVpbGRlciBkb2Vzbid0IGhhdmUgcGF0 aHMgZGVmaW5lZCwgYWxsIHBhdGNoZXMgYXJlIHJlbGV2YW50LgorICAgICAgICAgICAgcmV0dXJu IFRydWUKKworICAgICAgICByZWxldmFudF9wYXRocyA9IHNlbGYuZ3JvdXBfdG9fcGF0aHNfbWFw cGluZ1tncm91cFswXV0KKworICAgICAgICBmb3IgY2hhbmdlIGluIHBhdGNoLnNwbGl0bGluZXMo KToKKyAgICAgICAgICAgIGZvciBwYXRoIGluIHJlbGV2YW50X3BhdGhzOgorICAgICAgICAgICAg ICAgIGlmIHJlLnNlYXJjaChwYXRoLCBjaGFuZ2UsIHJlLklHTk9SRUNBU0UpOgorICAgICAgICAg ICAgICAgICAgICByZXR1cm4gVHJ1ZQorICAgICAgICByZXR1cm4gRmFsc2UKKworICAgIGRlZiBf Z2V0X3BhdGNoKHNlbGYpOgorICAgICAgICBzb3VyY2VzdGFtcCA9IHNlbGYuYnVpbGQuZ2V0U291 cmNlU3RhbXAoc2VsZi5nZXRQcm9wZXJ0eSgnY29kZWJhc2UnLCAnJykpCisgICAgICAgIGlmIG5v dCBzb3VyY2VzdGFtcCBvciBub3Qgc291cmNlc3RhbXAucGF0Y2g6CisgICAgICAgICAgICByZXR1 cm4gTm9uZQorICAgICAgICByZXR1cm4gc291cmNlc3RhbXAucGF0Y2hbMV0KKworICAgIEBkZWZl ci5pbmxpbmVDYWxsYmFja3MKKyAgICBkZWYgX2FkZFRvTG9nKHNlbGYsIGxvZ05hbWUsIG1lc3Nh Z2UpOgorICAgICAgICB0cnk6CisgICAgICAgICAgICBsb2cgPSBzZWxmLmdldExvZyhsb2dOYW1l KQorICAgICAgICBleGNlcHQgS2V5RXJyb3I6CisgICAgICAgICAgICBsb2cgPSB5aWVsZCBzZWxm LmFkZExvZyhsb2dOYW1lKQorICAgICAgICBsb2cuYWRkU3Rkb3V0KG1lc3NhZ2UpCisKKyAgICBk ZWYgc3RhcnQoc2VsZik6CisgICAgICAgIHBhdGNoID0gc2VsZi5fZ2V0X3BhdGNoKCkKKyAgICAg ICAgaWYgbm90IHBhdGNoOgorICAgICAgICAgICAgIyBUaGlzIGJ1aWxkIGRvZXNuJ3QgaGF2ZSBh biBwYXRjaCwgaXQgbWlnaHQgYmUgYSBmb3JjZSBidWlsZC4KKyAgICAgICAgICAgIHNlbGYuZmlu aXNoZWQoU1VDQ0VTUykKKyAgICAgICAgICAgIHJldHVybiBOb25lCisKKyAgICAgICAgaWYgc2Vs Zi5fcGF0Y2hfaXNfcmVsZXZhbnQocGF0Y2gsIHNlbGYuZ2V0UHJvcGVydHkoJ2J1aWxkZXJuYW1l JywgJycpKToKKyAgICAgICAgICAgIHNlbGYuX2FkZFRvTG9nKCdzdGRpbycsICdUaGlzIHBhdGNo IGNvbnRhaW5zIHJlbGV2YW50IGNoYW5nZXMuJykKKyAgICAgICAgICAgIHNlbGYuZmluaXNoZWQo U1VDQ0VTUykKKyAgICAgICAgICAgIHJldHVybiBOb25lCisKKyAgICAgICAgc2VsZi5fYWRkVG9M b2coJ3N0ZGlvJywgJ1RoaXMgcGF0Y2ggZG9lcyBub3QgaGF2ZSByZWxldmFudCBjaGFuZ2VzLicp CisgICAgICAgIHNlbGYuZmluaXNoZWQoRkFJTFVSRSkKKyAgICAgICAgcmV0dXJuIE5vbmUKKwor CiBjbGFzcyBVbkFwcGx5UGF0Y2hJZlJlcXVpcmVkKENoZWNrT3V0U291cmNlKToKICAgICBuYW1l ID0gJ3VuYXBwbHktcGF0Y2gnCiAK