139427 2014-12-08 21:34:02 -0800 Remove virtual test support from webkitpy 2014-12-09 12:49:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin ap commit-queue glenn ossy oldest_to_newest 1053645 0 benjamin 2014-12-08 21:34:02 -0800 Remove virtual test support from webkitpy 1053646 1 242879 benjamin 2014-12-08 21:35:20 -0800 Created attachment 242879 Patch 1053669 2 ap 2014-12-08 23:33:01 -0800 I'm curious what virtual tests were! 1053670 3 benjamin 2014-12-08 23:34:57 -0800 (In reply to comment #2) > I'm curious what virtual tests were! From a tiny bit of git blame that seemed like a bunch of chromium tests. I don't know what was tested. 1053675 4 ap 2014-12-08 23:57:33 -0800 What made me curious was a thought about whether we could use this to split huge slow tests that frequently time out (notably jquery) into tiny virtual tests. 1053716 5 ossy 2014-12-09 02:21:00 -0800 http://www.chromium.org/developers/testing/webkit-layout-tests describes that virtual tests are to run tests with different DRT command line options. 1053821 6 242879 ap 2014-12-09 09:37:56 -0800 Comment on attachment 242879 Patch Thank you! Sounds like a good thing to remove, rs=me. 1053917 7 242879 benjamin 2014-12-09 12:49:37 -0800 Comment on attachment 242879 Patch Clearing flags on attachment: 242879 Committed r177034: <http://trac.webkit.org/changeset/177034> 1053918 8 benjamin 2014-12-09 12:49:40 -0800 All reviewed patches have been landed. Closing bug. 242879 2014-12-08 21:35:20 -0800 2014-12-09 12:49:37 -0800 Patch bug-139427-20141208213600.patch text/plain 19050 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDAzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzExZGJiMWNhMzJhMmRlNDgxZjdkMmUwODQ5YzRhYTAw OWEzNGI1NC4uMDNhZDc5ODgyNmFkNGJhMWE2NTc5NzNkZjU0NTc3NTNiZjBmODM1YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1 IEBACisyMDE0LTEyLTA4ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgor CisgICAgICAgIFJlbW92ZSB2aXJ0dWFsIHRlc3Qgc3VwcG9ydCBmcm9tIHdlYmtpdHB5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzk0MjcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCBzZWVtcyB0aGF0 IHRoZSBvbmx5IGNvbmNyZXRlIGNsaWVudCBvZiB2aXJ0dWFsIHRlc3RzIGlzIHRoZSB1bml0IHRl c3RzIDpECisKKyAgICAgICAgVGhpcyBwYXRjaCB0cmllcyB0byBjbGVhbiBhcyBtdWNoIHVzZWxl c3MgY29kZSBhcyBwb3NzaWJsZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoUnVu VGVzdC50ZXN0X3RvbGVyYW5jZSk6CisgICAgICAgIChSdW5UZXN0LnRlc3RfdmlydHVhbCk6IERl bGV0ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJp bnRpbmcucHk6CisgICAgICAgIChQcmludGVyLl9wcmludF90ZXN0X3RyYWNlKToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQuZXhwZWN0ZWRf ZmlsZW5hbWUpOgorICAgICAgICAoUG9ydC50ZXN0cyk6CisgICAgICAgIChQb3J0LnRlc3RfaXNm aWxlKToKKyAgICAgICAgKFBvcnQudGVzdF9pc2Rpcik6CisgICAgICAgIChQb3J0LnNhbXBsZV9w cm9jZXNzKToKKyAgICAgICAgKFBvcnQuZmluZF9zeXN0ZW1fcGlkKToKKyAgICAgICAgKFBvcnQu dGVzdF9leHBlY3RhdGlvbnNfZmlsZV9wb3NpdGlvbik6CisgICAgICAgIChQb3J0LnZpcnR1YWxf dGVzdF9zdWl0ZXMpOiBEZWxldGVkLgorICAgICAgICAoUG9ydCk6IERlbGV0ZWQuCisgICAgICAg IChQb3J0LnBvcHVsYXRlZF92aXJ0dWFsX3Rlc3Rfc3VpdGVzKTogRGVsZXRlZC4KKyAgICAgICAg KFBvcnQuX3ZpcnR1YWxfdGVzdHMpOiBEZWxldGVkLgorICAgICAgICAoUG9ydC5sb29rdXBfdmly dHVhbF90ZXN0X2Jhc2UpOiBEZWxldGVkLgorICAgICAgICAoUG9ydC5sb29rdXBfdmlydHVhbF90 ZXN0X2FyZ3MpOiBEZWxldGVkLgorICAgICAgICAoVmlydHVhbFRlc3RTdWl0ZSk6IERlbGV0ZWQu CisgICAgICAgIChWaXJ0dWFsVGVzdFN1aXRlLl9faW5pdF9fKTogRGVsZXRlZC4KKyAgICAgICAg KFZpcnR1YWxUZXN0U3VpdGUuX19yZXByX18pOiBEZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUG9ydFRlc3QudGVzdF90 ZXN0X2V4aXN0cyk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X3Rlc3RfaXNmaWxlKToKKyAgICAg ICAgKFBvcnRUZXN0LnRlc3RfdGVzdF9pc2Rpcik6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X3Rl c3RzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5OgorICAgICAg ICAoRHJpdmVyUHJveHkucnVuX3Rlc3QpOiBEZWxldGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC90ZXN0LnB5OgorICAgICAgICAoVGVzdFBvcnQuX3NraXBwZWRfdGVzdHNfZm9y X3Vuc3VwcG9ydGVkX2ZlYXR1cmVzKToKKyAgICAgICAgKFRlc3RQb3J0LmFsbF9iYXNlbGluZV92 YXJpYW50cyk6CisgICAgICAgIChUZXN0UG9ydC52aXJ0dWFsX3Rlc3Rfc3VpdGVzKTogRGVsZXRl ZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weToK KyAgICAgICAgKFByaW50QmFzZWxpbmVzLl9faW5pdF9fKToKKyAgICAgICAgKFByaW50QmFzZWxp bmVzLmV4ZWN1dGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9x dWVyaWVzX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUHJpbnRCYXNlbGluZXNUZXN0LnRlc3RfYmFz aWMpOgorICAgICAgICAoUHJpbnRCYXNlbGluZXNUZXN0LnRlc3RfbXVsdGlwbGUpOgorICAgICAg ICAoUHJpbnRCYXNlbGluZXNUZXN0LnRlc3RfY3N2KToKKwogMjAxNC0xMi0wOCAgVGltIEhvcnRv biAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYWN0aW9uIG1lbnUg dGVzdHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKaW5kZXgg MGUxMmFmZDNjNWMxMzJhNGE4MzRiNmNkMjI0ZjZjOGJiOGMyOWE4NS4uZjg4YzFhMjk5Y2YwM2M3 YjgyMTYwZTI5ZmY1ODAxN2Y5YWZiMTg5MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19p bnRlZ3JhdGlvbnRlc3QucHkKQEAgLTcxNiwxMCArNzE2LDYgQEAgY2xhc3MgUnVuVGVzdCh1bml0 dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToKICAgICAgICAgdGVzdF9wb3J0ID0g Z2V0X3BvcnRfZm9yX3J1bihiYXNlX2FyZ3MpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoTm9u ZSwgdGVzdF9wb3J0LnRvbGVyYW5jZV91c2VkX2Zvcl9kaWZmX2ltYWdlKQogCi0gICAgZGVmIHRl c3RfdmlydHVhbChzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBhc3NpbmdfcnVuKFsn cGFzc2VzL3RleHQuaHRtbCcsICdwYXNzZXMvYXJncy5odG1sJywKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAndmlydHVhbC9wYXNzZXMvdGV4dC5odG1sJywgJ3ZpcnR1YWwv cGFzc2VzL2FyZ3MuaHRtbCddKSkKLQogICAgIGRlZiB0ZXN0X3JlZnRlc3RfcnVuKHNlbGYpOgog ICAgICAgICB0ZXN0c19ydW4gPSBnZXRfdGVzdHNfcnVuKFsncGFzc2VzL3JlZnRlc3QuaHRtbCdd KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFsncGFzc2VzL3JlZnRlc3QuaHRtbCddLCB0ZXN0 c19ydW4pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92 aWV3cy9wcmludGluZy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3Zp ZXdzL3ByaW50aW5nLnB5CmluZGV4IDJlOWFjOTQ3NDIwN2VjNzA2ZThhMGIwYTk2OGMyNzMxYjUw ZDNkMjAuLjFjNjUyYzc1OTgwZTJlN2E5NzQ3Njk3YWY4NzRiNGJlMWQzOGY3NGQgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5n LnB5CkBAIC0zNTAsMTIgKzM1MCw2IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAg dGVzdF9uYW1lID0gcmVzdWx0LnRlc3RfbmFtZQogICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0 KHNlbGYuX3Rlc3Rfc3RhdHVzX2xpbmUodGVzdF9uYW1lLCAnJykpCiAKLSAgICAgICAgYmFzZSA9 IHNlbGYuX3BvcnQubG9va3VwX3ZpcnR1YWxfdGVzdF9iYXNlKHRlc3RfbmFtZSkKLSAgICAgICAg aWYgYmFzZToKLSAgICAgICAgICAgIGFyZ3MgPSAnICcuam9pbihzZWxmLl9wb3J0Lmxvb2t1cF92 aXJ0dWFsX3Rlc3RfYXJncyh0ZXN0X25hbWUpKQotICAgICAgICAgICAgc2VsZi5fcHJpbnRfZGVm YXVsdCgnIGJhc2U6ICVzJyAlIGJhc2UpCi0gICAgICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0 KCcgYXJnczogJXMnICUgYXJncykKLQogICAgICAgICBmb3IgZXh0ZW5zaW9uIGluICgnLnR4dCcs ICcucG5nJywgJy53YXYnLCAnLndlYmFyY2hpdmUnKToKICAgICAgICAgICAgIHNlbGYuX3ByaW50 X2Jhc2VsaW5lKHRlc3RfbmFtZSwgZXh0ZW5zaW9uKQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9i YXNlLnB5CmluZGV4IGVlNDE0MmMyNDUxZGEzNjViMTI3MTBlZGE2YTc4OTZmMjdhMmQ3NGYuLjg0 MmNhZjQ0MmUxODViODdiYmNmYjllNzg3YmM0YmE4NzkzZjRmZGUgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9iYXNlLnB5CkBAIC00MjYsMTAgKzQyNiw2IEBAIGNsYXNzIFBvcnQob2JqZWN0KToK ICAgICAgICAgaWYgcGxhdGZvcm1fZGlyOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVz eXN0ZW0uam9pbihwbGF0Zm9ybV9kaXIsIGJhc2VsaW5lX2ZpbGVuYW1lKQogCi0gICAgICAgIGFj dHVhbF90ZXN0X25hbWUgPSBzZWxmLmxvb2t1cF92aXJ0dWFsX3Rlc3RfYmFzZSh0ZXN0X25hbWUp Ci0gICAgICAgIGlmIGFjdHVhbF90ZXN0X25hbWU6Ci0gICAgICAgICAgICByZXR1cm4gc2VsZi5l eHBlY3RlZF9maWxlbmFtZShhY3R1YWxfdGVzdF9uYW1lLCBzdWZmaXgpCi0KICAgICAgICAgaWYg cmV0dXJuX2RlZmF1bHQ6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5qb2lu KHNlbGYubGF5b3V0X3Rlc3RzX2RpcigpLCBiYXNlbGluZV9maWxlbmFtZSkKICAgICAgICAgcmV0 dXJuIE5vbmUKQEAgLTUxNiw5ICs1MTIsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgZGVm IHRlc3RzKHNlbGYsIHBhdGhzKToKICAgICAgICAgIiIiUmV0dXJuIHRoZSBsaXN0IG9mIHRlc3Rz IGZvdW5kLiBCb3RoIGdlbmVyaWMgYW5kIHBsYXRmb3JtLXNwZWNpZmljIHRlc3RzIG1hdGNoaW5n IHBhdGhzIHNob3VsZCBiZSByZXR1cm5lZC4iIiIKICAgICAgICAgZXhwYW5kZWRfcGF0aHMgPSBz ZWxmLl9leHBhbmRlZF9wYXRocyhwYXRocykKLSAgICAgICAgdGVzdHMgPSBzZWxmLl9yZWFsX3Rl c3RzKGV4cGFuZGVkX3BhdGhzKQotICAgICAgICB0ZXN0cy5leHRlbmQoc2VsZi5fdmlydHVhbF90 ZXN0cyhleHBhbmRlZF9wYXRocywgc2VsZi5wb3B1bGF0ZWRfdmlydHVhbF90ZXN0X3N1aXRlcygp KSkKLSAgICAgICAgcmV0dXJuIHRlc3RzCisgICAgICAgIHJldHVybiBzZWxmLl9yZWFsX3Rlc3Rz KGV4cGFuZGVkX3BhdGhzKQogCiAgICAgZGVmIF9leHBhbmRlZF9wYXRocyhzZWxmLCBwYXRocyk6 CiAgICAgICAgIGV4cGFuZGVkX3BhdGhzID0gW10KQEAgLTYwMSwxOSArNTk1LDEzIEBAIGNsYXNz IFBvcnQob2JqZWN0KToKICAgICBkZWYgdGVzdF9pc2ZpbGUoc2VsZiwgdGVzdF9uYW1lKToKICAg ICAgICAgIiIiUmV0dXJuIFRydWUgaWYgdGhlIHRlc3QgbmFtZSByZWZlcnMgdG8gYSBkaXJlY3Rv cnkgb2YgdGVzdHMuIiIiCiAgICAgICAgICMgVXNlZCBieSB0ZXN0X2V4cGVjdGF0aW9ucy5weSB0 byBhcHBseSBydWxlcyB0byB3aG9sZSBkaXJlY3Rvcmllcy4KLSAgICAgICAgaWYgc2VsZi5fZmls ZXN5c3RlbS5pc2ZpbGUoc2VsZi5hYnNwYXRoX2Zvcl90ZXN0KHRlc3RfbmFtZSkpOgotICAgICAg ICAgICAgcmV0dXJuIFRydWUKLSAgICAgICAgYmFzZSA9IHNlbGYubG9va3VwX3ZpcnR1YWxfdGVz dF9iYXNlKHRlc3RfbmFtZSkKLSAgICAgICAgcmV0dXJuIGJhc2UgYW5kIHNlbGYuX2ZpbGVzeXN0 ZW0uaXNmaWxlKHNlbGYuYWJzcGF0aF9mb3JfdGVzdChiYXNlKSkKKyAgICAgICAgcmV0dXJuIHNl bGYuX2ZpbGVzeXN0ZW0uaXNmaWxlKHNlbGYuYWJzcGF0aF9mb3JfdGVzdCh0ZXN0X25hbWUpKQog CiAgICAgQG1lbW9pemVkCiAgICAgZGVmIHRlc3RfaXNkaXIoc2VsZiwgdGVzdF9uYW1lKToKICAg ICAgICAgIiIiUmV0dXJuIFRydWUgaWYgdGhlIHRlc3QgbmFtZSByZWZlcnMgdG8gYSBkaXJlY3Rv cnkgb2YgdGVzdHMuIiIiCiAgICAgICAgICMgVXNlZCBieSB0ZXN0X2V4cGVjdGF0aW9ucy5weSB0 byBhcHBseSBydWxlcyB0byB3aG9sZSBkaXJlY3Rvcmllcy4KLSAgICAgICAgaWYgc2VsZi5fZmls ZXN5c3RlbS5pc2RpcihzZWxmLmFic3BhdGhfZm9yX3Rlc3QodGVzdF9uYW1lKSk6Ci0gICAgICAg ICAgICByZXR1cm4gVHJ1ZQotICAgICAgICBiYXNlID0gc2VsZi5sb29rdXBfdmlydHVhbF90ZXN0 X2Jhc2UodGVzdF9uYW1lKQotICAgICAgICByZXR1cm4gYmFzZSBhbmQgc2VsZi5fZmlsZXN5c3Rl bS5pc2RpcihzZWxmLmFic3BhdGhfZm9yX3Rlc3QoYmFzZSkpCisgICAgICAgIHJldHVybiBzZWxm Ll9maWxlc3lzdGVtLmlzZGlyKHNlbGYuYWJzcGF0aF9mb3JfdGVzdCh0ZXN0X25hbWUpKQogCiAg ICAgQG1lbW9pemVkCiAgICAgZGVmIHRlc3RfZXhpc3RzKHNlbGYsIHRlc3RfbmFtZSk6CkBAIC0x MjA0LDUyICsxMTkyLDEwIEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICBkZWYgc2FtcGxlX3By b2Nlc3Moc2VsZiwgbmFtZSwgcGlkKToKICAgICAgICAgcGFzcwogCi0gICAgZGVmIHZpcnR1YWxf dGVzdF9zdWl0ZXMoc2VsZik6Ci0gICAgICAgIHJldHVybiBbXQotCiAgICAgZGVmIGZpbmRfc3lz dGVtX3BpZChzZWxmLCBuYW1lLCBwaWQpOgogICAgICAgICAjIFRoaXMgaXMgb25seSBvdmVycmlk ZGVuIG9uIFdpbmRvd3MKICAgICAgICAgcmV0dXJuIHBpZAogCi0gICAgQG1lbW9pemVkCi0gICAg ZGVmIHBvcHVsYXRlZF92aXJ0dWFsX3Rlc3Rfc3VpdGVzKHNlbGYpOgotICAgICAgICBzdWl0ZXMg PSBzZWxmLnZpcnR1YWxfdGVzdF9zdWl0ZXMoKQotCi0gICAgICAgICMgU2FuaXR5LWNoZWNrIHRo ZSBzdWl0ZXMgdG8gbWFrZSBzdXJlIHRoZXkgZG9uJ3QgcG9pbnQgdG8gb3RoZXIgc3VpdGVzLgot ICAgICAgICBzdWl0ZV9kaXJzID0gW3N1aXRlLm5hbWUgZm9yIHN1aXRlIGluIHN1aXRlc10KLSAg ICAgICAgZm9yIHN1aXRlIGluIHN1aXRlczoKLSAgICAgICAgICAgIGFzc2VydCBzdWl0ZS5iYXNl IG5vdCBpbiBzdWl0ZV9kaXJzCi0KLSAgICAgICAgZm9yIHN1aXRlIGluIHN1aXRlczoKLSAgICAg ICAgICAgIGJhc2VfdGVzdHMgPSBzZWxmLl9yZWFsX3Rlc3RzKFtzdWl0ZS5iYXNlXSkKLSAgICAg ICAgICAgIHN1aXRlLnRlc3RzID0ge30KLSAgICAgICAgICAgIGZvciB0ZXN0IGluIGJhc2VfdGVz dHM6Ci0gICAgICAgICAgICAgICAgc3VpdGUudGVzdHNbdGVzdC5yZXBsYWNlKHN1aXRlLmJhc2Us IHN1aXRlLm5hbWUsIDEpXSA9IHRlc3QKLSAgICAgICAgcmV0dXJuIHN1aXRlcwotCi0gICAgZGVm IF92aXJ0dWFsX3Rlc3RzKHNlbGYsIHBhdGhzLCBzdWl0ZXMpOgotICAgICAgICB2aXJ0dWFsX3Rl c3RzID0gbGlzdCgpCi0gICAgICAgIGZvciBzdWl0ZSBpbiBzdWl0ZXM6Ci0gICAgICAgICAgICBp ZiBwYXRoczoKLSAgICAgICAgICAgICAgICBmb3IgdGVzdCBpbiBzdWl0ZS50ZXN0czoKLSAgICAg ICAgICAgICAgICAgICAgaWYgYW55KHRlc3Quc3RhcnRzd2l0aChwKSBmb3IgcCBpbiBwYXRocyk6 Ci0gICAgICAgICAgICAgICAgICAgICAgICB2aXJ0dWFsX3Rlc3RzLmFwcGVuZCh0ZXN0KQotICAg ICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICB2aXJ0dWFsX3Rlc3RzLmV4dGVuZChzdWl0 ZS50ZXN0cy5rZXlzKCkpCi0gICAgICAgIHJldHVybiB2aXJ0dWFsX3Rlc3RzCi0KLSAgICBkZWYg bG9va3VwX3ZpcnR1YWxfdGVzdF9iYXNlKHNlbGYsIHRlc3RfbmFtZSk6Ci0gICAgICAgIGZvciBz dWl0ZSBpbiBzZWxmLnBvcHVsYXRlZF92aXJ0dWFsX3Rlc3Rfc3VpdGVzKCk6Ci0gICAgICAgICAg ICBpZiB0ZXN0X25hbWUuc3RhcnRzd2l0aChzdWl0ZS5uYW1lKToKLSAgICAgICAgICAgICAgICBy ZXR1cm4gdGVzdF9uYW1lLnJlcGxhY2Uoc3VpdGUubmFtZSwgc3VpdGUuYmFzZSwgMSkKLSAgICAg ICAgcmV0dXJuIE5vbmUKLQotICAgIGRlZiBsb29rdXBfdmlydHVhbF90ZXN0X2FyZ3Moc2VsZiwg dGVzdF9uYW1lKToKLSAgICAgICAgZm9yIHN1aXRlIGluIHNlbGYucG9wdWxhdGVkX3ZpcnR1YWxf dGVzdF9zdWl0ZXMoKToKLSAgICAgICAgICAgIGlmIHRlc3RfbmFtZS5zdGFydHN3aXRoKHN1aXRl Lm5hbWUpOgotICAgICAgICAgICAgICAgIHJldHVybiBzdWl0ZS5hcmdzCi0gICAgICAgIHJldHVy biBbXQotCiAgICAgZGVmIHNob3VsZF9ydW5fYXNfcGl4ZWxfdGVzdChzZWxmLCB0ZXN0X2lucHV0 KToKICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMucGl4ZWxfdGVzdHM6CiAgICAgICAgICAg ICByZXR1cm4gRmFsc2UKQEAgLTE0MDIsMTMgKzEzNDgsMyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6 CiAgICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVfcG9zaXRpb24oc2VsZik6CiAgICAgICAg ICMgQnkgZGVmYXVsdCBiYXNlbGluZSBzZWFyY2ggcGF0aCBzY2hlbWEgaXMgaS5lLiBwb3J0LXdr MiAtPiB3azIgLT4gcG9ydCAtPiBnZW5lcmljLCBzbyBwb3J0IGV4cGVjdGF0aW9ucyBmaWxlIGlz IGF0IHNlY29uZCB0byBsYXN0IHBvc2l0aW9uLgogICAgICAgICByZXR1cm4gMQotCi1jbGFzcyBW aXJ0dWFsVGVzdFN1aXRlKG9iamVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIG5hbWUsIGJh c2UsIGFyZ3MsIHRlc3RzPU5vbmUpOgotICAgICAgICBzZWxmLm5hbWUgPSBuYW1lCi0gICAgICAg IHNlbGYuYmFzZSA9IGJhc2UKLSAgICAgICAgc2VsZi5hcmdzID0gYXJncwotICAgICAgICBzZWxm LnRlc3RzID0gdGVzdHMgb3Igc2V0KCkKLQotICAgIGRlZiBfX3JlcHJfXyhzZWxmKToKLSAgICAg ICAgcmV0dXJuICJWaXJ0dWFsVGVzdFN1aXRlKCclcycsICclcycsICVzKSIgJSAoc2VsZi5uYW1l LCBzZWxmLmJhc2UsIHNlbGYuYXJncykKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9iYXNlX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jh c2VfdW5pdHRlc3QucHkKaW5kZXggNjVlODczN2I4ZjBiZmVkMzMwOWQ2NDE3YTY3ZGVhMjUyNGE5 YjEyZC4uNmY3YWIzZjdkYjkxMmEwZTdjM2E1MmFkZWU2OTcyYjE5Y2I3NmIxMiAxMDA3NTUKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2VfdW5pdHRlc3QucHkKQEAgLTM1MCwyMCArMzUw LDEyIEBAIGNsYXNzIFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5h c3NlcnRUcnVlKHBvcnQudGVzdF9leGlzdHMoJ3Bhc3Nlcy90ZXh0Lmh0bWwnKSkKICAgICAgICAg c2VsZi5hc3NlcnRGYWxzZShwb3J0LnRlc3RfZXhpc3RzKCdwYXNzZXMvZG9lc19ub3RfZXhpc3Qu aHRtbCcpKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LnRlc3RfZXhpc3RzKCd2aXJ0 dWFsJykpCi0gICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocG9ydC50ZXN0X2V4aXN0cygndmlydHVh bC9kb2VzX25vdF9leGlzdC5odG1sJykpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0LnRl c3RfZXhpc3RzKCd2aXJ0dWFsL3Bhc3Nlcy90ZXh0Lmh0bWwnKSkKLQogICAgIGRlZiB0ZXN0X3Rl c3RfaXNmaWxlKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQod2l0aF90ZXN0 cz1UcnVlKQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHBvcnQudGVzdF9pc2ZpbGUoJ3Bhc3Nl cycpKQogICAgICAgICBzZWxmLmFzc2VydFRydWUocG9ydC50ZXN0X2lzZmlsZSgncGFzc2VzL3Rl eHQuaHRtbCcpKQogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHBvcnQudGVzdF9pc2ZpbGUoJ3Bh c3Nlcy9kb2VzX25vdF9leGlzdC5odG1sJykpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShw b3J0LnRlc3RfaXNmaWxlKCd2aXJ0dWFsJykpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0 LnRlc3RfaXNmaWxlKCd2aXJ0dWFsL3Bhc3Nlcy90ZXh0Lmh0bWwnKSkKLSAgICAgICAgc2VsZi5h c3NlcnRGYWxzZShwb3J0LnRlc3RfaXNmaWxlKCd2aXJ0dWFsL2RvZXNfbm90X2V4aXN0Lmh0bWwn KSkKLQogICAgIGRlZiB0ZXN0X3Rlc3RfaXNkaXIoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxm Lm1ha2VfcG9ydCh3aXRoX3Rlc3RzPVRydWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwb3J0 LnRlc3RfaXNkaXIoJ3Bhc3NlcycpKQpAQCAtMzcxLDI4ICszNjMsMTMgQEAgY2xhc3MgUG9ydFRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEZhbHNlKHBvcnQudGVz dF9pc2RpcigncGFzc2VzL2RvZXNfbm90X2V4aXN0Lmh0bWwnKSkKICAgICAgICAgc2VsZi5hc3Nl cnRGYWxzZShwb3J0LnRlc3RfaXNkaXIoJ3Bhc3Nlcy9kb2VzX25vdF9leGlzdC8nKSkKIAotICAg ICAgICBzZWxmLmFzc2VydFRydWUocG9ydC50ZXN0X2lzZGlyKCd2aXJ0dWFsJykpCi0gICAgICAg IHNlbGYuYXNzZXJ0RmFsc2UocG9ydC50ZXN0X2lzZGlyKCd2aXJ0dWFsL2RvZXNfbm90X2V4aXN0 Lmh0bWwnKSkKLSAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwb3J0LnRlc3RfaXNkaXIoJ3ZpcnR1 YWwvZG9lc19ub3RfZXhpc3QvJykpCi0gICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocG9ydC50ZXN0 X2lzZGlyKCd2aXJ0dWFsL3Bhc3Nlcy90ZXh0Lmh0bWwnKSkKLQogICAgIGRlZiB0ZXN0X3Rlc3Rz KHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQod2l0aF90ZXN0cz1UcnVlKQog ICAgICAgICB0ZXN0cyA9IHBvcnQudGVzdHMoW10pCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ3Bh c3Nlcy90ZXh0Lmh0bWwnLCB0ZXN0cykKLSAgICAgICAgc2VsZi5hc3NlcnRJbigndmlydHVhbC9w YXNzZXMvdGV4dC5odG1sJywgdGVzdHMpCiAKICAgICAgICAgdGVzdHMgPSBwb3J0LnRlc3RzKFsn cGFzc2VzJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0SW4oJ3Bhc3Nlcy90ZXh0Lmh0bWwnLCB0ZXN0 cykKLSAgICAgICAgc2VsZi5hc3NlcnRJbigncGFzc2VzL3Bhc3Nlcy90ZXN0LXZpcnR1YWwtcGFz c2VzLmh0bWwnLCB0ZXN0cykKLSAgICAgICAgc2VsZi5hc3NlcnROb3RJbigndmlydHVhbC9wYXNz ZXMvdGV4dC5odG1sJywgdGVzdHMpCi0KLSAgICAgICAgdGVzdHMgPSBwb3J0LnRlc3RzKFsndmly dHVhbC9wYXNzZXMnXSkKLSAgICAgICAgc2VsZi5hc3NlcnROb3RJbigncGFzc2VzL3RleHQuaHRt bCcsIHRlc3RzKQotICAgICAgICBzZWxmLmFzc2VydEluKCd2aXJ0dWFsL3Bhc3Nlcy90ZXN0LXZp cnR1YWwtcGFzc2VzLmh0bWwnLCB0ZXN0cykKLSAgICAgICAgc2VsZi5hc3NlcnRJbigndmlydHVh bC9wYXNzZXMvcGFzc2VzL3Rlc3QtdmlydHVhbC1wYXNzZXMuaHRtbCcsIHRlc3RzKQotICAgICAg ICBzZWxmLmFzc2VydE5vdEluKCd2aXJ0dWFsL3Bhc3Nlcy90ZXN0LXZpcnR1YWwtdmlydHVhbC9w YXNzZXMuaHRtbCcsIHRlc3RzKQotICAgICAgICBzZWxmLmFzc2VydE5vdEluKCd2aXJ0dWFsL3Bh c3Nlcy92aXJ0dWFsL3Bhc3Nlcy90ZXN0LXZpcnR1YWwtcGFzc2VzLmh0bWwnLCB0ZXN0cykKIAog ICAgIGRlZiB0ZXN0X2J1aWxkX3BhdGgoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2Vf cG9ydChvcHRpb25zPW9wdHBhcnNlLlZhbHVlcyh7J2J1aWxkX2RpcmVjdG9yeSc6ICcvbXktYnVp bGQtZGlyZWN0b3J5Lyd9KSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZHJpdmVyLnB5CmluZGV4 IDg0MjI0MzNlYjJmYTM5NzIxOWZmZWM3MjU0M2NkZGYyZWFjYTkyZGIuLjgxYTQ3OGRhMGU5YzE0 M2VlYzFmMTQ4MTI1ZTY3Y2NjZWU5MDI0YTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kcml2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Ry aXZlci5weQpAQCAtNTczLDEzICs1NzMsNiBAQCBjbGFzcyBEcml2ZXJQcm94eShvYmplY3QpOgog ICAgICAgICByZXR1cm4gc2VsZi5fZHJpdmVyLnVyaV90b190ZXN0KHVyaSkKIAogICAgIGRlZiBy dW5fdGVzdChzZWxmLCBkcml2ZXJfaW5wdXQsIHN0b3Bfd2hlbl9kb25lKToKLSAgICAgICAgYmFz ZSA9IHNlbGYuX3BvcnQubG9va3VwX3ZpcnR1YWxfdGVzdF9iYXNlKGRyaXZlcl9pbnB1dC50ZXN0 X25hbWUpCi0gICAgICAgIGlmIGJhc2U6Ci0gICAgICAgICAgICB2aXJ0dWFsX2RyaXZlcl9pbnB1 dCA9IGNvcHkuY29weShkcml2ZXJfaW5wdXQpCi0gICAgICAgICAgICB2aXJ0dWFsX2RyaXZlcl9p bnB1dC50ZXN0X25hbWUgPSBiYXNlCi0gICAgICAgICAgICB2aXJ0dWFsX2RyaXZlcl9pbnB1dC5h cmdzID0gc2VsZi5fcG9ydC5sb29rdXBfdmlydHVhbF90ZXN0X2FyZ3MoZHJpdmVyX2lucHV0LnRl c3RfbmFtZSkKLSAgICAgICAgICAgIHJldHVybiBzZWxmLnJ1bl90ZXN0KHZpcnR1YWxfZHJpdmVy X2lucHV0LCBzdG9wX3doZW5fZG9uZSkKLQogICAgICAgICBwaXhlbF90ZXN0c19uZWVkZWQgPSBk cml2ZXJfaW5wdXQuc2hvdWxkX3J1bl9waXhlbF90ZXN0CiAgICAgICAgIGNtZF9saW5lX2tleSA9 IHNlbGYuX2NtZF9saW5lX2FzX2tleShwaXhlbF90ZXN0c19uZWVkZWQsIGRyaXZlcl9pbnB1dC5h cmdzKQogICAgICAgICBpZiBjbWRfbGluZV9rZXkgIT0gc2VsZi5fZHJpdmVyX2NtZF9saW5lOgpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3Rlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L3BvcnQvdGVzdC5weQppbmRleCAxMDVmZDZmYWQ3MTAwZmU1NjEwYjNm ZjczZDhjNDFmYTRjYjY2NzRiLi4yZTIyZDc1ZmM1NDJjOWIxOWUwNDQ1YjYyYjhhNjIyNDg2NDYz ZTM1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvdGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvdGVzdC5weQpAQCAtMzEsNyArMzEsNiBAQCBp bXBvcnQgc3lzCiBpbXBvcnQgdGltZQogCiBmcm9tIHdlYmtpdHB5LnBvcnQgaW1wb3J0IFBvcnQs IERyaXZlciwgRHJpdmVyT3V0cHV0Ci1mcm9tIHdlYmtpdHB5LnBvcnQuYmFzZSBpbXBvcnQgVmly dHVhbFRlc3RTdWl0ZQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfY29u ZmlndXJhdGlvbiBpbXBvcnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20gd2Via2l0cHkuY29tbW9u LnN5c3RlbS5maWxlc3lzdGVtX21vY2sgaW1wb3J0IE1vY2tGaWxlU3lzdGVtCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uY3Jhc2hsb2dzIGltcG9ydCBDcmFzaExvZ3MKQEAgLTEwMCw3ICs5 OSw3IEBAIGNsYXNzIFRlc3RMaXN0KG9iamVjdCk6CiAjCiAjIFRoZXNlIG51bWJlcnMgbWF5IG5l ZWQgdG8gYmUgdXBkYXRlZCB3aGVuZXZlciB3ZSBhZGQgb3IgZGVsZXRlIHRlc3RzLgogIwotVE9U QUxfVEVTVFMgPSAxMDcKK1RPVEFMX1RFU1RTID0gNzEKIFRPVEFMX1NLSVBTID0gMjgKIFRPVEFM X1JFVFJJRVMgPSAxNAogCkBAIC0yNTQsMTEgKzI1Myw2IEBAIGxheWVyIGF0ICgwLDApIHNpemUg ODAweDM0CiAgICAgICAgIGFjdHVhbF9pbWFnZT0naW1hZ2Vfbm90X2luX3BpeGVsZGlyLXBuZ3RF WHRjaGVja3N1bVx4MDBjaGVja3N1bV9mYWlsJywKICAgICAgICAgZXhwZWN0ZWRfaW1hZ2U9J2lt YWdlX25vdF9pbl9waXhlbGRpci1wbmd0RVh0Y2hlY2tzdW1ceDAwY2hlY2tzdW0tcG5nJykKIAot ICAgICMgRm9yIHRlc3RpbmcgdGhhdCB2aXJ0dWFsIHRlc3Qgc3VpdGVzIGRvbid0IGV4cGFuZCBu YW1lcyBjb250YWluaW5nIHRoZW1zZWx2ZXMKLSAgICAjIFNlZSB3ZWJraXQub3JnL2IvOTc5MjUg YW5kIGJhc2VfdW5pdHRlc3QuUG9ydFRlc3QudGVzdF90ZXN0cygpLgotICAgIHRlc3RzLmFkZCgn cGFzc2VzL3Rlc3QtdmlydHVhbC1wYXNzZXMuaHRtbCcpCi0gICAgdGVzdHMuYWRkKCdwYXNzZXMv cGFzc2VzL3Rlc3QtdmlydHVhbC1wYXNzZXMuaHRtbCcpCi0KICAgICByZXR1cm4gdGVzdHMKIAog CkBAIC0zNDMsNyArMzM3LDYgQEAgQnVnKHRlc3QpIHBhc3Nlcy9za2lwcGVkL3NraXAuaHRtbCBb IFNraXAgXQogICAgICAgICBhZGRfZmlsZSh0ZXN0LCAnLWV4cGVjdGVkLnR4dCcsIHRlc3QuZXhw ZWN0ZWRfdGV4dCkKICAgICAgICAgYWRkX2ZpbGUodGVzdCwgJy1leHBlY3RlZC5wbmcnLCB0ZXN0 LmV4cGVjdGVkX2ltYWdlKQogCi0gICAgZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUoZmlsZXN5 c3RlbS5qb2luKExBWU9VVF9URVNUX0RJUiwgJ3ZpcnR1YWwnLCAncGFzc2VzJywgJ2FyZ3MtZXhw ZWN0ZWQudHh0JyksICdhcmdzLXR4dCAtLXZpcnR1YWwtYXJnJykKICAgICAjIENsZWFyIHRoZSBs aXN0IG9mIHdyaXR0ZW4gZmlsZXMgc28gdGhhdCB3ZSBjYW4gd2F0Y2ggd2hhdCBoYXBwZW5zIGR1 cmluZyB0ZXN0aW5nLgogICAgIGZpbGVzeXN0ZW0uY2xlYXJfd3JpdHRlbl9maWxlcygpCiAKQEAg LTQ0NSw4ICs0MzgsNyBAQCBjbGFzcyBUZXN0UG9ydChQb3J0KToKIAogICAgIGRlZiBfc2tpcHBl ZF90ZXN0c19mb3JfdW5zdXBwb3J0ZWRfZmVhdHVyZXMoc2VsZiwgdGVzdF9saXN0KToKICAgICAg ICAgcmV0dXJuIHNldChbJ2ZhaWx1cmVzL2V4cGVjdGVkL3NraXBfdGV4dC5odG1sJywKLSAgICAg ICAgICAgICAgICAgICAgJ2ZhaWx1cmVzL3VuZXhwZWN0ZWQvc2tpcF9wYXNzLmh0bWwnLAotICAg ICAgICAgICAgICAgICAgICAndmlydHVhbC9za2lwcGVkJ10pCisgICAgICAgICAgICAgICAgICAg ICdmYWlsdXJlcy91bmV4cGVjdGVkL3NraXBfcGFzcy5odG1sJ10pCiAKICAgICBkZWYgbmFtZShz ZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX25hbWUKQEAgLTUzMSwxMyArNTIzLDYgQEAgY2xh c3MgVGVzdFBvcnQoUG9ydCk6CiAgICAgZGVmIGFsbF9iYXNlbGluZV92YXJpYW50cyhzZWxmKToK ICAgICAgICAgcmV0dXJuIHNlbGYuQUxMX0JBU0VMSU5FX1ZBUklBTlRTCiAKLSAgICBkZWYgdmly dHVhbF90ZXN0X3N1aXRlcyhzZWxmKToKLSAgICAgICAgcmV0dXJuIFsKLSAgICAgICAgICAgIFZp cnR1YWxUZXN0U3VpdGUoJ3ZpcnR1YWwvcGFzc2VzJywgJ3Bhc3NlcycsIFsnLS12aXJ0dWFsLWFy ZyddKSwKLSAgICAgICAgICAgIFZpcnR1YWxUZXN0U3VpdGUoJ3ZpcnR1YWwvc2tpcHBlZCcsICdm YWlsdXJlcy9leHBlY3RlZCcsIFsnLS12aXJ0dWFsLWFyZzInXSksCi0gICAgICAgIF0KLQotCiBj bGFzcyBUZXN0RHJpdmVyKERyaXZlcik6CiAgICAgIiIiVGVzdC9EdW1teSBpbXBsZW1lbnRhdGlv biBvZiB0aGUgRHVtcFJlbmRlclRyZWUgaW50ZXJmYWNlLiIiIgogICAgIG5leHRfcGlkID0gMQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3F1ZXJpZXMu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQppbmRl eCBiZWVlYmRkN2Y4OGE0MDJlYmFkMjIwMGZhN2ZmNGNhYjg2ZDJkZjMyLi41NTdhNTI2ZmQwMWQ4 ZTZkYjczMDkyMWQ0OWZhZDU5YWY5MWVmNzA1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllcy5weQpAQCAtNTM5LDggKzUzOSw2IEBAIGNsYXNzIFBy aW50QmFzZWxpbmVzKENvbW1hbmQpOgogICAgICAgICAgICAgICAgICAgICAgICAgaGVscD0nZGlz cGxheSB0aGUgYmFzZWxpbmVzIGZvciAqYWxsKiB0ZXN0cycpLAogICAgICAgICAgICAgbWFrZV9v cHRpb24oJy0tY3N2JywgYWN0aW9uPSdzdG9yZV90cnVlJywgZGVmYXVsdD1GYWxzZSwKICAgICAg ICAgICAgICAgICAgICAgICAgIGhlbHA9J1ByaW50IGEgQ1NWLXN0eWxlIHJlcG9ydCB0aGF0IGlu Y2x1ZGVzIHRoZSBwb3J0IG5hbWUsIHRlc3RfbmFtZSwgdGVzdCBwbGF0Zm9ybSwgYmFzZWxpbmUg dHlwZSwgYmFzZWxpbmUgbG9jYXRpb24sIGFuZCBiYXNlbGluZSBwbGF0Zm9ybScpLAotICAgICAg ICAgICAgbWFrZV9vcHRpb24oJy0taW5jbHVkZS12aXJ0dWFsLXRlc3RzJywgYWN0aW9uPSdzdG9y ZV90cnVlJywKLSAgICAgICAgICAgICAgICAgICAgICAgIGhlbHA9J0luY2x1ZGUgdmlydHVhbCB0 ZXN0cycpLAogICAgICAgICBdICsgcGxhdGZvcm1fb3B0aW9ucyh1c2VfZ2xvYnM9VHJ1ZSkKICAg ICAgICAgQ29tbWFuZC5fX2luaXRfXyhzZWxmLCBvcHRpb25zPW9wdGlvbnMpCiAgICAgICAgIHNl bGYuX3BsYXRmb3JtX3JlZ2V4cCA9IHJlLmNvbXBpbGUoJ3BsYXRmb3JtLyhbXlwvXSspLyguKykn KQpAQCAtNTU4LDExICs1NTYsOCBAQCBjbGFzcyBQcmludEJhc2VsaW5lcyhDb21tYW5kKToKICAg ICAgICAgZWxzZToKICAgICAgICAgICAgIHBvcnRfbmFtZXMgPSBbZGVmYXVsdF9wb3J0Lm5hbWUo KV0KIAotICAgICAgICBpZiBvcHRpb25zLmluY2x1ZGVfdmlydHVhbF90ZXN0czoKLSAgICAgICAg ICAgIHRlc3RzID0gc29ydGVkKGRlZmF1bHRfcG9ydC50ZXN0cyhhcmdzKSkKLSAgICAgICAgZWxz ZToKLSAgICAgICAgICAgICMgRklYTUU6IG1ha2UgcmVhbF90ZXN0cygpIGEgcHVibGljIG1ldGhv ZC4KLSAgICAgICAgICAgIHRlc3RzID0gc29ydGVkKGRlZmF1bHRfcG9ydC5fcmVhbF90ZXN0cyhh cmdzKSkKKyAgICAgICAgIyBGSVhNRTogbWFrZSByZWFsX3Rlc3RzKCkgYSBwdWJsaWMgbWV0aG9k LgorICAgICAgICB0ZXN0cyA9IHNvcnRlZChkZWZhdWx0X3BvcnQuX3JlYWxfdGVzdHMoYXJncykp CiAKICAgICAgICAgZm9yIHBvcnRfbmFtZSBpbiBwb3J0X25hbWVzOgogICAgICAgICAgICAgaWYg cG9ydF9uYW1lICE9IHBvcnRfbmFtZXNbMF06CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rvb2wvY29tbWFuZHMvcXVlcmllc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9jb21tYW5kcy9xdWVyaWVzX3VuaXR0ZXN0LnB5CmluZGV4IDEzOGMxZWY5 YjAwNjIwYTE2ZjliNmRkZjM4NDdhOTM3NzVjNTU0OTYuLjZhZTAxMDAzOWIxZTU4ZDUyMzAyMTBh MzdmMmRiNzYwODhiZWEzZGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9v bC9jb21tYW5kcy9xdWVyaWVzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvdG9vbC9jb21tYW5kcy9xdWVyaWVzX3VuaXR0ZXN0LnB5CkBAIC0yNjIsNyArMjYyLDcgQEAg Y2xhc3MgUHJpbnRCYXNlbGluZXNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgY29t bWFuZCA9IFByaW50QmFzZWxpbmVzKCkKICAgICAgICAgY29tbWFuZC5iaW5kX3RvX3Rvb2woc2Vs Zi50b29sKQogICAgICAgICBzZWxmLmNhcHR1cmVfb3V0cHV0KCkKLSAgICAgICAgY29tbWFuZC5l eGVjdXRlKE1vY2tPcHRpb25zKGFsbD1GYWxzZSwgaW5jbHVkZV92aXJ0dWFsX3Rlc3RzPUZhbHNl LCBjc3Y9RmFsc2UsIHBsYXRmb3JtPU5vbmUpLCBbJ3Bhc3Nlcy90ZXh0Lmh0bWwnXSwgc2VsZi50 b29sKQorICAgICAgICBjb21tYW5kLmV4ZWN1dGUoTW9ja09wdGlvbnMoYWxsPUZhbHNlLCBjc3Y9 RmFsc2UsIHBsYXRmb3JtPU5vbmUpLCBbJ3Bhc3Nlcy90ZXh0Lmh0bWwnXSwgc2VsZi50b29sKQog ICAgICAgICBzdGRvdXQsIF8sIF8gPSBzZWxmLnJlc3RvcmVfb3V0cHV0KCkKICAgICAgICAgc2Vs Zi5hc3NlcnRNdWx0aUxpbmVFcXVhbChzdGRvdXQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICgnLy8gRm9yIHRlc3Qtd2luLXhwXG4nCkBAIC0yNzMsNyArMjczLDcgQEAgY2xhc3MgUHJpbnRC YXNlbGluZXNUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgY29tbWFuZCA9IFByaW50 QmFzZWxpbmVzKCkKICAgICAgICAgY29tbWFuZC5iaW5kX3RvX3Rvb2woc2VsZi50b29sKQogICAg ICAgICBzZWxmLmNhcHR1cmVfb3V0cHV0KCkKLSAgICAgICAgY29tbWFuZC5leGVjdXRlKE1vY2tP cHRpb25zKGFsbD1GYWxzZSwgaW5jbHVkZV92aXJ0dWFsX3Rlc3RzPUZhbHNlLCBjc3Y9RmFsc2Us IHBsYXRmb3JtPSd0ZXN0LXdpbi0qJyksIFsncGFzc2VzL3RleHQuaHRtbCddLCBzZWxmLnRvb2wp CisgICAgICAgIGNvbW1hbmQuZXhlY3V0ZShNb2NrT3B0aW9ucyhhbGw9RmFsc2UsIGNzdj1GYWxz ZSwgcGxhdGZvcm09J3Rlc3Qtd2luLSonKSwgWydwYXNzZXMvdGV4dC5odG1sJ10sIHNlbGYudG9v bCkKICAgICAgICAgc3Rkb3V0LCBfLCBfID0gc2VsZi5yZXN0b3JlX291dHB1dCgpCiAgICAgICAg IHNlbGYuYXNzZXJ0TXVsdGlMaW5lRXF1YWwoc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICAg ICAgICAoJy8vIEZvciB0ZXN0LXdpbi12aXN0YVxuJwpAQCAtMjkyLDcgKzI5Miw3IEBAIGNsYXNz IFByaW50QmFzZWxpbmVzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIGNvbW1hbmQg PSBQcmludEJhc2VsaW5lcygpCiAgICAgICAgIGNvbW1hbmQuYmluZF90b190b29sKHNlbGYudG9v bCkKICAgICAgICAgc2VsZi5jYXB0dXJlX291dHB1dCgpCi0gICAgICAgIGNvbW1hbmQuZXhlY3V0 ZShNb2NrT3B0aW9ucyhhbGw9RmFsc2UsIHBsYXRmb3JtPScqeHAnLCBjc3Y9VHJ1ZSwgaW5jbHVk ZV92aXJ0dWFsX3Rlc3RzPUZhbHNlKSwgWydwYXNzZXMvdGV4dC5odG1sJ10sIHNlbGYudG9vbCkK KyAgICAgICAgY29tbWFuZC5leGVjdXRlKE1vY2tPcHRpb25zKGFsbD1GYWxzZSwgcGxhdGZvcm09 Jyp4cCcsIGNzdj1UcnVlKSwgWydwYXNzZXMvdGV4dC5odG1sJ10sIHNlbGYudG9vbCkKICAgICAg ICAgc3Rkb3V0LCBfLCBfID0gc2VsZi5yZXN0b3JlX291dHB1dCgpCiAgICAgICAgIHNlbGYuYXNz ZXJ0TXVsdGlMaW5lRXF1YWwoc3Rkb3V0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAoJ3Rl c3Qtd2luLXhwLHBhc3Nlcy90ZXh0Lmh0bWwsTm9uZSxwbmcscGFzc2VzL3RleHQtZXhwZWN0ZWQu cG5nLE5vbmVcbicK