49354 2010-11-10 16:30:49 -0800 Include detailed test modifiers in results.json and enable incremental uploading for non-layout tests 2010-11-12 15:14:22 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 kinuko webkit-unassigned ojan victorw oldest_to_newest 307623 0 kinuko 2010-11-10 16:30:49 -0800 Include detailed test modifiers (e.g. FLAKY) in results.json and enable incremental uploading to test-results.appspot.com for failing non-layout tests. Since the patch for webkit.org/b/45480 had a bug and got reverted, filing a new one for the new patch. (I wasn't able to reopen the bug) 307683 1 73568 kinuko 2010-11-10 19:02:32 -0800 Created attachment 73568 Patch 307685 2 kinuko 2010-11-10 19:05:07 -0800 (In reply to comment #0) > Since the patch for webkit.org/b/45480 had a bug and got reverted, filing a new one for the new patch. Issue 45408 was the correct one (not 45480). @ojan, this patch is mostly same as the one you reviewed for issue 45408 but with the bug fix that caused the data loss and some more additional fixes mainly for adding master-name parameters. 308799 3 kinuko 2010-11-12 15:14:22 -0800 Committed r71952: <http://trac.webkit.org/changeset/71952> 73568 2010-11-10 19:02:32 -0800 2010-11-12 13:31:11 -0800 Patch bug-49354-20101110190231.patch text/plain 27274 kinuko ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBhNWU2ODkzOWI1OWMxZTJlY2E3ZDc5OTA2ZDQwMjA2MmZlYzFhZjRiLi4xZDg4NmI0 YTNkMTA5N2ViOWU4MmNlYWE2Y2Q0MjY1ODEzZmY2NDMxIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMTEtMTAgIEtpbnVrbyBZYXN1ZGEgIDxraW51a29AY2hyb21pdW0ub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluY2x1ZGUgZGV0YWls ZWQgdGVzdCBtb2RpZmllcnMgaW4gcmVzdWx0cy5qc29uIGFuZCBlbmFibGUgaW5jcmVtZW50YWwg dXBsb2FkaW5nIGZvciBub24tbGF5b3V0IHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTM1NAorCisgICAgICAgIEFsc28gbW92ZWQvaW50ZWdy YXRlZCB0aGUgdXBsb2FkIG1ldGhvZCBmcm9tIHJ1bl93ZWJraXRfdGVzdHMucHkgdG8ganNvbl9y ZXN1bHRzX2dlbmVyYXRvci5weS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pz b25fcmVzdWx0c19nZW5lcmF0b3IucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvcl91bml0dGVzdC5w eToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rl c3RzLnB5OgorCiAyMDEwLTExLTA1ICBBZGFtIFJvYmVuICA8YXJvYmVuQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlX3VuaXR0ZXN0IHBh c3Mgd2hlbiBydW5uaW5nIHVuZGVyCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1bHRzX2dl bmVyYXRvci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CmluZGV4IDFjZjg4 ZWY1OTdmNDU3M2VlYzY5MWZlMDljNjRiYTU1ODQ4MzkzNmIuLjEwMWQzMGIxNmIxOWNjYzQ0ODBj NjNlNmE0NjJjNjg5ZThhYzVmYzggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2Vu ZXJhdG9yLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CkBAIC01Niw3 ICs1Niw4IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yKGpzb25fcmVzdWx0c19n ZW5lcmF0b3IuSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlCiAgICAgZGVmIF9faW5pdF9fKHNlbGYs IHBvcnQsIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbmFtZSwgYnVpbGRfbnVtYmVyLAogICAgICAgICBy ZXN1bHRzX2ZpbGVfYmFzZV9wYXRoLCBidWlsZGVyX2Jhc2VfdXJsLAogICAgICAgICB0ZXN0X3Rp bWluZ3MsIGV4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIGFsbF90ZXN0cywKLSAgICAgICAg Z2VuZXJhdGVfaW5jcmVtZW50YWxfcmVzdWx0cz1GYWxzZSwgdGVzdF9yZXN1bHRzX3NlcnZlcj1O b25lKToKKyAgICAgICAgZ2VuZXJhdGVfaW5jcmVtZW50YWxfcmVzdWx0cz1GYWxzZSwgdGVzdF9y ZXN1bHRzX3NlcnZlcj1Ob25lLAorICAgICAgICB0ZXN0X3R5cGU9IiIsIG1hc3Rlcl9uYW1lPSIi KToKICAgICAgICAgIiIiTW9kaWZpZXMgdGhlIHJlc3VsdHMuanNvbiBmaWxlLiBHcmFicyBpdCBv ZmYgdGhlIGFyY2hpdmUgZGlyZWN0b3J5CiAgICAgICAgIGlmIGl0IGlzIG5vdCBmb3VuZCBsb2Nh bGx5LgogCkBAIC02Nyw3ICs2OCw4IEBAIGNsYXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9y KGpzb25fcmVzdWx0c19nZW5lcmF0b3IuSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlCiAgICAgICAg IHN1cGVyKEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yLCBzZWxmKS5fX2luaXRfXygKICAgICAg ICAgICAgIGJ1aWxkZXJfbmFtZSwgYnVpbGRfbmFtZSwgYnVpbGRfbnVtYmVyLCByZXN1bHRzX2Zp bGVfYmFzZV9wYXRoLAogICAgICAgICAgICAgYnVpbGRlcl9iYXNlX3VybCwge30sIHBvcnQudGVz dF9yZXBvc2l0b3J5X3BhdGhzKCksCi0gICAgICAgICAgICBnZW5lcmF0ZV9pbmNyZW1lbnRhbF9y ZXN1bHRzLCB0ZXN0X3Jlc3VsdHNfc2VydmVyKQorICAgICAgICAgICAgZ2VuZXJhdGVfaW5jcmVt ZW50YWxfcmVzdWx0cywgdGVzdF9yZXN1bHRzX3NlcnZlciwKKyAgICAgICAgICAgIHRlc3RfdHlw ZSwgbWFzdGVyX25hbWUpCiAKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQKICAgICAgICAgc2Vs Zi5fZXhwZWN0YXRpb25zID0gZXhwZWN0YXRpb25zCkBAIC0xMTcsNyArMTE5LDcgQEAgY2xhc3Mg SlNPTkxheW91dFJlc3VsdHNHZW5lcmF0b3IoanNvbl9yZXN1bHRzX2dlbmVyYXRvci5KU09OUmVz dWx0c0dlbmVyYXRvckJhc2UKICAgICAgICAgcmV0dXJuIHNldChzZWxmLl9mYWlsdXJlcy5rZXlz KCkpCiAKICAgICAjIG92ZXJyaWRlCi0gICAgZGVmIF9nZXRfcmVzdWx0X3R5cGVfY2hhcihzZWxm LCB0ZXN0X25hbWUpOgorICAgIGRlZiBfZ2V0X21vZGlmaWVyX2NoYXIoc2VsZiwgdGVzdF9uYW1l KToKICAgICAgICAgaWYgdGVzdF9uYW1lIG5vdCBpbiBzZWxmLl9hbGxfdGVzdHM6CiAgICAgICAg ICAgICByZXR1cm4gc2VsZi5OT19EQVRBX1JFU1VMVAogCmRpZmYgLS1naXQgYS9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3Vs dHNfZ2VuZXJhdG9yLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQppbmRleCA3NjViNGQ4 MTdmYTUyOWFjMzVkNGJkNjUyMzIxM2E0YjU5OTI3NzM5Li4zMjY3NzE4MjI4ZWE2YTk0N2QwOTNj ODk1YWRiYzI0M2U1YjFiOGYwIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5 CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkKQEAgLTQ2LDE3ICs0NiwzNSBAQCBpbXBv cnQgd2Via2l0cHkudGhpcmRwYXJ0eS5zaW1wbGVqc29uIGFzIHNpbXBsZWpzb24KIAogX2xvZyA9 IGxvZ2dpbmcuZ2V0TG9nZ2VyKCJ3ZWJraXRweS5sYXlvdXRfdGVzdHMubGF5b3V0X3BhY2thZ2Uu anNvbl9yZXN1bHRzX2dlbmVyYXRvciIpCiAKLQogY2xhc3MgVGVzdFJlc3VsdChvYmplY3QpOgog ICAgICIiIkEgc2ltcGxlIGNsYXNzIHRoYXQgcmVwcmVzZW50cyBhIHNpbmdsZSB0ZXN0IHJlc3Vs dC4iIiIKLSAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZmFpbGVkPUZhbHNlLCBza2lwcGVk PUZhbHNlLCBlbGFwc2VkX3RpbWU9MCk6CisKKyAgICAjIFRlc3QgbW9kaWZpZXIgY29uc3RhbnRz LgorICAgIChOT05FLCBGQUlMUywgRkxBS1ksIERJU0FCTEVEKSA9IHJhbmdlKDQpCisKKyAgICBk ZWYgX19pbml0X18oc2VsZiwgbmFtZSwgZmFpbGVkPUZhbHNlLCBlbGFwc2VkX3RpbWU9MCk6CiAg ICAgICAgIHNlbGYubmFtZSA9IG5hbWUKICAgICAgICAgc2VsZi5mYWlsZWQgPSBmYWlsZWQKLSAg ICAgICAgc2VsZi5za2lwcGVkID0gc2tpcHBlZAogICAgICAgICBzZWxmLnRpbWUgPSBlbGFwc2Vk X3RpbWUKIAorICAgICAgICB0ZXN0X25hbWUgPSBuYW1lCisgICAgICAgIHRyeToKKyAgICAgICAg ICAgIHRlc3RfbmFtZSA9IG5hbWUuc3BsaXQoJy4nKVsxXQorICAgICAgICBleGNlcHQgSW5kZXhF cnJvcjoKKyAgICAgICAgICAgIF9sb2cud2FybigiSW52YWxpZCB0ZXN0IG5hbWU6ICVzLiIsIG5h bWUpCisgICAgICAgICAgICBwYXNzCisKKyAgICAgICAgaWYgdGVzdF9uYW1lLnN0YXJ0c3dpdGgo J0ZBSUxTXycpOgorICAgICAgICAgICAgc2VsZi5tb2RpZmllciA9IHNlbGYuRkFJTFMKKyAgICAg ICAgZWxpZiB0ZXN0X25hbWUuc3RhcnRzd2l0aCgnRkxBS1lfJyk6CisgICAgICAgICAgICBzZWxm Lm1vZGlmaWVyID0gc2VsZi5GTEFLWQorICAgICAgICBlbGlmIHRlc3RfbmFtZS5zdGFydHN3aXRo KCdESVNBQkxFRF8nKToKKyAgICAgICAgICAgIHNlbGYubW9kaWZpZXIgPSBzZWxmLkRJU0FCTEVE CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLm1vZGlmaWVyID0gc2VsZi5OT05FCisK ICAgICBkZWYgZml4YWJsZShzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuZmFpbGVkIG9yIHNl bGYuc2tpcHBlZAorICAgICAgICByZXR1cm4gc2VsZi5mYWlsZWQgb3Igc2VsZi5tb2RpZmllciA9 PSBzZWxmLkRJU0FCTEVECiAKIAogY2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9iamVj dCk6CkBAIC02NywxMCArODUsMjAgQEAgY2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9i amVjdCk6CiAgICAgTUlOX1RJTUUgPSAxCiAgICAgSlNPTl9QUkVGSVggPSAiQUREX1JFU1VMVFMo IgogICAgIEpTT05fU1VGRklYID0gIik7IgorCisgICAgIyBOb3RlIHRoYXQgaW4gbm9uLWNocm9t aXVtIHRlc3RzIHRob3NlIGNoYXJzIGFyZSB1c2VkIHRvIGluZGljYXRlCisgICAgIyB0ZXN0IG1v ZGlmaWVycyAoRkFJTFMsIEZMQUtZLCBldGMpIGJ1dCBub3QgYWN0dWFsIHRlc3QgcmVzdWx0cy4K ICAgICBQQVNTX1JFU1VMVCA9ICJQIgogICAgIFNLSVBfUkVTVUxUID0gIlgiCiAgICAgRkFJTF9S RVNVTFQgPSAiRiIKKyAgICBGTEFLWV9SRVNVTFQgPSAiTCIKICAgICBOT19EQVRBX1JFU1VMVCA9 ICJOIgorCisgICAgTU9ESUZJRVJfVE9fQ0hBUiA9IHtUZXN0UmVzdWx0Lk5PTkU6IFBBU1NfUkVT VUxULAorICAgICAgICAgICAgICAgICAgICAgICAgVGVzdFJlc3VsdC5ESVNBQkxFRDogU0tJUF9S RVNVTFQsCisgICAgICAgICAgICAgICAgICAgICAgICBUZXN0UmVzdWx0LkZBSUxTOiBGQUlMX1JF U1VMVCwKKyAgICAgICAgICAgICAgICAgICAgICAgIFRlc3RSZXN1bHQuRkxBS1k6IEZMQUtZX1JF U1VMVH0KKwogICAgIFZFUlNJT04gPSAzCiAgICAgVkVSU0lPTl9LRVkgPSAidmVyc2lvbiIKICAg ICBSRVNVTFRTID0gInJlc3VsdHMiCkBAIC05NCw3ICsxMjIsOCBAQCBjbGFzcyBKU09OUmVzdWx0 c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAgdGVzdF9yZXN1bHRzX21hcCwgc3ZuX3Jl cG9zaXRvcmllcz1Ob25lLAogICAgICAgICBnZW5lcmF0ZV9pbmNyZW1lbnRhbF9yZXN1bHRzPUZh bHNlLAogICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVyPU5vbmUsCi0gICAgICAgIHRlc3RfdHlw ZT0iIik6CisgICAgICAgIHRlc3RfdHlwZT0iIiwKKyAgICAgICAgbWFzdGVyX25hbWU9IiIpOgog ICAgICAgICAiIiJNb2RpZmllcyB0aGUgcmVzdWx0cy5qc29uIGZpbGUuIEdyYWJzIGl0IG9mZiB0 aGUgYXJjaGl2ZSBkaXJlY3RvcnkKICAgICAgICAgaWYgaXQgaXMgbm90IGZvdW5kIGxvY2FsbHku CiAKQEAgLTExMywxMSArMTQyLDE0IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShv YmplY3QpOgogICAgICAgICAgIGdlbmVyYXRlX2luY3JlbWVudGFsX3Jlc3VsdHM6IElmIHRydWUs IGdlbmVyYXRlIGluY3JlbWVudGFsIGpzb24gZmlsZQogICAgICAgICAgICAgICBmcm9tIGN1cnJl bnQgcnVuIHJlc3VsdHMuCiAgICAgICAgICAgdGVzdF9yZXN1bHRzX3NlcnZlcjogc2VydmVyIHRo YXQgaG9zdHMgdGVzdCByZXN1bHRzIGpzb24uCisgICAgICAgICAgdGVzdF90eXBlOiB0ZXN0IHR5 cGUgc3RyaW5nIChlLmcuICdsYXlvdXQtdGVzdHMnKS4KKyAgICAgICAgICBtYXN0ZXJfbmFtZTog dGhlIG5hbWUgb2YgdGhlIGJ1aWxkYm90IG1hc3Rlci4KICAgICAgICAgIiIiCiAgICAgICAgIHNl bGYuX2J1aWxkZXJfbmFtZSA9IGJ1aWxkZXJfbmFtZQogICAgICAgICBzZWxmLl9idWlsZF9uYW1l ID0gYnVpbGRfbmFtZQogICAgICAgICBzZWxmLl9idWlsZF9udW1iZXIgPSBidWlsZF9udW1iZXIK ICAgICAgICAgc2VsZi5fYnVpbGRlcl9iYXNlX3VybCA9IGJ1aWxkZXJfYmFzZV91cmwKKyAgICAg ICAgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnkgPSByZXN1bHRzX2ZpbGVfYmFzZV9wYXRoCiAgICAg ICAgIHNlbGYuX3Jlc3VsdHNfZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKHJlc3VsdHNfZmlsZV9i YXNlX3BhdGgsCiAgICAgICAgICAgICBzZWxmLlJFU1VMVFNfRklMRU5BTUUpCiAgICAgICAgIHNl bGYuX2luY3JlbWVudGFsX3Jlc3VsdHNfZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKApAQCAtMTMz LDYgKzE2NSw3IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3QpOgogCiAg ICAgICAgIHNlbGYuX3Rlc3RfcmVzdWx0c19zZXJ2ZXIgPSB0ZXN0X3Jlc3VsdHNfc2VydmVyCiAg ICAgICAgIHNlbGYuX3Rlc3RfdHlwZSA9IHRlc3RfdHlwZQorICAgICAgICBzZWxmLl9tYXN0ZXJf bmFtZSA9IG1hc3Rlcl9uYW1lCiAKICAgICAgICAgc2VsZi5fanNvbiA9IE5vbmUKICAgICAgICAg c2VsZi5fYXJjaGl2ZWRfcmVzdWx0cyA9IE5vbmUKQEAgLTIwNSw2ICsyMzgsMzYgQEAgY2xhc3Mg SlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9iamVjdCk6CiAgICAgZGVmIHNldF9hcmNoaXZlZF9y ZXN1bHRzKHNlbGYsIGFyY2hpdmVkX3Jlc3VsdHMpOgogICAgICAgICBzZWxmLl9hcmNoaXZlZF9y ZXN1bHRzID0gYXJjaGl2ZWRfcmVzdWx0cwogCisgICAgZGVmIHVwbG9hZF9qc29uX2ZpbGVzKHNl bGYsIGpzb25fZmlsZXMpOgorICAgICAgICAiIiJVcGxvYWRzIHRoZSBnaXZlbiBqc29uX2ZpbGVz IHRvIHRoZSB0ZXN0X3Jlc3VsdHNfc2VydmVyIChpZiB0aGUKKyAgICAgICAgdGVzdF9yZXN1bHRz X3NlcnZlciBpcyBnaXZlbikuIiIiCisgICAgICAgIGlmIG5vdCBzZWxmLl90ZXN0X3Jlc3VsdHNf c2VydmVyOgorICAgICAgICAgICAgcmV0dXJuCisKKyAgICAgICAgaWYgbm90IHNlbGYuX21hc3Rl cl9uYW1lOgorICAgICAgICAgICAgX2xvZy5lcnJvcigiLS10ZXN0LXJlc3VsdHMtc2VydmVyIHdh cyBzZXQsIGJ1dCAtLW1hc3Rlci1uYW1lIHdhcyBub3QuICBOb3QgdXBsb2FkaW5nIEpTT04gZmls ZXMuIikKKyAgICAgICAgICAgIHJldHVybgorCisgICAgICAgIF9sb2cuaW5mbygiVXBsb2FkaW5n IEpTT04gZmlsZXMgZm9yIGJ1aWxkZXI6ICVzIiwgc2VsZi5fYnVpbGRlcl9uYW1lKQorICAgICAg ICBhdHRycyA9IFsoImJ1aWxkZXIiLCBzZWxmLl9idWlsZGVyX25hbWUpLAorICAgICAgICAgICAg ICAgICAoInRlc3R0eXBlIiwgc2VsZi5fdGVzdF90eXBlKSwKKyAgICAgICAgICAgICAgICAgKCJt YXN0ZXIiLCBzZWxmLl9tYXN0ZXJfbmFtZSldCisKKyAgICAgICAgZmlsZXMgPSBbKGZpbGUsIG9z LnBhdGguam9pbihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgZmlsZSkpCisgICAgICAgICAgICBm b3IgZmlsZSBpbiBqc29uX2ZpbGVzXQorCisgICAgICAgIHVwbG9hZGVyID0gdGVzdF9yZXN1bHRz X3VwbG9hZGVyLlRlc3RSZXN1bHRzVXBsb2FkZXIoCisgICAgICAgICAgICBzZWxmLl90ZXN0X3Jl c3VsdHNfc2VydmVyKQorICAgICAgICB0cnk6CisgICAgICAgICAgICAjIFNldCB1cGxvYWRpbmcg dGltZW91dCBpbiBjYXNlIGFwcGVuZ2luZSBzZXJ2ZXIgaXMgaGF2aW5nIHByb2JsZW0uCisgICAg ICAgICAgICAjIDEyMCBzZWNvbmRzIGFyZSBtb3JlIHRoYW4gZW5vdWdoIHRvIHVwbG9hZCB0ZXN0 IHJlc3VsdHMuCisgICAgICAgICAgICB1cGxvYWRlci51cGxvYWQoYXR0cnMsIGZpbGVzLCAxMjAp CisgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24sIGVycjoKKyAgICAgICAgICAgIF9sb2cuZXJyb3Io IlVwbG9hZCBmYWlsZWQ6ICVzIiAlIGVycikKKyAgICAgICAgICAgIHJldHVybgorCisgICAgICAg IF9sb2cuaW5mbygiSlNPTiBmaWxlcyB1cGxvYWRlZC4iKQorCiAgICAgZGVmIF9nZW5lcmF0ZV9q c29uX2ZpbGUoc2VsZiwganNvbiwgZmlsZV9wYXRoKToKICAgICAgICAgIyBTcGVjaWZ5IHNlcGFy YXRvcnMgaW4gb3JkZXIgdG8gZ2V0IGNvbXBhY3QgZW5jb2RpbmcuCiAgICAgICAgIGpzb25fZGF0 YSA9IHNpbXBsZWpzb24uZHVtcHMoanNvbiwgc2VwYXJhdG9ycz0oJywnLCAnOicpKQpAQCAtMjI2 LDE5ICsyODksMTcgQEAgY2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9iamVjdCk6CiAg ICAgICAgICIiIlJldHVybnMgYSBzZXQgb2YgZmFpbGVkIHRlc3QgbmFtZXMuIiIiCiAgICAgICAg IHJldHVybiBzZXQoW3IubmFtZSBmb3IgciBpbiBzZWxmLl90ZXN0X3Jlc3VsdHMgaWYgci5mYWls ZWRdKQogCi0gICAgZGVmIF9nZXRfcmVzdWx0X3R5cGVfY2hhcihzZWxmLCB0ZXN0X25hbWUpOgor ICAgIGRlZiBfZ2V0X21vZGlmaWVyX2NoYXIoc2VsZiwgdGVzdF9uYW1lKToKICAgICAgICAgIiIi UmV0dXJucyBhIHNpbmdsZSBjaGFyIChlLmcuIFNLSVBfUkVTVUxULCBGQUlMX1JFU1VMVCwKLSAg ICAgICAgUEFTU19SRVNVTFQsIE5PX0RBVEFfUkVTVUxULCBldGMpIHRoYXQgaW5kaWNhdGVzIHRo ZSB0ZXN0IHJlc3VsdAorICAgICAgICBQQVNTX1JFU1VMVCwgTk9fREFUQV9SRVNVTFQsIGV0Yykg dGhhdCBpbmRpY2F0ZXMgdGhlIHRlc3QgbW9kaWZpZXIKICAgICAgICAgZm9yIHRoZSBnaXZlbiB0 ZXN0X25hbWUuCiAgICAgICAgICIiIgogICAgICAgICBpZiB0ZXN0X25hbWUgbm90IGluIHNlbGYu X3Rlc3RfcmVzdWx0c19tYXA6CiAgICAgICAgICAgICByZXR1cm4gSlNPTlJlc3VsdHNHZW5lcmF0 b3IuTk9fREFUQV9SRVNVTFQKIAogICAgICAgICB0ZXN0X3Jlc3VsdCA9IHNlbGYuX3Rlc3RfcmVz dWx0c19tYXBbdGVzdF9uYW1lXQotICAgICAgICBpZiB0ZXN0X3Jlc3VsdC5za2lwcGVkOgotICAg ICAgICAgICAgcmV0dXJuIEpTT05SZXN1bHRzR2VuZXJhdG9yLlNLSVBfUkVTVUxUCi0gICAgICAg IGlmIHRlc3RfcmVzdWx0LmZhaWxlZDoKLSAgICAgICAgICAgIHJldHVybiBKU09OUmVzdWx0c0dl bmVyYXRvci5GQUlMX1JFU1VMVAorICAgICAgICBpZiB0ZXN0X3Jlc3VsdC5tb2RpZmllciBpbiBz ZWxmLk1PRElGSUVSX1RPX0NIQVIua2V5cygpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuTU9E SUZJRVJfVE9fQ0hBUlt0ZXN0X3Jlc3VsdC5tb2RpZmllcl0KIAogICAgICAgICByZXR1cm4gSlNP TlJlc3VsdHNHZW5lcmF0b3IuUEFTU19SRVNVTFQKIApAQCAtMzQ0LDEwICs0MDUsMTAgQEAgY2xh c3MgSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2luc2Vy dF9pdGVtX2ludG9fcmF3X2xpc3QocmVzdWx0c19mb3JfYnVpbGRlciwKICAgICAgICAgICAgIGZp eGFibGVfY291bnQsIHNlbGYuRklYQUJMRV9DT1VOVCkKIAotICAgICAgICAjIENyZWF0ZSBhIHBh c3Mvc2tpcC9mYWlsdXJlIHN1bW1hcnkgZGljdGlvbmFyeS4KKyAgICAgICAgIyBDcmVhdGUgYSB0 ZXN0IG1vZGlmaWVycyAoRkFJTFMsIEZMQUtZIGV0Yykgc3VtbWFyeSBkaWN0aW9uYXJ5LgogICAg ICAgICBlbnRyeSA9IHt9CiAgICAgICAgIGZvciB0ZXN0X25hbWUgaW4gc2VsZi5fdGVzdF9yZXN1 bHRzX21hcC5pdGVya2V5cygpOgotICAgICAgICAgICAgcmVzdWx0X2NoYXIgPSBzZWxmLl9nZXRf cmVzdWx0X3R5cGVfY2hhcih0ZXN0X25hbWUpCisgICAgICAgICAgICByZXN1bHRfY2hhciA9IHNl bGYuX2dldF9tb2RpZmllcl9jaGFyKHRlc3RfbmFtZSkKICAgICAgICAgICAgIGVudHJ5W3Jlc3Vs dF9jaGFyXSA9IGVudHJ5LmdldChyZXN1bHRfY2hhciwgMCkgKyAxCiAKICAgICAgICAgIyBJbnNl cnQgdGhlIHBhc3Mvc2tpcC9mYWlsdXJlIHN1bW1hcnkgZGljdGlvbmFyeS4KQEAgLTQyMyw3ICs0 ODQsNyBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAgICAg ICB0ZXN0czogRGljdGlvbmFyeSBjb250YWluaW5nIHRlc3QgcmVzdWx0IGVudHJpZXMuCiAgICAg ICAgICIiIgogCi0gICAgICAgIHJlc3VsdCA9IHNlbGYuX2dldF9yZXN1bHRfdHlwZV9jaGFyKHRl c3RfbmFtZSkKKyAgICAgICAgcmVzdWx0ID0gc2VsZi5fZ2V0X21vZGlmaWVyX2NoYXIodGVzdF9u YW1lKQogICAgICAgICB0aW1lID0gc2VsZi5fZ2V0X3Rlc3RfdGltaW5nKHRlc3RfbmFtZSkKIAog ICAgICAgICBpZiB0ZXN0X25hbWUgbm90IGluIHRlc3RzOgpAQCAtNTIzLDMzICs1ODQsMTAgQEAg Y2xhc3MgSlNPTlJlc3VsdHNHZW5lcmF0b3IoSlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlKToKICAg ICAjIFRoZSBmbGFnIGlzIGZvciBiYWNrd2FyZCBjb21wYXRpYmlsaXR5LgogICAgIG91dHB1dF9q c29uX2luX2luaXQgPSBUcnVlCiAKLSAgICBkZWYgX3VwbG9hZF9qc29uX2ZpbGVzKHNlbGYpOgot ICAgICAgICBpZiBub3Qgc2VsZi5fdGVzdF9yZXN1bHRzX3NlcnZlciBvciBub3Qgc2VsZi5fdGVz dF90eXBlOgotICAgICAgICAgICAgcmV0dXJuCi0KLSAgICAgICAgX2xvZy5pbmZvKCJVcGxvYWRp bmcgSlNPTiBmaWxlcyBmb3IgJXMgdG8gdGhlIHNlcnZlcjogJXMiLAotICAgICAgICAgICAgICAg ICAgc2VsZi5fYnVpbGRlcl9uYW1lLCBzZWxmLl90ZXN0X3Jlc3VsdHNfc2VydmVyKQotICAgICAg ICBhdHRycyA9IFsoImJ1aWxkZXIiLCBzZWxmLl9idWlsZGVyX25hbWUpLCAoInRlc3R0eXBlIiwg c2VsZi5fdGVzdF90eXBlKV0KLSAgICAgICAganNvbl9maWxlcyA9IFtzZWxmLklOQ1JFTUVOVEFM X1JFU1VMVFNfRklMRU5BTUVdCi0KLSAgICAgICAgZmlsZXMgPSBbKGZpbGUsIG9zLnBhdGguam9p bihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgZmlsZSkpCi0gICAgICAgICAgICBmb3IgZmlsZSBp biBqc29uX2ZpbGVzXQotICAgICAgICB1cGxvYWRlciA9IHRlc3RfcmVzdWx0c191cGxvYWRlci5U ZXN0UmVzdWx0c1VwbG9hZGVyKAotICAgICAgICAgICAgc2VsZi5fdGVzdF9yZXN1bHRzX3NlcnZl cikKLSAgICAgICAgdHJ5OgotICAgICAgICAgICAgIyBTZXQgdXBsb2FkaW5nIHRpbWVvdXQgaW4g Y2FzZSBhcHBlbmdpbmUgc2VydmVyIGlzIGhhdmluZyBwcm9ibGVtLgotICAgICAgICAgICAgIyAx MjAgc2Vjb25kcyBhcmUgbW9yZSB0aGFuIGVub3VnaCB0byB1cGxvYWQgdGVzdCByZXN1bHRzLgot ICAgICAgICAgICAgdXBsb2FkZXIudXBsb2FkKGF0dHJzLCBmaWxlcywgMTIwKQotICAgICAgICBl eGNlcHQgRXhjZXB0aW9uLCBlcnI6Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCJVcGxvYWQgZmFp bGVkOiAlcyIgJSBlcnIpCi0gICAgICAgICAgICByZXR1cm4KLQotICAgICAgICBfbG9nLmluZm8o IkpTT04gZmlsZXMgdXBsb2FkZWQuIikKLQogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBi dWlsZGVyX25hbWUsIGJ1aWxkX25hbWUsIGJ1aWxkX251bWJlciwKICAgICAgICAgcmVzdWx0c19m aWxlX2Jhc2VfcGF0aCwgYnVpbGRlcl9iYXNlX3VybCwKICAgICAgICAgdGVzdF90aW1pbmdzLCBm YWlsdXJlcywgcGFzc2VkX3Rlc3RzLCBza2lwcGVkX3Rlc3RzLCBhbGxfdGVzdHMsCi0gICAgICAg IHRlc3RfcmVzdWx0c19zZXJ2ZXI9Tm9uZSwgdGVzdF90eXBlPU5vbmUpOgorICAgICAgICB0ZXN0 X3Jlc3VsdHNfc2VydmVyPU5vbmUsIHRlc3RfdHlwZT1Ob25lLCBtYXN0ZXJfbmFtZT1Ob25lKToK ICAgICAgICAgIiIiR2VuZXJhdGVzIGEgSlNPTiByZXN1bHRzIGZpbGUuCiAKICAgICAgICAgQXJn cwpAQCAtNTY3LDYgKzYwNSw3IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yKEpTT05SZXN1 bHRzR2VuZXJhdG9yQmFzZSk6CiAgICAgICAgICAgICAgIGluY2x1ZGUgc2tpcHBlZCB0ZXN0cy4K ICAgICAgICAgICB0ZXN0X3Jlc3VsdHNfc2VydmVyOiBzZXJ2ZXIgdGhhdCBob3N0cyB0ZXN0IHJl c3VsdHMganNvbi4KICAgICAgICAgICB0ZXN0X3R5cGU6IHRoZSB0ZXN0IHR5cGUuCisgICAgICAg ICAgbWFzdGVyX25hbWU6IHRoZSBuYW1lIG9mIHRoZSBidWlsZGJvdCBtYXN0ZXIuCiAgICAgICAg ICIiIgogCiAgICAgICAgIHNlbGYuX3Rlc3RfdHlwZSA9IHRlc3RfdHlwZQpAQCAtNTgyLDExICs2 MjEsOSBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvcihKU09OUmVzdWx0c0dlbmVyYXRvckJh c2UpOgogICAgICAgICAgICAgdGVzdF9yZXN1bHQuZmFpbGVkID0gVHJ1ZQogICAgICAgICBmb3Ig dGVzdCBpbiBza2lwcGVkX3Rlc3RzOgogICAgICAgICAgICAgdGVzdF9yZXN1bHRzX21hcFt0ZXN0 XSA9IHRlc3RfcmVzdWx0ID0gZ2V0KHRlc3QsIFRlc3RSZXN1bHQodGVzdCkpCi0gICAgICAgICAg ICB0ZXN0X3Jlc3VsdC5za2lwcGVkID0gVHJ1ZQogICAgICAgICBmb3IgdGVzdCBpbiBwYXNzZWRf dGVzdHM6CiAgICAgICAgICAgICB0ZXN0X3Jlc3VsdHNfbWFwW3Rlc3RdID0gdGVzdF9yZXN1bHQg PSBnZXQodGVzdCwgVGVzdFJlc3VsdCh0ZXN0KSkKICAgICAgICAgICAgIHRlc3RfcmVzdWx0LmZh aWxlZCA9IEZhbHNlCi0gICAgICAgICAgICB0ZXN0X3Jlc3VsdC5za2lwcGVkID0gRmFsc2UKICAg ICAgICAgZm9yIHRlc3QgaW4gYWxsX3Rlc3RzOgogICAgICAgICAgICAgaWYgdGVzdCBub3QgaW4g dGVzdF9yZXN1bHRzX21hcDoKICAgICAgICAgICAgICAgICB0ZXN0X3Jlc3VsdHNfbWFwW3Rlc3Rd ID0gVGVzdFJlc3VsdCh0ZXN0KQpAQCAtNTk5LDggKzYzNiw5IEBAIGNsYXNzIEpTT05SZXN1bHRz R2VuZXJhdG9yKEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZSk6CiAgICAgICAgICAgICBzdm5fcmVw b3NpdG9yaWVzPXBvcnQudGVzdF9yZXBvc2l0b3J5X3BhdGhzKCksCiAgICAgICAgICAgICBnZW5l cmF0ZV9pbmNyZW1lbnRhbF9yZXN1bHRzPVRydWUsCiAgICAgICAgICAgICB0ZXN0X3Jlc3VsdHNf c2VydmVyPXRlc3RfcmVzdWx0c19zZXJ2ZXIsCi0gICAgICAgICAgICB0ZXN0X3R5cGU9dGVzdF90 eXBlKQorICAgICAgICAgICAgdGVzdF90eXBlPXRlc3RfdHlwZSwKKyAgICAgICAgICAgIG1hc3Rl cl9uYW1lPW1hc3Rlcl9uYW1lKQogCiAgICAgICAgIGlmIHNlbGYuX19jbGFzc19fLm91dHB1dF9q c29uX2luX2luaXQ6CiAgICAgICAgICAgICBzZWxmLmdlbmVyYXRlX2pzb25fb3V0cHV0KCkKLSAg ICAgICAgICAgIHNlbGYuX3VwbG9hZF9qc29uX2ZpbGVzKCkKKyAgICAgICAgICAgIHNlbGYudXBs b2FkX2pzb25fZmlsZXMoW3NlbGYuSU5DUkVNRU5UQUxfUkVTVUxUU19GSUxFTkFNRV0pCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRz X2dlbmVyYXRvcl91bml0dGVzdC5weQppbmRleCA3ODVjYzFjYWQ2YjIwYjU3MTUzZmI3NDZiM2Nl OGNjYWNjZGQ1OTM4Li42MDZhNjEzY2Y4ZDNlMGFjZGQzMWNmYzM5YWY2Yjk4NzNiZmUwZjU2IDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlv dXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktp dFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25f cmVzdWx0c19nZW5lcmF0b3JfdW5pdHRlc3QucHkKQEAgLTQ3LDQzICs0Nyw2OCBAQCBjbGFzcyBK U09OR2VuZXJhdG9yVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYnVpbGRf bnVtYmVyID0gJ0RVTU1ZX0JVSUxERVJfTlVNQkVSJwogICAgICAgICBzZWxmLl9qc29uID0gTm9u ZQogICAgICAgICBzZWxmLl9udW1fcnVucyA9IDAKLSAgICAgICAgc2VsZi5fdGVzdHNfbGlzdCA9 IHNldChbXSkKKyAgICAgICAgc2VsZi5fdGVzdHNfc2V0ID0gc2V0KFtdKQogICAgICAgICBzZWxm Ll90ZXN0X3RpbWluZ3MgPSB7fQotICAgICAgICBzZWxmLl9mYWlsZWRfdGVzdHMgPSB7fQotICAg ICAgICBzZWxmLl9wYXNzZWRfdGVzdHMgPSBzZXQoW10pCi0gICAgICAgIHNlbGYuX3NraXBwZWRf dGVzdHMgPSBzZXQoW10pCi0KLSAgICBkZWYgX3Rlc3RfanNvbl9nZW5lcmF0aW9uKHNlbGYsIHBh c3NlZF90ZXN0cywgZmFpbGVkX3Rlc3RzLCBza2lwcGVkX3Rlc3RzKToKLSAgICAgICAgIyBNYWtl IHN1cmUgd2UgaGF2ZSBzZXRzIChyYXRoZXIgdGhhbiBsaXN0cykuCi0gICAgICAgIHBhc3NlZF90 ZXN0cyA9IHNldChwYXNzZWRfdGVzdHMpCi0gICAgICAgIHNraXBwZWRfdGVzdHMgPSBzZXQoc2tp cHBlZF90ZXN0cykKLSAgICAgICAgdGVzdHNfbGlzdCA9IHBhc3NlZF90ZXN0cyB8IHNldChmYWls ZWRfdGVzdHMua2V5cygpKQorICAgICAgICBzZWxmLl9mYWlsZWRfdGVzdHMgPSBzZXQoW10pCisK KyAgICAgICAgc2VsZi5fUEFTU190ZXN0cyA9IHNldChbXSkKKyAgICAgICAgc2VsZi5fRElTQUJM RURfdGVzdHMgPSBzZXQoW10pCisgICAgICAgIHNlbGYuX0ZMQUtZX3Rlc3RzID0gc2V0KFtdKQor ICAgICAgICBzZWxmLl9GQUlMU190ZXN0cyA9IHNldChbXSkKKworICAgIGRlZiBfZ2V0X3Rlc3Rf bW9kaWZpZXIoc2VsZiwgdGVzdF9uYW1lKToKKyAgICAgICAgaWYgdGVzdF9uYW1lLnN0YXJ0c3dp dGgoJ0RJU0FCTEVEXycpOgorICAgICAgICAgICAgcmV0dXJuIGpzb25fcmVzdWx0c19nZW5lcmF0 b3IuSlNPTlJlc3VsdHNHZW5lcmF0b3IuU0tJUF9SRVNVTFQKKyAgICAgICAgZWxpZiB0ZXN0X25h bWUuc3RhcnRzd2l0aCgnRkxBS1lfJyk6CisgICAgICAgICAgICByZXR1cm4ganNvbl9yZXN1bHRz X2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVyYXRvci5GTEFLWV9SRVNVTFQKKyAgICAgICAgZWxp ZiB0ZXN0X25hbWUuc3RhcnRzd2l0aCgnRkFJTFNfJyk6CisgICAgICAgICAgICByZXR1cm4ganNv bl9yZXN1bHRzX2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVyYXRvci5GQUlMX1JFU1VMVAorICAg ICAgICByZXR1cm4ganNvbl9yZXN1bHRzX2dlbmVyYXRvci5KU09OUmVzdWx0c0dlbmVyYXRvci5Q QVNTX1JFU1VMVAorCisgICAgZGVmIF90ZXN0X2pzb25fZ2VuZXJhdGlvbihzZWxmLCBwYXNzZWRf dGVzdHNfbGlzdCwgZmFpbGVkX3Rlc3RzX2xpc3QpOgorICAgICAgICB0ZXN0c19zZXQgPSBzZXQo cGFzc2VkX3Rlc3RzX2xpc3QpIHwgc2V0KGZhaWxlZF90ZXN0c19saXN0KQorCisgICAgICAgIERJ U0FCTEVEX3Rlc3RzID0gc2V0KFt0IGZvciB0IGluIHRlc3RzX3NldAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpZiB0LnN0YXJ0c3dpdGgoJ0RJU0FCTEVEXycpXSkKKyAgICAgICAgRkxB S1lfdGVzdHMgPSBzZXQoW3QgZm9yIHQgaW4gdGVzdHNfc2V0CisgICAgICAgICAgICAgICAgICAg ICAgICAgICBpZiB0LnN0YXJ0c3dpdGgoJ0ZMQUtZXycpXSkKKyAgICAgICAgRkFJTFNfdGVzdHMg PSBzZXQoW3QgZm9yIHQgaW4gdGVzdHNfc2V0CisgICAgICAgICAgICAgICAgICAgICAgICAgICBp ZiB0LnN0YXJ0c3dpdGgoJ0ZBSUxTXycpXSkKKyAgICAgICAgUEFTU190ZXN0cyA9IHRlc3RzX3Nl dCBeIChESVNBQkxFRF90ZXN0cyB8IEZMQUtZX3Rlc3RzIHwgRkFJTFNfdGVzdHMpCisKKyAgICAg ICAgcGFzc2VkX3Rlc3RzID0gc2V0KHBhc3NlZF90ZXN0c19saXN0KSBeIERJU0FCTEVEX3Rlc3Rz CisgICAgICAgIGZhaWxlZF90ZXN0cyA9IHNldChmYWlsZWRfdGVzdHNfbGlzdCkKKwogICAgICAg ICB0ZXN0X3RpbWluZ3MgPSB7fQogICAgICAgICBpID0gMAotICAgICAgICBmb3IgdGVzdCBpbiB0 ZXN0c19saXN0OgorICAgICAgICBmb3IgdGVzdCBpbiB0ZXN0c19zZXQ6CiAgICAgICAgICAgICB0 ZXN0X3RpbWluZ3NbdGVzdF0gPSBmbG9hdChzZWxmLl9udW1fcnVucyAqIDEwMCArIGkpCiAgICAg ICAgICAgICBpICs9IDEKIAotICAgICAgICBwb3J0X29iaiA9IHBvcnQuZ2V0KE5vbmUpCisgICAg ICAgICMgRm9yIGJhY2t3YXJkIGNvbXBhdGliaWxpdHkuCisgICAgICAgIHJlYXNvbiA9IHRlc3Rf ZXhwZWN0YXRpb25zLlRFWFQKKyAgICAgICAgZmFpbGVkX3Rlc3RzX2RpY3QgPSBkaWN0KFsobmFt ZSwgcmVhc29uKSBmb3IgbmFtZSBpbiBmYWlsZWRfdGVzdHNdKQogCisgICAgICAgIHBvcnRfb2Jq ID0gcG9ydC5nZXQoTm9uZSkKICAgICAgICAgZ2VuZXJhdG9yID0ganNvbl9yZXN1bHRzX2dlbmVy YXRvci5KU09OUmVzdWx0c0dlbmVyYXRvcihwb3J0X29iaiwKICAgICAgICAgICAgIHNlbGYuYnVp bGRlcl9uYW1lLCBzZWxmLmJ1aWxkX25hbWUsIHNlbGYuYnVpbGRfbnVtYmVyLAogICAgICAgICAg ICAgJycsCiAgICAgICAgICAgICBOb25lLCAgICMgZG9uJ3QgZmV0Y2ggcGFzdCBqc29uIHJlc3Vs dHMgYXJjaGl2ZQogICAgICAgICAgICAgdGVzdF90aW1pbmdzLAotICAgICAgICAgICAgZmFpbGVk X3Rlc3RzLAorICAgICAgICAgICAgZmFpbGVkX3Rlc3RzX2RpY3QsCiAgICAgICAgICAgICBwYXNz ZWRfdGVzdHMsCi0gICAgICAgICAgICBza2lwcGVkX3Rlc3RzLAotICAgICAgICAgICAgdGVzdHNf bGlzdCkKKyAgICAgICAgICAgICgpLAorICAgICAgICAgICAgdGVzdHNfc2V0KQogCiAgICAgICAg ICMgVGVzdCBpbmNyZW1lbnRhbCBqc29uIHJlc3VsdHMKICAgICAgICAgaW5jcmVtZW50YWxfanNv biA9IGdlbmVyYXRvci5nZXRfanNvbihpbmNyZW1lbnRhbD1UcnVlKQogICAgICAgICBzZWxmLl92 ZXJpZnlfanNvbl9yZXN1bHRzKAotICAgICAgICAgICAgdGVzdHNfbGlzdCwKKyAgICAgICAgICAg IHRlc3RzX3NldCwKICAgICAgICAgICAgIHRlc3RfdGltaW5ncywKLSAgICAgICAgICAgIHBhc3Nl ZF90ZXN0cywKICAgICAgICAgICAgIGZhaWxlZF90ZXN0cywKLSAgICAgICAgICAgIHNraXBwZWRf dGVzdHMsCisgICAgICAgICAgICBQQVNTX3Rlc3RzLAorICAgICAgICAgICAgRElTQUJMRURfdGVz dHMsCisgICAgICAgICAgICBGTEFLWV90ZXN0cywKICAgICAgICAgICAgIGluY3JlbWVudGFsX2pz b24sCiAgICAgICAgICAgICAxKQogCkBAIC05MiwyMyArMTE3LDI1IEBAIGNsYXNzIEpTT05HZW5l cmF0b3JUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAganNvbiA9IGdlbmVyYXRvci5n ZXRfanNvbihpbmNyZW1lbnRhbD1GYWxzZSkKICAgICAgICAgc2VsZi5fanNvbiA9IGpzb24KICAg ICAgICAgc2VsZi5fbnVtX3J1bnMgKz0gMQotICAgICAgICBzZWxmLl90ZXN0c19saXN0IHw9IHRl c3RzX2xpc3QKKyAgICAgICAgc2VsZi5fdGVzdHNfc2V0IHw9IHRlc3RzX3NldAogICAgICAgICBz ZWxmLl90ZXN0X3RpbWluZ3MudXBkYXRlKHRlc3RfdGltaW5ncykKICAgICAgICAgc2VsZi5fZmFp bGVkX3Rlc3RzLnVwZGF0ZShmYWlsZWRfdGVzdHMpCi0gICAgICAgIHNlbGYuX3Bhc3NlZF90ZXN0 cyB8PSBwYXNzZWRfdGVzdHMKLSAgICAgICAgc2VsZi5fc2tpcHBlZF90ZXN0cyB8PSBza2lwcGVk X3Rlc3RzCisgICAgICAgIHNlbGYuX1BBU1NfdGVzdHMgfD0gUEFTU190ZXN0cworICAgICAgICBz ZWxmLl9ESVNBQkxFRF90ZXN0cyB8PSBESVNBQkxFRF90ZXN0cworICAgICAgICBzZWxmLl9GTEFL WV90ZXN0cyB8PSBGTEFLWV90ZXN0cwogICAgICAgICBzZWxmLl92ZXJpZnlfanNvbl9yZXN1bHRz KAotICAgICAgICAgICAgc2VsZi5fdGVzdHNfbGlzdCwKKyAgICAgICAgICAgIHNlbGYuX3Rlc3Rz X3NldCwKICAgICAgICAgICAgIHNlbGYuX3Rlc3RfdGltaW5ncywKLSAgICAgICAgICAgIHNlbGYu X3Bhc3NlZF90ZXN0cywKICAgICAgICAgICAgIHNlbGYuX2ZhaWxlZF90ZXN0cywKLSAgICAgICAg ICAgIHNlbGYuX3NraXBwZWRfdGVzdHMsCisgICAgICAgICAgICBzZWxmLl9QQVNTX3Rlc3RzLAor ICAgICAgICAgICAgc2VsZi5fRElTQUJMRURfdGVzdHMsCisgICAgICAgICAgICBzZWxmLl9GTEFL WV90ZXN0cywKICAgICAgICAgICAgIHNlbGYuX2pzb24sCiAgICAgICAgICAgICBzZWxmLl9udW1f cnVucykKIAotICAgIGRlZiBfdmVyaWZ5X2pzb25fcmVzdWx0cyhzZWxmLCB0ZXN0c19saXN0LCB0 ZXN0X3RpbWluZ3MsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhc3NlZF90ZXN0cywg ZmFpbGVkX3Rlc3RzLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICBza2lwcGVkX3Rlc3Rz LCBqc29uLCBudW1fcnVucyk6CisgICAgZGVmIF92ZXJpZnlfanNvbl9yZXN1bHRzKHNlbGYsIHRl c3RzX3NldCwgdGVzdF90aW1pbmdzLCBmYWlsZWRfdGVzdHMsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIFBBU1NfdGVzdHMsIERJU0FCTEVEX3Rlc3RzLCBGTEFLWV90ZXN0cywKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAganNvbiwgbnVtX3J1bnMpOgogICAgICAgICAjIEFsaWFz aW5nIHRvIGEgc2hvcnQgbmFtZSBmb3IgYmV0dGVyIGFjY2VzcyB0byBpdHMgY29uc3RhbnRzLgog ICAgICAgICBKUkcgPSBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLkpTT05SZXN1bHRzR2VuZXJhdG9y CiAKQEAgLTExOCwxMCArMTQ1LDEwIEBAIGNsYXNzIEpTT05HZW5lcmF0b3JUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgYnVpbGRpbmZvID0ganNvbltzZWxmLmJ1aWxkZXJfbmFtZV0K ICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKEpSRy5GSVhBQkxFIGluIGJ1aWxkaW5mbykKICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKEpSRy5URVNUUyBpbiBidWlsZGluZm8pCi0gICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShsZW4oYnVpbGRpbmZvW0pSRy5CVUlMRF9OVU1CRVJTXSkgPT0gbnVtX3J1bnMp Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShidWlsZGluZm9bSlJHLkJVSUxEX05VTUJFUlNdWzBd ID09IHNlbGYuYnVpbGRfbnVtYmVyKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihidWls ZGluZm9bSlJHLkJVSUxEX05VTUJFUlNdKSwgbnVtX3J1bnMpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoYnVpbGRpbmZvW0pSRy5CVUlMRF9OVU1CRVJTXVswXSwgc2VsZi5idWlsZF9udW1iZXIp CiAKLSAgICAgICAgaWYgdGVzdHNfbGlzdCBvciBza2lwcGVkX3Rlc3RzOgorICAgICAgICBpZiB0 ZXN0c19zZXQgb3IgRElTQUJMRURfdGVzdHM6CiAgICAgICAgICAgICBmaXhhYmxlID0ge30KICAg ICAgICAgICAgIGZvciBmaXhhYmxlX2l0ZW1zIGluIGJ1aWxkaW5mb1tKUkcuRklYQUJMRV06CiAg ICAgICAgICAgICAgICAgZm9yICh0eXBlLCBjb3VudCkgaW4gZml4YWJsZV9pdGVtcy5pdGVyaXRl bXMoKToKQEAgLTEzMCw1MiArMTU3LDU4IEBAIGNsYXNzIEpTT05HZW5lcmF0b3JUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICAgICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAg ICAgICAgICAgIGZpeGFibGVbdHlwZV0gPSBjb3VudAogCi0gICAgICAgICAgICBpZiBwYXNzZWRf dGVzdHM6Ci0gICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKGZpeGFibGVbSlJHLlBBU1Nf UkVTVUxUXSA9PSBsZW4ocGFzc2VkX3Rlc3RzKSkKKyAgICAgICAgICAgIGlmIFBBU1NfdGVzdHM6 CisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChmaXhhYmxlW0pSRy5QQVNTX1JFU1VM VF0sIGxlbihQQVNTX3Rlc3RzKSkKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAg c2VsZi5hc3NlcnRUcnVlKEpSRy5QQVNTX1JFU1VMVCBub3QgaW4gZml4YWJsZSBvcgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmaXhhYmxlW0pSRy5QQVNTX1JFU1VMVF0gPT0gMCkK LSAgICAgICAgICAgIGlmIHNraXBwZWRfdGVzdHM6Ci0gICAgICAgICAgICAgICAgc2VsZi5hc3Nl cnRUcnVlKGZpeGFibGVbSlJHLlNLSVBfUkVTVUxUXSA9PSBsZW4oc2tpcHBlZF90ZXN0cykpCisg ICAgICAgICAgICBpZiBESVNBQkxFRF90ZXN0czoKKyAgICAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGZpeGFibGVbSlJHLlNLSVBfUkVTVUxUXSwgbGVuKERJU0FCTEVEX3Rlc3RzKSkKICAg ICAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKEpSRy5TS0lQ X1JFU1VMVCBub3QgaW4gZml4YWJsZSBvcgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBmaXhhYmxlW0pSRy5TS0lQX1JFU1VMVF0gPT0gMCkKKyAgICAgICAgICAgIGlmIEZMQUtZX3Rl c3RzOgorICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZml4YWJsZVtKUkcuRkxBS1lf UkVTVUxUXSwgbGVuKEZMQUtZX3Rlc3RzKSkKKyAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKEpSRy5GTEFLWV9SRVNVTFQgbm90IGluIGZpeGFibGUgb3IK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZml4YWJsZVtKUkcuRkxBS1lfUkVTVUxU XSA9PSAwKQogCiAgICAgICAgIGlmIGZhaWxlZF90ZXN0czoKICAgICAgICAgICAgIHRlc3RzID0g YnVpbGRpbmZvW0pSRy5URVNUU10KLSAgICAgICAgICAgIGZvciB0ZXN0X25hbWUsIGZhaWx1cmUg aW4gZmFpbGVkX3Rlc3RzLml0ZXJpdGVtcygpOgorICAgICAgICAgICAgZm9yIHRlc3RfbmFtZSBp biBmYWlsZWRfdGVzdHM6CiAgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHRlc3RfbmFt ZSBpbiB0ZXN0cykKICAgICAgICAgICAgICAgICB0ZXN0ID0gdGVzdHNbdGVzdF9uYW1lXQogCiAg ICAgICAgICAgICAgICAgZmFpbGVkID0gMAorICAgICAgICAgICAgICAgIG1vZGlmaWVyID0gc2Vs Zi5fZ2V0X3Rlc3RfbW9kaWZpZXIodGVzdF9uYW1lKQogICAgICAgICAgICAgICAgIGZvciByZXN1 bHQgaW4gdGVzdFtKUkcuUkVTVUxUU106Ci0gICAgICAgICAgICAgICAgICAgIGlmIHJlc3VsdFsx XSA9PSBKUkcuRkFJTF9SRVNVTFQ6CisgICAgICAgICAgICAgICAgICAgIGlmIHJlc3VsdFsxXSA9 PSBtb2RpZmllcjoKICAgICAgICAgICAgICAgICAgICAgICAgIGZhaWxlZCA9IHJlc3VsdFswXQot ICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShmYWlsZWQgPT0gMSkKKyAgICAgICAgICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKDEsIGZhaWxlZCkKIAogICAgICAgICAgICAgICAgIHRpbWlu Z19jb3VudCA9IDAKICAgICAgICAgICAgICAgICBmb3IgdGltaW5ncyBpbiB0ZXN0W0pSRy5USU1F U106CiAgICAgICAgICAgICAgICAgICAgIGlmIHRpbWluZ3NbMV0gPT0gdGVzdF90aW1pbmdzW3Rl c3RfbmFtZV06CiAgICAgICAgICAgICAgICAgICAgICAgICB0aW1pbmdfY291bnQgPSB0aW1pbmdz WzBdCi0gICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHRpbWluZ19jb3VudCA9PSAxKQor ICAgICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMSwgdGltaW5nX2NvdW50KQogCi0gICAg ICAgIGZpeGFibGVfY291bnQgPSBsZW4oc2tpcHBlZF90ZXN0cykgKyBsZW4oZmFpbGVkX3Rlc3Rz LmtleXMoKSkKLSAgICAgICAgaWYgc2tpcHBlZF90ZXN0cyBvciBmYWlsZWRfdGVzdHM6Ci0gICAg ICAgICAgICBzZWxmLmFzc2VydFRydWUoc3VtKGJ1aWxkaW5mb1tKUkcuRklYQUJMRV9DT1VOVF0p ID09IGZpeGFibGVfY291bnQpCisgICAgICAgIGZpeGFibGVfY291bnQgPSBsZW4oRElTQUJMRURf dGVzdHMgfCBmYWlsZWRfdGVzdHMpCisgICAgICAgIGlmIERJU0FCTEVEX3Rlc3RzIG9yIGZhaWxl ZF90ZXN0czoKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3VtKGJ1aWxkaW5mb1tKUkcu RklYQUJMRV9DT1VOVF0pLCBmaXhhYmxlX2NvdW50KQogCiAgICAgZGVmIHRlc3RfanNvbl9nZW5l cmF0aW9uKHNlbGYpOgotICAgICAgICByZWFzb24gPSB0ZXN0X2V4cGVjdGF0aW9ucy5URVhUCi0K LSAgICAgICAgc2VsZi5fdGVzdF9qc29uX2dlbmVyYXRpb24oW10sIHt9LCBbXSkKLSAgICAgICAg c2VsZi5fdGVzdF9qc29uX2dlbmVyYXRpb24oWydBMScsICdCMSddLCB7fSwgW10pCi0gICAgICAg IHNlbGYuX3Rlc3RfanNvbl9nZW5lcmF0aW9uKFtdLCB7J0EyJzogcmVhc29uLCAnQjInOiByZWFz b259LCBbXSkKLSAgICAgICAgc2VsZi5fdGVzdF9qc29uX2dlbmVyYXRpb24oW10sIHt9LCBbJ0Ez JywgJ0IzJ10pCi0gICAgICAgIHNlbGYuX3Rlc3RfanNvbl9nZW5lcmF0aW9uKFsnQTQnXSwgeydC NCc6IHJlYXNvbiwgJ0M0JzogcmVhc29ufSwgW10pCisgICAgICAgIHNlbGYuX3Rlc3RfanNvbl9n ZW5lcmF0aW9uKFtdLCBbXSkKKyAgICAgICAgc2VsZi5fdGVzdF9qc29uX2dlbmVyYXRpb24oWydB MScsICdCMSddLCBbXSkKKyAgICAgICAgc2VsZi5fdGVzdF9qc29uX2dlbmVyYXRpb24oW10sIFsn RkFJTFNfQTInLCAnRkFJTFNfQjInXSkKKyAgICAgICAgc2VsZi5fdGVzdF9qc29uX2dlbmVyYXRp b24oWydESVNBQkxFRF9BMycsICdESVNBQkxFRF9CMyddLCBbXSkKKyAgICAgICAgc2VsZi5fdGVz dF9qc29uX2dlbmVyYXRpb24oWydBNCddLCBbJ0I0JywgJ0ZBSUxTX0M0J10pCisgICAgICAgIHNl bGYuX3Rlc3RfanNvbl9nZW5lcmF0aW9uKFsnRElTQUJMRURfQzUnLCAnRElTQUJMRURfRDUnXSwg WydBNScsICdCNSddKQogICAgICAgICBzZWxmLl90ZXN0X2pzb25fZ2VuZXJhdGlvbigKLSAgICAg ICAgICAgIFtdLCB7J0E1JzogcmVhc29uLCAnQjUnOiByZWFzb259LCBbJ0M1JywgJ0Q1J10pCisg ICAgICAgICAgICBbJ0E2JywgJ0I2JywgJ0ZBSUxTX0M2JywgJ0RJU0FCTEVEX0U2JywgJ0RJU0FC TEVEX0Y2J10sCisgICAgICAgICAgICBbJ0ZBSUxTX0Q2J10pCiAgICAgICAgIHNlbGYuX3Rlc3Rf anNvbl9nZW5lcmF0aW9uKAotICAgICAgICAgICAgWydBNicsICdCNicsICdDNiddLCB7J0Q2Jzog cmVhc29ufSwgWydFNicsICdGNiddKQotCisgICAgICAgICAgICBbJ0E3JywgJ0ZMQUtZX0I3Jywg J0RJU0FCTEVEX0M3J10sCisgICAgICAgICAgICBbJ0ZBSUxTX0Q3JywgJ0ZMQUtZX0Q4J10pCiAK IGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6CiAgICAgdW5pdHRlc3QubWFpbigpCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weQppbmRleCBmMzYwYWRjOWE2NTNjNThmMGM3ZmNjMzcxNjRlZDljMzhk OWViODQ0Li45ZmI2ODRmYTEwNzE3YWIzN2Y3MTNlMjFlNDJlM2YzMDk3MGIyZWVmIDEwMDc1NQot LS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTgwOCwxMiArODA4LDEwIEBAIGNsYXNzIFRlc3RSdW5u ZXI6CiAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfdW5leHBlY3RlZF9yZXN1bHRzKHVuZXhw ZWN0ZWRfcmVzdWx0cykKIAogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlY29yZF9yZXN1bHRz OgotICAgICAgICAgICAgIyBXcml0ZSB0aGUgc2FtZSBkYXRhIHRvIGxvZyBmaWxlcy4KLSAgICAg ICAgICAgIHNlbGYuX3dyaXRlX2pzb25fZmlsZXModW5leHBlY3RlZF9yZXN1bHRzLCByZXN1bHRf c3VtbWFyeSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kaXZpZHVhbF90 ZXN0X3RpbWluZ3MpCi0KLSAgICAgICAgICAgICMgVXBsb2FkIGdlbmVyYXRlZCBKU09OIGZpbGVz IHRvIGFwcGVuZ2luZSBzZXJ2ZXIuCi0gICAgICAgICAgICBzZWxmLl91cGxvYWRfanNvbl9maWxl cygpCisgICAgICAgICAgICAjIFdyaXRlIHRoZSBzYW1lIGRhdGEgdG8gbG9nIGZpbGVzIGFuZCB1 cGxvYWQgZ2VuZXJhdGVkIEpTT04gZmlsZXMKKyAgICAgICAgICAgICMgdG8gYXBwZW5naW5lIHNl cnZlci4KKyAgICAgICAgICAgIHNlbGYuX3VwbG9hZF9qc29uX2ZpbGVzKHVuZXhwZWN0ZWRfcmVz dWx0cywgcmVzdWx0X3N1bW1hcnksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncykKIAogICAgICAgICAjIFdyaXRlIHRoZSBzdW1tYXJ5 IHRvIGRpc2sgKHJlc3VsdHMuaHRtbCkgYW5kIGRpc3BsYXkgaXQgaWYgcmVxdWVzdGVkLgogICAg ICAgICB3cm90ZV9yZXN1bHRzID0gc2VsZi5fd3JpdGVfcmVzdWx0c19odG1sX2ZpbGUocmVzdWx0 X3N1bW1hcnkpCkBAIC04OTIsMTAgKzg5MCwxMCBAQCBjbGFzcyBUZXN0UnVubmVyOgogCiAgICAg ICAgIHJldHVybiBmYWlsZWRfcmVzdWx0cwogCi0gICAgZGVmIF93cml0ZV9qc29uX2ZpbGVzKHNl bGYsIHVuZXhwZWN0ZWRfcmVzdWx0cywgcmVzdWx0X3N1bW1hcnksCisgICAgZGVmIF91cGxvYWRf anNvbl9maWxlcyhzZWxmLCB1bmV4cGVjdGVkX3Jlc3VsdHMsIHJlc3VsdF9zdW1tYXJ5LAogICAg ICAgICAgICAgICAgICAgICAgICAgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MpOgogICAgICAgICAi IiJXcml0ZXMgdGhlIHJlc3VsdHMgb2YgdGhlIHRlc3QgcnVuIGFzIEpTT04gZmlsZXMgaW50byB0 aGUgcmVzdWx0cwotICAgICAgICBkaXIuCisgICAgICAgIGRpciBhbmQgdXBsb2FkIHRoZSBmaWxl cyB0byB0aGUgYXBwZW5naW5lIHNlcnZlci4KIAogICAgICAgICBUaGVyZSBhcmUgdGhyZWUgZGlm ZmVyZW50IGZpbGVzIHdyaXR0ZW4gaW50byB0aGUgcmVzdWx0cyBkaXI6CiAgICAgICAgICAgdW5l eHBlY3RlZF9yZXN1bHRzLmpzb246IEEgc2hvcnQgbGlzdCBvZiBhbnkgdW5leHBlY3RlZCByZXN1 bHRzLgpAQCAtOTI0LDUwICs5MjIsMjUgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgd2l0 aCBjb2RlY3Mub3BlbihleHBlY3RhdGlvbnNfcGF0aCwgInciLCAidXRmLTgiKSBhcyBmaWxlOgog ICAgICAgICAgICAgZmlsZS53cml0ZSh1IkFERF9FWFBFQ1RBVElPTlMoJXMpOyIgJSBleHBlY3Rh dGlvbnNfanNvbikKIAotICAgICAgICBqc29uX2xheW91dF9yZXN1bHRzX2dlbmVyYXRvci5KU09O TGF5b3V0UmVzdWx0c0dlbmVyYXRvcigKKyAgICAgICAgZ2VuZXJhdG9yID0ganNvbl9sYXlvdXRf cmVzdWx0c19nZW5lcmF0b3IuSlNPTkxheW91dFJlc3VsdHNHZW5lcmF0b3IoCiAgICAgICAgICAg ICBzZWxmLl9wb3J0LCBzZWxmLl9vcHRpb25zLmJ1aWxkZXJfbmFtZSwgc2VsZi5fb3B0aW9ucy5i dWlsZF9uYW1lLAogICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5idWlsZF9udW1iZXIsIHNlbGYu X29wdGlvbnMucmVzdWx0c19kaXJlY3RvcnksCiAgICAgICAgICAgICBCVUlMREVSX0JBU0VfVVJM LCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncywKICAgICAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9u cywgcmVzdWx0X3N1bW1hcnksIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCwKICAgICAgICAgICAgIG5v dCBzZWxmLl9vcHRpb25zLnVwbG9hZF9mdWxsX3Jlc3VsdHMsCi0gICAgICAgICAgICBzZWxmLl9v cHRpb25zLnRlc3RfcmVzdWx0c19zZXJ2ZXIpCisgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnRl c3RfcmVzdWx0c19zZXJ2ZXIsCisgICAgICAgICAgICAibGF5b3V0LXRlc3RzIiwKKyAgICAgICAg ICAgIHNlbGYuX29wdGlvbnMubWFzdGVyX25hbWUpCiAKICAgICAgICAgX2xvZy5kZWJ1ZygiRmlu aXNoZWQgd3JpdGluZyBKU09OIGZpbGVzLiIpCiAKLSAgICBkZWYgX3VwbG9hZF9qc29uX2ZpbGVz KHNlbGYpOgotICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy50ZXN0X3Jlc3VsdHNfc2VydmVy OgotICAgICAgICAgICAgcmV0dXJuCi0KLSAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMubWFz dGVyX25hbWU6Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCItLXRlc3QtcmVzdWx0cy1zZXJ2ZXIg d2FzIHNldCwgYnV0IC0tbWFzdGVyLW5hbWUgd2FzIG5vdC4gTm90IHVwbG9hZGluZyBKU09OIGZp bGVzLiIpCi0gICAgICAgICAgICByZXR1cm4KLQotICAgICAgICBfbG9nLmluZm8oIlVwbG9hZGlu ZyBKU09OIGZpbGVzIGZvciBidWlsZGVyOiAlcyIsCi0gICAgICAgICAgICAgICAgICAgc2VsZi5f b3B0aW9ucy5idWlsZGVyX25hbWUpCi0KLSAgICAgICAgYXR0cnMgPSBbKCJidWlsZGVyIiwgc2Vs Zi5fb3B0aW9ucy5idWlsZGVyX25hbWUpLCAoInRlc3R0eXBlIiwgImxheW91dC10ZXN0cyIpLAot ICAgICAgICAgICAgKCJtYXN0ZXIiLCBzZWxmLl9vcHRpb25zLm1hc3Rlcl9uYW1lKV0KLQogICAg ICAgICBqc29uX2ZpbGVzID0gWyJleHBlY3RhdGlvbnMuanNvbiJdCiAgICAgICAgIGlmIHNlbGYu X29wdGlvbnMudXBsb2FkX2Z1bGxfcmVzdWx0czoKICAgICAgICAgICAgIGpzb25fZmlsZXMuYXBw ZW5kKCJyZXN1bHRzLmpzb24iKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAganNvbl9maWxl cy5hcHBlbmQoImluY3JlbWVudGFsX3Jlc3VsdHMuanNvbiIpCiAKLSAgICAgICAgZmlsZXMgPSBb KGZpbGUsIG9zLnBhdGguam9pbihzZWxmLl9vcHRpb25zLnJlc3VsdHNfZGlyZWN0b3J5LCBmaWxl KSkKLSAgICAgICAgICAgIGZvciBmaWxlIGluIGpzb25fZmlsZXNdCi0KLSAgICAgICAgdXBsb2Fk ZXIgPSB0ZXN0X3Jlc3VsdHNfdXBsb2FkZXIuVGVzdFJlc3VsdHNVcGxvYWRlcigKLSAgICAgICAg ICAgIHNlbGYuX29wdGlvbnMudGVzdF9yZXN1bHRzX3NlcnZlcikKLSAgICAgICAgdHJ5OgotICAg ICAgICAgICAgIyBTZXQgdXBsb2FkaW5nIHRpbWVvdXQgaW4gY2FzZSBhcHBlbmdpbmUgc2VydmVy IGlzIGhhdmluZyBwcm9ibGVtLgotICAgICAgICAgICAgIyAxMjAgc2Vjb25kcyBhcmUgbW9yZSB0 aGFuIGVub3VnaCB0byB1cGxvYWQgdGVzdCByZXN1bHRzLgotICAgICAgICAgICAgdXBsb2FkZXIu dXBsb2FkKGF0dHJzLCBmaWxlcywgMTIwKQotICAgICAgICBleGNlcHQgRXhjZXB0aW9uLCBlcnI6 Ci0gICAgICAgICAgICBfbG9nLmVycm9yKCJVcGxvYWQgZmFpbGVkOiAlcyIgJSBlcnIpCi0gICAg ICAgICAgICByZXR1cm4KLQotICAgICAgICBfbG9nLmluZm8oIkpTT04gZmlsZXMgdXBsb2FkZWQu IikKKyAgICAgICAgZ2VuZXJhdG9yLnVwbG9hZF9qc29uX2ZpbGVzKGpzb25fZmlsZXMpCiAKICAg ICBkZWYgX3ByaW50X2NvbmZpZyhzZWxmKToKICAgICAgICAgIiIiUHJpbnRzIHRoZSBjb25maWd1 cmF0aW9uIGZvciB0aGUgdGVzdCBydW4uIiIiCg==