79431 2012-02-23 19:41:18 -0800 nrwt needs to support virtual test suites / directories 2012-02-29 15:52:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 79733 79736 79737 76501 1 dpranke dpranke abarth eric tony oldest_to_newest 563846 0 dpranke 2012-02-23 19:41:18 -0800 nrwt needs to support virtual test suites / directories 563848 1 128633 dpranke 2012-02-23 19:42:06 -0800 Created attachment 128633 Work in progress 563851 2 128633 dpranke 2012-02-23 19:43:41 -0800 Comment on attachment 128633 Work in progress Theoretically this patch has all the needed code, and it passes all of the existing unit tests, but I've done zero testing of the new code paths :). 563852 3 dpranke 2012-02-23 19:44:45 -0800 Don't sweat reviewing this since (a) it's untested and (b) I'll clean it up and break it into smaller patches for landing. You need only look at that if you're curious as to the direction. 566269 4 dpranke 2012-02-27 19:06:35 -0800 Bug 79733 filed to add support for specifying a per-test command line when starting a driver. 566290 5 dpranke 2012-02-27 19:27:42 -0800 bug 79736 filed to support running an arbitrary number of drivers per worker depending on how many different command lines are needed. 566308 6 dpranke 2012-02-27 19:52:34 -0800 Bug 79737 to actually add support to the base classes (and tests). 568034 7 dpranke 2012-02-29 15:52:07 -0800 closing ... all the subtasks have landed. 128633 2012-02-23 19:42:06 -0800 2012-02-27 19:06:00 -0800 Work in progress bug-79431-20120223194205.patch text/plain 22716 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4Njc1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTgyM2U3MTQ3N2E1MzhjMGY2MDIzNjg1NjVjZGIzNzJm NzNkMGZhMC4uZjRkZjY0YmIzN2RhMzcxZGM0YTc2NjY3ODYxOTUxMmU4MGMyNjQyYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDcw IEBACiAyMDEyLTAyLTIzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3QgbmVlZHMgdG8gc3VwcG9ydCB2aXJ0dWFsIHRlc3Qgc3VpdGVzIC8gZGlyZWN0 b3JpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5 NDMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0 Ll9faW5pdF9fKToKKyAgICAgICAgKFBvcnQuZXhwZWN0ZWRfZmlsZW5hbWUpOgorICAgICAgICAo UG9ydC50ZXN0cyk6CisgICAgICAgIChQb3J0KToKKyAgICAgICAgKFBvcnQuX3JlYWxfdGVzdHMp OgorICAgICAgICAoUG9ydC5kcml2ZXJfY21kX2xpbmUpOgorICAgICAgICAoUG9ydC5fZHJpdmVy X2NsYXNzKToKKyAgICAgICAgKFBvcnQudmlydHVhbF90ZXN0X3N1aXRlcyk6CisgICAgICAgIChQ b3J0LnZpcnR1YWxfc3VpdGUpOgorICAgICAgICAoUG9ydC52aXJ0dWFsX3N1aXRlLlZpcnR1YWxU ZXN0U3VpdGUpOgorICAgICAgICAoUG9ydC52aXJ0dWFsX3N1aXRlLlZpcnR1YWxUZXN0U3VpdGUu X19pbml0X18pOgorICAgICAgICAoUG9ydC52aXJ0dWFsX3N1aXRlLlZpcnR1YWxUZXN0U3VpdGUu X19yZXByX18pOgorICAgICAgICAoUG9ydC5wb3B1bGF0ZWRfdmlydHVhbF90ZXN0X3N1aXRlcyk6 CisgICAgICAgIChQb3J0Ll92aXJ0dWFsX3Rlc3RzKToKKyAgICAgICAgKFBvcnQubG9va3VwX3Zp cnR1YWxfdGVzdF9iYXNlKToKKyAgICAgICAgKFBvcnQubG9va3VwX3ZpcnR1YWxfdGVzdF9hcmdz KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5p dHRlc3QucHk6CisgICAgICAgIChQb3J0VGVzdC50ZXN0X2ZpbmRfd2l0aF9za2lwcGVkX2RpcmVj dG9yaWVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtLnB5OgorICAgICAgICAoQ2hyb21pdW1Ecml2ZXIuY21kX2xpbmUpOgorICAgICAgICAo Q2hyb21pdW1Ecml2ZXIuX3N0YXJ0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0ZXN0LnB5OgorICAgICAgICAoQ2hyb21pdW1Ecml2 ZXJUZXN0LnRlc3RfdHdvX2RyaXZlcnMuTW9ja0RyaXZlci5jbWRfbGluZSk6CisgICAgICAgIChD aHJvbWl1bURyaXZlclRlc3QpOgorICAgICAgICAoQ2hyb21pdW1Ecml2ZXJUZXN0LnRlc3RfdHdv X2RyaXZlcnMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv ZHJpdmVyLnB5OgorICAgICAgICAoRHJpdmVySW5wdXQuX19pbml0X18pOgorICAgICAgICAoRHJp dmVyLmNtZF9saW5lKToKKyAgICAgICAgKERyaXZlci5fc3RhcnQpOgorICAgICAgICAoRHJpdmVy LnN0b3ApOgorICAgICAgICAoRHJpdmVyUHJveHkuX19pbml0X18pOgorICAgICAgICAoRHJpdmVy UHJveHkpOgorICAgICAgICAoRHJpdmVyUHJveHkuX21ha2VfZHJpdmVyKToKKyAgICAgICAgKERy aXZlclByb3h5LmlzX2h0dHBfdGVzdCk6CisgICAgICAgIChEcml2ZXJQcm94eS50ZXN0X3RvX3Vy aSk6CisgICAgICAgIChEcml2ZXJQcm94eS51cmlfdG9fdGVzdCk6CisgICAgICAgIChEcml2ZXJQ cm94eS5ydW5fdGVzdCk6CisgICAgICAgIChEcml2ZXJQcm94eS5oYXNfY3Jhc2hlZCk6CisgICAg ICAgIChEcml2ZXJQcm94eS5zdG9wKToKKyAgICAgICAgKERyaXZlclByb3h5LmNtZF9saW5lKToK KyAgICAgICAgKERyaXZlclByb3h5Ll9jbWRfbGluZV9hc19rZXkpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5OgorICAgICAg ICAoRHJpdmVyVGVzdC50ZXN0X3ZpcnR1YWxfZHJpdmVyX21ldGhvZHMpOgorICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5OgorICAgICAgICAoR3RrRHJp dmVyLmNtZF9saW5lKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3QucHk6CisgICAgICAgIChUZXN0UG9ydC52aXJ0dWFsX3Rlc3Rfc3VpdGVzKToKKyAg ICAgICAgKFRlc3REcml2ZXIuY21kX2xpbmUpOgorICAgICAgICAoVGVzdERyaXZlci5ydW5fdGVz dCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQu cHk6CisgICAgICAgIChXZWJLaXREcml2ZXIuY21kX2xpbmUpOgorICAgICAgICAoV2ViS2l0RHJp dmVyLl9zdGFydCk6CisgICAgICAgIChXZWJLaXREcml2ZXIucnVuX3Rlc3QpOgorICAgICAgICAo V2ViS2l0RHJpdmVyLl9yZWFkX2Jsb2NrKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weToKKyAgICAgICAgKFdlYktpdERyaXZl clRlc3QudGVzdF9ub190aW1lb3V0KToKKworMjAxMi0wMi0yMyAgRGlyayBQcmFua2UgIDxkcHJh bmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICB3ZWJraXQtcGF0Y2ggd29ya3Mgb2RkbHkgZm9y IEdpdCBicmFuY2hlcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NzY5NTgKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9iYXNlLnB5CmluZGV4IDFiODZiZmUwZDNkZGZkOWQ0ZjMzMDY0ODY1MzFjMDU0YTk0NTY0 OTQuLjE4Y2Y1ZmUzZDBkNjk0YWE0ODYzNWUwNGEyNjEzNzkzNGM2NzAyZjUgMTAwNzU1Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAgLTM0LDYg KzM0LDcgQEAgaW1wb3J0IGNnaQogaW1wb3J0IGRpZmZsaWIKIGltcG9ydCBlcnJubwogaW1wb3J0 IG9zCitpbXBvcnQgcGRiCiBpbXBvcnQgcmUKIAogZnJvbSB3ZWJraXRweS5jb21tb24ubWVtb2l6 ZWQgaW1wb3J0IG1lbW9pemVkCkBAIC0xNDEsNiArMTQyLDcgQEAgY2xhc3MgUG9ydChvYmplY3Qp OgogICAgICAgICBzZWxmLl90ZXN0X2NvbmZpZ3VyYXRpb24gPSBOb25lCiAgICAgICAgIHNlbGYu X3JlZnRlc3RfbGlzdCA9IHt9CiAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5ID0gTm9u ZQorICAgICAgICBzZWxmLl9wb3B1bGF0ZWRfdmlydHVhbF90ZXN0X3N1aXRlcyA9IE5vbmUKIAog ICAgIGRlZiB3ZGlmZl9hdmFpbGFibGUoc2VsZik6CiAgICAgICAgIGlmIHNlbGYuX3dkaWZmX2F2 YWlsYWJsZSBpcyBOb25lOgpAQCAtMzc5LDYgKzM4MSwxMSBAQCBjbGFzcyBQb3J0KG9iamVjdCk6 CiAgICAgICAgIHBsYXRmb3JtX2RpciwgYmFzZWxpbmVfZmlsZW5hbWUgPSBzZWxmLmV4cGVjdGVk X2Jhc2VsaW5lcyh0ZXN0X25hbWUsIHN1ZmZpeClbMF0KICAgICAgICAgaWYgcGxhdGZvcm1fZGly OgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihwbGF0Zm9ybV9kaXIs IGJhc2VsaW5lX2ZpbGVuYW1lKQorCisgICAgICAgIGFjdHVhbF90ZXN0X25hbWUgPSBzZWxmLmxv b2t1cF92aXJ0dWFsX3Rlc3RfYmFzZSh0ZXN0X25hbWUpCisgICAgICAgIGlmIGFjdHVhbF90ZXN0 X25hbWU6CisgICAgICAgICAgICByZXR1cm4gc2VsZi5leHBlY3RlZF9maWxlbmFtZShhY3R1YWxf dGVzdF9uYW1lLCBzdWZmaXgpCisKICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9p bihzZWxmLmxheW91dF90ZXN0c19kaXIoKSwgYmFzZWxpbmVfZmlsZW5hbWUpCiAKICAgICBkZWYg ZXhwZWN0ZWRfY2hlY2tzdW0oc2VsZiwgdGVzdF9uYW1lKToKQEAgLTQ1OSw2ICs0NjYsOSBAQCBj bGFzcyBQb3J0KG9iamVjdCk6CiAKICAgICBkZWYgdGVzdHMoc2VsZiwgcGF0aHMpOgogICAgICAg ICAiIiJSZXR1cm4gdGhlIGxpc3Qgb2YgdGVzdHMgZm91bmQuIiIiCisgICAgICAgIHJldHVybiBz ZWxmLl9yZWFsX3Rlc3RzKHBhdGhzKS51bmlvbihzZWxmLl92aXJ0dWFsX3Rlc3RzKHBhdGhzLCBz ZWxmLnBvcHVsYXRlZF92aXJ0dWFsX3Rlc3Rfc3VpdGVzKCkpKQorCisgICAgZGVmIF9yZWFsX3Rl c3RzKHNlbGYsIHBhdGhzKToKICAgICAgICAgIyBXaGVuIGNvbGxlY3RpbmcgdGVzdCBjYXNlcywg c2tpcCB0aGVzZSBkaXJlY3RvcmllcwogICAgICAgICBza2lwcGVkX2RpcmVjdG9yaWVzID0gc2V0 KFsnLnN2bicsICdfc3ZuJywgJ3Jlc291cmNlcycsICdzY3JpcHQtdGVzdHMnLCAncmVmZXJlbmNl JywgJ3JlZnRlc3QnXSkKICAgICAgICAgZmlsZXMgPSBmaW5kX2ZpbGVzLmZpbmQoc2VsZi5fZmls ZXN5c3RlbSwgc2VsZi5sYXlvdXRfdGVzdHNfZGlyKCksIHBhdGhzLCBza2lwcGVkX2RpcmVjdG9y aWVzLCBQb3J0Ll9pc190ZXN0X2ZpbGUpCkBAIC01MzMsNyArNTQzLDcgQEAgY2xhc3MgUG9ydChv YmplY3QpOgogICAgIGRlZiBkcml2ZXJfY21kX2xpbmUoc2VsZik6CiAgICAgICAgICIiIlByaW50 cyB0aGUgRFJUIGNvbW1hbmQgbGluZSB0aGF0IHdpbGwgYmUgdXNlZC4iIiIKICAgICAgICAgZHJp dmVyID0gc2VsZi5jcmVhdGVfZHJpdmVyKDApCi0gICAgICAgIHJldHVybiBkcml2ZXIuY21kX2xp bmUoKQorICAgICAgICByZXR1cm4gZHJpdmVyLmNtZF9saW5lKHNlbGYuZ2V0X29wdGlvbigncGl4 ZWxfdGVzdHMnKSwgW10pCiAKICAgICBkZWYgdXBkYXRlX2Jhc2VsaW5lKHNlbGYsIGJhc2VsaW5l X3BhdGgsIGRhdGEpOgogICAgICAgICAiIiJVcGRhdGVzIHRoZSBiYXNlbGluZSBmb3IgYSB0ZXN0 LgpAQCAtMTA0MywzICsxMDUzLDU3IEBAIGNsYXNzIFBvcnQob2JqZWN0KToKICAgICBkZWYgX2Ry aXZlcl9jbGFzcyhzZWxmKToKICAgICAgICAgIiIiUmV0dXJucyB0aGUgcG9ydCdzIGRyaXZlciBp bXBsZW1lbnRhdGlvbi4iIiIKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcignUG9y dC5fZHJpdmVyX2NsYXNzJykKKworICAgIGRlZiB2aXJ0dWFsX3Rlc3Rfc3VpdGVzKHNlbGYpOgor ICAgICAgICByZXR1cm4gW10KKworICAgIGRlZiB2aXJ0dWFsX3N1aXRlKHNlbGYsIG5hbWUsIGJh c2VfZGlyLCBhcmdzKToKKworICAgICAgICBjbGFzcyBWaXJ0dWFsVGVzdFN1aXRlKG9iamVjdCk6 CisgICAgICAgICAgICBkZWYgX19pbml0X18oc2VsZiwgbmFtZSwgYmFzZSwgYXJncywgdGVzdHM9 Tm9uZSk6CisgICAgICAgICAgICAgICAgc2VsZi5uYW1lID0gbmFtZQorICAgICAgICAgICAgICAg IHNlbGYuYmFzZSA9IGJhc2UKKyAgICAgICAgICAgICAgICBzZWxmLmFyZ3MgPSBhcmdzCisgICAg ICAgICAgICAgICAgc2VsZi50ZXN0cyA9IHRlc3RzIG9yIHNldCgpCisKKyAgICAgICAgICAgIGRl ZiBfX3JlcHJfXyhzZWxmKToKKyAgICAgICAgICAgICAgICByZXR1cm4gIlZpcnR1YWxUZXN0U3Vp dGUoJyVzJywgJyVzJywgJXMpIiAlIChzZWxmLm5hbWUsIHNlbGYuYmFzZSwgc2VsZi5hcmdzKQor CisgICAgICAgIHJldHVybiBWaXJ0dWFsVGVzdFN1aXRlKG5hbWUsIGJhc2VfZGlyLCBhcmdzKQor CisgICAgZGVmIHBvcHVsYXRlZF92aXJ0dWFsX3Rlc3Rfc3VpdGVzKHNlbGYpOgorICAgICAgICBp ZiBzZWxmLl9wb3B1bGF0ZWRfdmlydHVhbF90ZXN0X3N1aXRlcyBpcyBOb25lOgorICAgICAgICAg ICAgc3VpdGVzID0gc2VsZi52aXJ0dWFsX3Rlc3Rfc3VpdGVzKCkKKworICAgICAgICAgICAgIyBT YW5pdHktY2hlY2sgdGhlIHN1aXRlcyB0byBtYWtlIHN1cmUgdGhleSBkb24ndCBwb2ludCB0byBv dGhlciBzdWl0ZXMuCisgICAgICAgICAgICBzdWl0ZV9kaXJzID0gW3N1aXRlLm5hbWUgZm9yIHN1 aXRlIGluIHN1aXRlc10KKyAgICAgICAgICAgIGZvciBzdWl0ZSBpbiBzdWl0ZXM6CisgICAgICAg ICAgICAgICAgYXNzZXJ0IHN1aXRlLmJhc2Ugbm90IGluIHN1aXRlX2RpcnMKKworICAgICAgICAg ICAgZm9yIHN1aXRlIGluIHN1aXRlczoKKyAgICAgICAgICAgICAgICBiYXNlX3Rlc3RzID0gc2Vs Zi5fcmVhbF90ZXN0cyhbc3VpdGUuYmFzZV0pCisgICAgICAgICAgICAgICAgc3VpdGUudGVzdHMg PSB7fQorICAgICAgICAgICAgICAgIGZvciB0ZXN0IGluIGJhc2VfdGVzdHM6CisgICAgICAgICAg ICAgICAgICAgIHN1aXRlLnRlc3RzW3Rlc3QucmVwbGFjZShzdWl0ZS5iYXNlLCBzdWl0ZS5uYW1l KV0gPSB0ZXN0CisgICAgICAgICAgICBzZWxmLl9wb3B1bGF0ZWRfdmlydHVhbF90ZXN0X3N1aXRl cyA9IHN1aXRlcworICAgICAgICByZXR1cm4gc2VsZi5fcG9wdWxhdGVkX3ZpcnR1YWxfdGVzdF9z dWl0ZXMKKworICAgIGRlZiBfdmlydHVhbF90ZXN0cyhzZWxmLCBwYXRocywgc3VpdGVzKToKKyAg ICAgICAgdmlydHVhbF90ZXN0cyA9IHNldCgpCisgICAgICAgIGZvciBzdWl0ZSBpbiBzdWl0ZXM6 CisgICAgICAgICAgICBmb3IgdGVzdCBpbiBzdWl0ZS50ZXN0czoKKyAgICAgICAgICAgICAgICBp ZiBhbnkodGVzdC5zdGFydHN3aXRoKHApIGZvciBwIGluIHBhdGhzKToKKyAgICAgICAgICAgICAg ICAgICAgdmlydHVhbF90ZXN0cy5hZGQodGVzdCkKKyAgICAgICAgcmV0dXJuIHZpcnR1YWxfdGVz dHMKKworICAgIGRlZiBsb29rdXBfdmlydHVhbF90ZXN0X2Jhc2Uoc2VsZiwgdGVzdF9uYW1lKToK KyAgICAgICAgZm9yIHN1aXRlIGluIHNlbGYucG9wdWxhdGVkX3ZpcnR1YWxfdGVzdF9zdWl0ZXMo KToKKyAgICAgICAgICAgIGlmIHRlc3RfbmFtZS5zdGFydHN3aXRoKHN1aXRlLm5hbWUpOgorICAg ICAgICAgICAgICAgIHJldHVybiBzdWl0ZS50ZXN0cy5nZXQodGVzdF9uYW1lKQorICAgICAgICBy ZXR1cm4gTm9uZQorCisgICAgZGVmIGxvb2t1cF92aXJ0dWFsX3Rlc3RfYXJncyhzZWxmLCB0ZXN0 X25hbWUpOgorICAgICAgICBmb3Igc3VpdGUgaW4gc2VsZi5wb3B1bGF0ZWRfdmlydHVhbF9zdWl0 ZXMoKToKKyAgICAgICAgICAgIGlmIHRlc3RfbmFtZS5zdGFydHN3aXRoKHN1aXRlLm5hbWUpOgor ICAgICAgICAgICAgICAgIHJldHVybiBzdWl0ZS5hcmdzCisgICAgICAgIHJldHVybiBbXQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlX3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNl X3VuaXR0ZXN0LnB5CmluZGV4IDg0NjVmNjAxOWVhMWZjNDFiOGM3YzllNTlhZDZjNjE0OGY3ZGI2 MWUuLjUxOTE4Mzg5NjQxNTAyZDkzN2FkZmRiMjY1ZDJhMWI4YzkyMzAyNzkgMTAwNjQ0Ci0tLSBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5p dHRlc3QucHkKQEAgLTMxMiw3ICszMTIsNyBAQCBjbGFzcyBQb3J0VGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAKICAgICBkZWYgdGVzdF9maW5kX3dpdGhfc2tpcHBlZF9kaXJlY3RvcmllcyhzZWxm KToKICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHdpdGhfdGVzdHM9VHJ1ZSkKLSAgICAg ICAgdGVzdHMgPSBwb3J0LnRlc3RzKCd1c2Vyc2NyaXB0cycpCisgICAgICAgIHRlc3RzID0gcG9y dC50ZXN0cyhbJ3VzZXJzY3JpcHRzJ10pCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgndXNlcnNj cmlwdHMvcmVzb3VyY2VzL2lmcmFtZS5odG1sJyBub3QgaW4gdGVzdHMpCiAKICAgICBkZWYgdGVz dF9maW5kX3dpdGhfc2tpcHBlZF9kaXJlY3Rvcmllc18yKHNlbGYpOgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHkKaW5kZXggODMx MzllMGZjMGM5N2M1OWRhNzhjMTY2NjA4NWFhNWMyZmE3YTM0YS4uNTI2MDMwMTZjOTg1NGMzNzRm Nzk3ZjA1YWQ2ZWNmZDdkNzlmNzI1ZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtLnB5CkBAIC00MzMsMjEgKzQzMywyNiBAQCBj bGFzcyBDaHJvbWl1bURyaXZlcihEcml2ZXIpOgogICAgICAgICBjbWQuZXh0ZW5kKHNlbGYuX3Bv cnQuZ2V0X29wdGlvbignYWRkaXRpb25hbF9kcnRfZmxhZycsIFtdKSkKICAgICAgICAgcmV0dXJu IGNtZAogCi0gICAgZGVmIGNtZF9saW5lKHNlbGYpOgorICAgIGRlZiBjbWRfbGluZShzZWxmLCBw aXhlbF90ZXN0cywgcGVyX3Rlc3RfYXJncyk6CiAgICAgICAgIGNtZCA9IHNlbGYuX2NvbW1hbmRf d3JhcHBlcihzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3dyYXBwZXInKSkKICAgICAgICAgY21kLmFw cGVuZChzZWxmLl9wb3J0Ll9wYXRoX3RvX2RyaXZlcigpKQogICAgICAgICAjIEZJWE1FOiBXaHkg ZG9lcyAtLXRlc3Qtc2hlbGwgZXhpc3Q/ICBUZXN0U2hlbGwgaXMgZGVhZCwgc2hvdWxkbid0IHRo aXMgYmUgcmVtb3ZlZD8KICAgICAgICAgIyBJdCBzZWVtcyBpdCdzIHN0aWxsIGluIHVzZSBpbiBU b29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9EdW1wUmVuZGVyVHJlZS5jcHAgYXMgb2YgOC8x MC8xMS4KICAgICAgICAgY21kLmFwcGVuZCgnLS10ZXN0LXNoZWxsJykKICAgICAgICAgY21kLmV4 dGVuZChzZWxmLl93cmFwcGVyX29wdGlvbnMoKSkKKworICAgICAgICBpZiBwaXhlbF90ZXN0cyBv ciBzZWxmLl9waXhlbF90ZXN0czoKKyAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tcGl4ZWwtdGVz dHMnKQorICAgICAgICBjbWQuZXh0ZW5kKHBlcl90ZXN0X2FyZ3Mgb3IgW10pCisKICAgICAgICAg cmV0dXJuIGNtZAogCi0gICAgZGVmIF9zdGFydChzZWxmKToKKyAgICBkZWYgX3N0YXJ0KHNlbGYs IHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKICAgICAgICAgYXNzZXJ0IG5vdCBzZWxmLl9w cm9jCiAgICAgICAgICMgRklYTUU6IFRoaXMgc2hvdWxkIHVzZSBTZXJ2ZXJQcm9jZXNzIGxpa2Ug V2ViS2l0RHJpdmVyIGRvZXMuCiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBiZSByZWFkaW5n IHN0ZGVyciBhbmQgc3Rkb3V0IHNlcGFyYXRlbHkgbGlrZSBob3cgV2ViS2l0RHJpdmVyIGRvZXMu CiAgICAgICAgIGNsb3NlX2ZkcyA9IHN5cy5wbGF0Zm9ybSAhPSAnd2luMzInCi0gICAgICAgIHNl bGYuX3Byb2MgPSBzdWJwcm9jZXNzLlBvcGVuKHNlbGYuY21kX2xpbmUoKSwgc3RkaW49c3VicHJv Y2Vzcy5QSVBFLCBzdGRvdXQ9c3VicHJvY2Vzcy5QSVBFLCBzdGRlcnI9c3VicHJvY2Vzcy5TVERP VVQsIGNsb3NlX2Zkcz1jbG9zZV9mZHMpCisgICAgICAgIHNlbGYuX3Byb2MgPSBzdWJwcm9jZXNz LlBvcGVuKHNlbGYuY21kX2xpbmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpLCBzdGRpbj1z dWJwcm9jZXNzLlBJUEUsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUsIHN0ZGVycj1zdWJwcm9jZXNz LlNURE9VVCwgY2xvc2VfZmRzPWNsb3NlX2ZkcykKIAogICAgIGRlZiBoYXNfY3Jhc2hlZChzZWxm KToKICAgICAgICAgaWYgc2VsZi5fcHJvYyBpcyBOb25lOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fdW5pdHRlc3Qu cHkKaW5kZXggYWMwNzc5NTc0NDdiNzY2ODVjMjYxNGU5NzE1MGJmMDljZDJlN2MyZC4uYTQ2Y2I1 MDcwYjY0ZTY2MDc2ZWIyZGEwMjI5MDI0MmZlYjFjZDIwMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV91bml0dGVzdC5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX3VuaXR0 ZXN0LnB5CkBAIC0xMzgsMTUgKzEzOCwxNSBAQCBjbGFzcyBDaHJvbWl1bURyaXZlclRlc3QodW5p dHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgZGVmIF9faW5pdF9fKHNlbGYpOgogICAgICAg ICAgICAgICAgIGNocm9taXVtLkNocm9taXVtRHJpdmVyLl9faW5pdF9fKHNlbGYsIG1vY2tfcG9y dCwgd29ya2VyX251bWJlcj0wLCBwaXhlbF90ZXN0cz1GYWxzZSkKIAotICAgICAgICAgICAgZGVm IGNtZF9saW5lKHNlbGYpOgorICAgICAgICAgICAgZGVmIGNtZF9saW5lKHNlbGYsIHBpeGVsX3Rl c3QsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICAgICAgICAgIHJldHVybiAncHl0aG9uJwogCiAg ICAgICAgICMgZ2V0X29wdGlvbiBpcyB1c2VkIHRvIGdldCB0aGUgdGltZW91dCAobXMpIGZvciBh IHByb2Nlc3MgYmVmb3JlIHdlIGtpbGwgaXQuCiAgICAgICAgIG1vY2tfcG9ydC5nZXRfb3B0aW9u ID0gbGFtYmRhIG5hbWU6IDYwICogMTAwMAogICAgICAgICBkcml2ZXIxID0gTW9ja0RyaXZlcigp Ci0gICAgICAgIGRyaXZlcjEuX3N0YXJ0KCkKKyAgICAgICAgZHJpdmVyMS5fc3RhcnQoRmFsc2Us IFtdKQogICAgICAgICBkcml2ZXIyID0gTW9ja0RyaXZlcigpCi0gICAgICAgIGRyaXZlcjIuX3N0 YXJ0KCkKKyAgICAgICAgZHJpdmVyMi5fc3RhcnQoRmFsc2UsIFtdKQogICAgICAgICAjIEl0J3Mg cG9zc2libGUgZm9yIGRyaXZlcjEgdG8gdGltZW91dCB3aGVuIHN0b3BwaW5nIGlmIGl0J3Mgc2hh cmluZyBzdGRpbiB3aXRoIGRyaXZlcjIuCiAgICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRpbWUo KQogICAgICAgICBkcml2ZXIxLnN0b3AoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQppbmRleCA5MmU2OTkyZDc5NThjOWJhMGRjZjQx Mzg5N2FjYTYzNmJjYWU0YmNjLi42MjEzNTQwMDU1NjgxMDZkZmE0N2Y0Mjc4NjM4MzdhYzk1ODBi ZDk0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2RyaXZlci5weQpAQCAtMjYsNiArMjYsNyBAQAogIyAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKICMgT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KIAoraW1wb3J0IGNvcHkKIGltcG9ydCByZQogaW1wb3J0IHNobGV4CiAKQEAgLTMzLDExICsz NCwxMiBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0gaW1wb3J0IHBhdGgKIAogCiBjbGFz cyBEcml2ZXJJbnB1dChvYmplY3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0X25hbWUs IHRpbWVvdXQsIGltYWdlX2hhc2gsIGlzX3JlZnRlc3QpOgorICAgIGRlZiBfX2luaXRfXyhzZWxm LCB0ZXN0X25hbWUsIHRpbWVvdXQsIGltYWdlX2hhc2gsIGlzX3JlZnRlc3QsIGFyZ3M9Tm9uZSk6 CiAgICAgICAgIHNlbGYudGVzdF9uYW1lID0gdGVzdF9uYW1lCiAgICAgICAgIHNlbGYudGltZW91 dCA9IHRpbWVvdXQgICMgaW4gbXMKICAgICAgICAgc2VsZi5pbWFnZV9oYXNoID0gaW1hZ2VfaGFz aAogICAgICAgICBzZWxmLmlzX3JlZnRlc3QgPSBpc19yZWZ0ZXN0CisgICAgICAgIHNlbGYuYXJn cyA9IGFyZ3Mgb3IgW10KIAogCiBjbGFzcyBEcml2ZXJPdXRwdXQob2JqZWN0KToKQEAgLTEwMiw2 ICsxMDQsOSBAQCBjbGFzcyBEcml2ZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fcGl4ZWxfdGVz dHMgPSBwaXhlbF90ZXN0cwogICAgICAgICBzZWxmLl9ub190aW1lb3V0ID0gbm9fdGltZW91dAog CisgICAgZGVmIGNtZF9saW5lKHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKKyAg ICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgorCiAgICAgZGVmIHJ1bl90ZXN0KHNlbGYs IGRyaXZlcl9pbnB1dCk6CiAgICAgICAgICIiIlJ1biBhIHNpbmdsZSB0ZXN0IGFuZCByZXR1cm4g dGhlIHJlc3VsdHMuCiAKQEAgLTE1NiwxNSArMTYxLDEyIEBAIGNsYXNzIERyaXZlcihvYmplY3Qp OgogICAgIGRlZiBoYXNfY3Jhc2hlZChzZWxmKToKICAgICAgICAgcmV0dXJuIEZhbHNlCiAKLSAg ICBkZWYgc3RhcnQoc2VsZik6CisgICAgZGVmIF9zdGFydChzZWxmKToKICAgICAgICAgcmFpc2Ug Tm90SW1wbGVtZW50ZWRFcnJvcignRHJpdmVyLnN0YXJ0JykKIAogICAgIGRlZiBzdG9wKHNlbGYp OgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCdEcml2ZXIuc3RvcCcpCiAKLSAg ICBkZWYgY21kX2xpbmUoc2VsZik6Ci0gICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3Io J0RyaXZlci5jbWRfbGluZScpCi0KIAogY2xhc3MgRHJpdmVyUHJveHkob2JqZWN0KToKICAgICAi IiJBIHdyYXBwZXIgZm9yIG1hbmFnaW5nIHR3byBEcml2ZXIgaW5zdGFuY2VzLCBvbmUgd2l0aCBw aXhlbCB0ZXN0cyBhbmQKQEAgLTE3MiwzOCArMTc0LDUyIEBAIGNsYXNzIERyaXZlclByb3h5KG9i amVjdCk6CiAgICAgc2luZ2xlIGRyaXZlci4iIiIKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBw b3J0LCB3b3JrZXJfbnVtYmVyLCBkcml2ZXJfaW5zdGFuY2VfY29uc3RydWN0b3IsIHBpeGVsX3Rl c3RzLCBub190aW1lb3V0KToKLSAgICAgICAgc2VsZi5fZHJpdmVyID0gZHJpdmVyX2luc3RhbmNl X2NvbnN0cnVjdG9yKHBvcnQsIHdvcmtlcl9udW1iZXIsIHBpeGVsX3Rlc3RzLCBub190aW1lb3V0 KQotICAgICAgICBpZiBwaXhlbF90ZXN0czoKLSAgICAgICAgICAgIHNlbGYuX3JlZnRlc3RfZHJp dmVyID0gc2VsZi5fZHJpdmVyCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLl9yZWZ0 ZXN0X2RyaXZlciA9IGRyaXZlcl9pbnN0YW5jZV9jb25zdHJ1Y3Rvcihwb3J0LCB3b3JrZXJfbnVt YmVyLCBUcnVlLCBub190aW1lb3V0KQorICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAorICAgICAg ICBzZWxmLl93b3JrZXJfbnVtYmVyID0gd29ya2VyX251bWJlcgorICAgICAgICBzZWxmLl9kcml2 ZXJfaW5zdGFuY2VfY29uc3RydWN0b3IgPSBkcml2ZXJfaW5zdGFuY2VfY29uc3RydWN0b3IKKyAg ICAgICAgc2VsZi5fbm9fdGltZW91dCA9IG5vX3RpbWVvdXQKKyAgICAgICAgc2VsZi5fcGl4ZWxf dGVzdHMgPSBwaXhlbF90ZXN0cworCisgICAgICAgIHNlbGYuX2RlZmF1bHRfZHJpdmVyID0gc2Vs Zi5fbWFrZV9kcml2ZXIocGl4ZWxfdGVzdHMpCisgICAgICAgIHNlbGYuX2RyaXZlcnMgPSB7fQor ICAgICAgICBzZWxmLl9kcml2ZXJzW3NlbGYuX2NtZF9saW5lX2FzX2tleShwaXhlbF90ZXN0cywg W10pXSA9IHNlbGYuX2RlZmF1bHRfZHJpdmVyCisKKyAgICBkZWYgX21ha2VfZHJpdmVyKHNlbGYs IHBpeGVsX3Rlc3RzKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX2RyaXZlcl9pbnN0YW5jZV9jb25z dHJ1Y3RvcihzZWxmLl9wb3J0LCBzZWxmLl93b3JrZXJfbnVtYmVyLCBwaXhlbF90ZXN0cywgc2Vs Zi5fbm9fdGltZW91dCkKIAogICAgIGRlZiBpc19odHRwX3Rlc3Qoc2VsZiwgdGVzdF9uYW1lKToK LSAgICAgICAgcmV0dXJuIHNlbGYuX2RyaXZlci5pc19odHRwX3Rlc3QodGVzdF9uYW1lKQorICAg ICAgICByZXR1cm4gc2VsZi5fZGVmYXVsdF9kcml2ZXIuaXNfaHR0cF90ZXN0KHRlc3RfbmFtZSkK IAogICAgIGRlZiB0ZXN0X3RvX3VyaShzZWxmLCB0ZXN0X25hbWUpOgotICAgICAgICByZXR1cm4g c2VsZi5fZHJpdmVyLnRlc3RfdG9fdXJpKHRlc3RfbmFtZSkKKyAgICAgICAgcmV0dXJuIHNlbGYu X2RlZmF1bHRfZHJpdmVyLnRlc3RfdG9fdXJpKHRlc3RfbmFtZSkKIAogICAgIGRlZiB1cmlfdG9f dGVzdChzZWxmLCB1cmkpOgotICAgICAgICByZXR1cm4gc2VsZi5fZHJpdmVyLnVyaV90b190ZXN0 KHVyaSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX2RlZmF1bHRfZHJpdmVyLnVyaV90b190ZXN0KHVy aSkKIAogICAgIGRlZiBydW5fdGVzdChzZWxmLCBkcml2ZXJfaW5wdXQpOgotICAgICAgICBpZiBk cml2ZXJfaW5wdXQuaXNfcmVmdGVzdDoKLSAgICAgICAgICAgIHJldHVybiBzZWxmLl9yZWZ0ZXN0 X2RyaXZlci5ydW5fdGVzdChkcml2ZXJfaW5wdXQpCi0gICAgICAgIHJldHVybiBzZWxmLl9kcml2 ZXIucnVuX3Rlc3QoZHJpdmVyX2lucHV0KQorICAgICAgICBiYXNlID0gc2VsZi5fcG9ydC5sb29r dXBfdmlydHVhbF90ZXN0X2Jhc2UoZHJpdmVyX2lucHV0LnRlc3RfbmFtZSkKKyAgICAgICAgaWYg YmFzZToKKyAgICAgICAgICAgIHZpcnR1YWxfZHJpdmVyX2lucHV0ID0gY29weS5jb3B5KGRyaXZl cl9pbnB1dCkKKyAgICAgICAgICAgIHZpcnR1YWxfZHJpdmVyX2lucHV0LnRlc3RfbmFtZSA9IGJh c2VfdGVzdF9uYW1lCisgICAgICAgICAgICB2aXJ0dWFsX2RyaXZlcl9pbnB1dC5hcmdzID0gc2Vs Zi5fcG9ydC5sb29rdXBfdmlydHVhbF90ZXN0X2FyZ3MoZHJpdmVyX2lucHV0LnRlc3RfbmFtZSkK KyAgICAgICAgICAgIHJldHVybiBzZWxmLnJ1bl90ZXN0KHZpcnR1YWxfZHJpdmVyX2lucHV0KQog Ci0gICAgZGVmIGhhc19jcmFzaGVkKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5fZHJpdmVy Lmhhc19jcmFzaGVkKCkgb3Igc2VsZi5fcmVmdGVzdF9kcml2ZXIuaGFzX2NyYXNoZWQoKQorICAg ICAgICBwaXhlbF90ZXN0c19uZWVkZWQgPSBzZWxmLl9waXhlbF90ZXN0cyBvciBkcml2ZXJfaW5w dXQuaXNfcmVmdGVzdAorICAgICAgICBjbWRfbGluZV9rZXkgPSBzZWxmLl9jbWRfbGluZV9hc19r ZXkocGl4ZWxfdGVzdHNfbmVlZGVkLCBkcml2ZXJfaW5wdXQuYXJncykKKyAgICAgICAgaWYgbm90 IGNtZF9saW5lX2tleSBpbiBzZWxmLl9kcml2ZXJzOgorICAgICAgICAgICAgc2VsZi5fZHJpdmVy c1tjbWRfbGluZV9rZXldID0gc2VsZi5fbWFrZV9kcml2ZXIocGl4ZWxfdGVzdHNfbmVlZGVkKQor CisgICAgICAgIHJldHVybiBzZWxmLl9kcml2ZXJzW2NtZF9saW5lX2tleV0ucnVuX3Rlc3QoZHJp dmVyX2lucHV0KQogCi0gICAgZGVmIHN0YXJ0KHNlbGYpOgotICAgICAgICBzZWxmLl9kcml2ZXIu c3RhcnQoKQorICAgIGRlZiBoYXNfY3Jhc2hlZChzZWxmKToKKyAgICAgICAgcmV0dXJuIGFueShk cml2ZXIuaGFzX2NyYXNoZWQgZm9yIGRyaXZlciBpbiBzZWxmLl9kcml2ZXJzLnZhbHVlcygpKQog CiAgICAgZGVmIHN0b3Aoc2VsZik6Ci0gICAgICAgIHNlbGYuX2RyaXZlci5zdG9wKCkKLSAgICAg ICAgc2VsZi5fcmVmdGVzdF9kcml2ZXIuc3RvcCgpCi0KLSAgICBkZWYgY21kX2xpbmUoc2VsZik6 Ci0gICAgICAgIGNtZF9saW5lID0gc2VsZi5fZHJpdmVyLmNtZF9saW5lKCkKLSAgICAgICAgaWYg c2VsZi5fZHJpdmVyICE9IHNlbGYuX3JlZnRlc3RfZHJpdmVyOgotICAgICAgICAgICAgY21kX2xp bmUgKz0gWyc7ICddICsgc2VsZi5fcmVmdGVzdF9kcml2ZXIuY21kX2xpbmUoKQotICAgICAgICBy ZXR1cm4gY21kX2xpbmUKKyAgICAgICAgZm9yIGRyaXZlciBpbiBzZWxmLl9kcml2ZXJzLnZhbHVl cygpOgorICAgICAgICAgICAgZHJpdmVyLnN0b3AoKQorCisgICAgZGVmIGNtZF9saW5lKHNlbGYs IHBpeGVsX3Rlc3RzPU5vbmUsIHBlcl90ZXN0X2FyZ3M9Tm9uZSk6CisgICAgICAgIHJldHVybiBz ZWxmLl9kZWZhdWx0X2RyaXZlci5jbWRfbGluZShwaXhlbF90ZXN0cyBvciBzZWxmLl9waXhlbF90 ZXN0cywgcGVyX3Rlc3RfYXJncyBvciBbXSkKKworICAgIGRlZiBfY21kX2xpbmVfYXNfa2V5KHNl bGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKKyAgICAgICAgcmV0dXJuICcgJy5qb2lu KHNlbGYuY21kX2xpbmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpKQpkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXJfdW5pdHRlc3Qu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0 dGVzdC5weQppbmRleCBkMGE1MTBmOWRmYTk1OWU1MzU5M2YyN2IyYWRjYThhYzhkYWMwMWFlLi4w OGQ0ZDk4ODIyMDI2NzA2MTAzYTExMjc5ZTI4MzFhYzkxZmVjZGEyIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0 dGVzdC5weQpAQCAtOTEsNyArOTEsNyBAQCBjbGFzcyBEcml2ZXJUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKICAgICAgICAgZHJpdmVyID0gRHJpdmVyKHNlbGYubWFrZV9wb3J0KCksIE5vbmUsIHBp eGVsX3Rlc3RzPUZhbHNlKQogICAgICAgICBzZWxmLmFzc2VydFZpcnR1YWwoZHJpdmVyLnJ1bl90 ZXN0LCBOb25lKQogICAgICAgICBzZWxmLmFzc2VydFZpcnR1YWwoZHJpdmVyLnN0b3ApCi0gICAg ICAgIHNlbGYuYXNzZXJ0VmlydHVhbChkcml2ZXIuY21kX2xpbmUpCisgICAgICAgIHNlbGYuYXNz ZXJ0VmlydHVhbChkcml2ZXIuY21kX2xpbmUsIEZhbHNlLCBbXSkKIAogICAgIGRlZiB0ZXN0X2Nv bW1hbmRfd3JhcHBlcihzZWxmKToKICAgICAgICAgc2VsZi5fYXNzZXJ0X3dyYXBwZXIoTm9uZSwg W10pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2d0ay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5 CmluZGV4IGM5ZWUxY2JmZTZkMzVhNjllZTU1N2NiOTg4ODI4NGRhYTRmMjA3NmQuLjFjMmI5NGUw MjA0NmRlOGY5MDE3OTcwZDFlMjEyOWRiZmJmNzA5MGIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZ3RrLnB5CkBAIC02NCw5ICs2NCw5IEBAIGNsYXNz IEd0a0RyaXZlcihXZWJLaXREcml2ZXIpOgogICAgICAgICAgICAgc2VsZi5feHZmYl9wcm9jZXNz LndhaXQoKQogICAgICAgICAgICAgc2VsZi5feHZmYl9wcm9jZXNzID0gTm9uZQogCi0gICAgZGVm IGNtZF9saW5lKHNlbGYpOgorICAgIGRlZiBjbWRfbGluZShzZWxmLCBwaXhlbF90ZXN0cywgcGVy X3Rlc3RfYXJncyk6CiAgICAgICAgIHdyYXBwZXJfcGF0aCA9IHNlbGYuX3BvcnQucGF0aF9mcm9t X3dlYmtpdF9iYXNlKCJUb29scyIsICJndGsiLCAicnVuLXdpdGgtamhidWlsZCIpCi0gICAgICAg IHJldHVybiBbd3JhcHBlcl9wYXRoXSArIFdlYktpdERyaXZlci5jbWRfbGluZShzZWxmKQorICAg ICAgICByZXR1cm4gW3dyYXBwZXJfcGF0aF0gKyBXZWJLaXREcml2ZXIuY21kX2xpbmUoc2VsZiwg cGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpCiAKIAogY2xhc3MgR3RrUG9ydChXZWJLaXRQb3J0 KToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5w eQppbmRleCAxOTk0NjBkNTc5MzlhNzczY2MyODFhMGM3ZGRjMDFjODE3ZWI5YmM4Li43Zjc0MDg4 NjgzMTk0OTU3OGJmYzA5MmVlYmQ5YzUzZWZkYWM0NjUyIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CkBAIC00ODksMTIgKzQ4OSwxNiBA QCBjbGFzcyBUZXN0UG9ydChQb3J0KToKICAgICBkZWYgYWxsX2Jhc2VsaW5lX3ZhcmlhbnRzKHNl bGYpOgogICAgICAgICByZXR1cm4gc2VsZi5BTExfQkFTRUxJTkVfVkFSSUFOVFMKIAorICAgIGRl ZiB2aXJ0dWFsX3Rlc3Rfc3VpdGVzKHNlbGYpOgorICAgICAgICByZXR1cm4gWworICAgICAgICAg ICAgc2VsZi52aXJ0dWFsX3N1aXRlKCd2aXJ0dWFsJywgJ3Bhc3NlcycsIFtdKSwKKyAgICAgICAg XQogCiBjbGFzcyBUZXN0RHJpdmVyKERyaXZlcik6CiAgICAgIiIiVGVzdC9EdW1teSBpbXBsZW1l bnRhdGlvbiBvZiB0aGUgRHVtcFJlbmRlclRyZWUgaW50ZXJmYWNlLiIiIgogCi0gICAgZGVmIGNt ZF9saW5lKHNlbGYpOgotICAgICAgICByZXR1cm4gW3NlbGYuX3BvcnQuX3BhdGhfdG9fZHJpdmVy KCldICsgc2VsZi5fcG9ydC5nZXRfb3B0aW9uKCdhZGRpdGlvbmFsX2RydF9mbGFnJywgW10pCisg ICAgZGVmIGNtZF9saW5lKHNlbGYsIHBpeGVsX3Rlc3RzLCBwZXJfdGVzdF9hcmdzKToKKyAgICAg ICAgcmV0dXJuIFtzZWxmLl9wb3J0Ll9wYXRoX3RvX2RyaXZlcigpXSArIHNlbGYuX3BvcnQuZ2V0 X29wdGlvbignYWRkaXRpb25hbF9kcnRfZmxhZycsIFtdKSArIHBlcl90ZXN0X2FyZ3MKIAogICAg IGRlZiBydW5fdGVzdChzZWxmLCB0ZXN0X2lucHV0KToKICAgICAgICAgc3RhcnRfdGltZSA9IHRp bWUudGltZSgpCkBAIC01MjAsOCArNTI0LDYgQEAgY2xhc3MgVGVzdERyaXZlcihEcml2ZXIpOgog ICAgICAgICAgICAgY3Jhc2hlZF9wcm9jZXNzX25hbWU9Y3Jhc2hlZF9wcm9jZXNzX25hbWUsCiAg ICAgICAgICAgICB0ZXN0X3RpbWU9dGltZS50aW1lKCkgLSBzdGFydF90aW1lLCB0aW1lb3V0PXRl c3QudGltZW91dCwgZXJyb3I9dGVzdC5lcnJvcikKIAotICAgIGRlZiBzdGFydChzZWxmKToKLSAg ICAgICAgcGFzcwogCiAgICAgZGVmIHN0b3Aoc2VsZik6CiAgICAgICAgIHBhc3MKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKaW5kZXgg YWViOTE4Y2UwNjcwNjMxODZkZmFiNzMxNzE4OTBiYzM2MTMzYTE3ZS4uYzRjMDdjNDk0MWM5NWIy N2RkMjViMGZiMjcyNGFlYTM3MmNkYTdiZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXQucHkKQEAgLTQ2NCwxMyArNDY0LDExIEBAIGNs YXNzIFdlYktpdERyaXZlcihEcml2ZXIpOgogICAgIGRlZiBfX2RlbF9fKHNlbGYpOgogICAgICAg ICBzZWxmLl9wb3J0Ll9maWxlc3lzdGVtLnJtdHJlZShzdHIoc2VsZi5fZHJpdmVyX3RlbXBkaXIp KQogCi0gICAgZGVmIGNtZF9saW5lKHNlbGYpOgorICAgIGRlZiBjbWRfbGluZShzZWxmLCBwaXhl bF90ZXN0cywgcGVyX3Rlc3RfYXJncyk6CiAgICAgICAgIGNtZCA9IHNlbGYuX2NvbW1hbmRfd3Jh cHBlcihzZWxmLl9wb3J0LmdldF9vcHRpb24oJ3dyYXBwZXInKSkKICAgICAgICAgY21kLmFwcGVu ZChzZWxmLl9wb3J0Ll9wYXRoX3RvX2RyaXZlcigpKQogICAgICAgICBpZiBzZWxmLl9wb3J0Lmdl dF9vcHRpb24oJ3NraXBfcGl4ZWxfdGVzdF9pZl9ub19iYXNlbGluZScpOgogICAgICAgICAgICAg Y21kLmFwcGVuZCgnLS1za2lwLXBpeGVsLXRlc3QtaWYtbm8tYmFzZWxpbmUnKQotICAgICAgICBp ZiBzZWxmLl9waXhlbF90ZXN0czoKLSAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tcGl4ZWwtdGVz dHMnKQogICAgICAgICBpZiBzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2djX2JldHdlZW5fdGVzdHMn KToKICAgICAgICAgICAgIGNtZC5hcHBlbmQoJy0tZ2MtYmV0d2Vlbi10ZXN0cycpCiAgICAgICAg IGlmIHNlbGYuX3BvcnQuZ2V0X29wdGlvbignY29tcGxleF90ZXh0Jyk6CkBAIC00ODIsMTAgKzQ4 MCwxNSBAQCBjbGFzcyBXZWJLaXREcml2ZXIoRHJpdmVyKToKICAgICAgICAgIyBGSVhNRTogV2Ug bmVlZCB0byBwYXNzIC0tdGltZW91dD1TRUNPTkRTIHRvIFdlYktpdFRlc3RSdW5uZXIgZm9yIFdl YktpdDIuCiAKICAgICAgICAgY21kLmV4dGVuZChzZWxmLl9wb3J0LmdldF9vcHRpb24oJ2FkZGl0 aW9uYWxfZHJ0X2ZsYWcnLCBbXSkpCisKKyAgICAgICAgaWYgcGl4ZWxfdGVzdHMgb3Igc2VsZi5f cGl4ZWxfdGVzdHM6CisgICAgICAgICAgICBjbWQuYXBwZW5kKCctLXBpeGVsLXRlc3RzJykKKyAg ICAgICAgY21kLmV4dGVuZChwZXJfdGVzdF9hcmdzKQorCiAgICAgICAgIGNtZC5hcHBlbmQoJy0n KQogICAgICAgICByZXR1cm4gY21kCiAKLSAgICBkZWYgX3N0YXJ0KHNlbGYpOgorICAgIGRlZiBf c3RhcnQoc2VsZiwgcGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICBzZXJ2ZXJf bmFtZSA9IHNlbGYuX3BvcnQuZHJpdmVyX25hbWUoKQogICAgICAgICBlbnZpcm9ubWVudCA9IHNl bGYuX3BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKHNlcnZlcl9uYW1lKQogICAgICAgICBl bnZpcm9ubWVudFsnRFlMRF9GUkFNRVdPUktfUEFUSCddID0gc2VsZi5fcG9ydC5fYnVpbGRfcGF0 aCgpCkBAIC00OTMsNyArNDk2LDcgQEAgY2xhc3MgV2ViS2l0RHJpdmVyKERyaXZlcik6CiAgICAg ICAgIGVudmlyb25tZW50WydEVU1QUkVOREVSVFJFRV9URU1QJ10gPSBzdHIoc2VsZi5fZHJpdmVy X3RlbXBkaXIpCiAgICAgICAgIGVudmlyb25tZW50WydMT0NBTF9SRVNPVVJDRV9ST09UJ10gPSBz ZWxmLl9wb3J0LmxheW91dF90ZXN0c19kaXIoKQogICAgICAgICBzZWxmLl9jcmFzaGVkX3N1YnBy b2Nlc3NfbmFtZSA9IE5vbmUKLSAgICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3MgPSBzZXJ2ZXJf cHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKHNlbGYuX3BvcnQsIHNlcnZlcl9uYW1lLCBzZWxmLmNtZF9s aW5lKCksIGVudmlyb25tZW50KQorICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2VzcyA9IHNlcnZl cl9wcm9jZXNzLlNlcnZlclByb2Nlc3Moc2VsZi5fcG9ydCwgc2VydmVyX25hbWUsIHNlbGYuY21k X2xpbmUocGl4ZWxfdGVzdHMsIHBlcl90ZXN0X2FyZ3MpLCBlbnZpcm9ubWVudCkKIAogICAgIGRl ZiBoYXNfY3Jhc2hlZChzZWxmKToKICAgICAgICAgaWYgc2VsZi5fc2VydmVyX3Byb2Nlc3MgaXMg Tm9uZToKQEAgLTU1Myw3ICs1NTYsNyBAQCBjbGFzcyBXZWJLaXREcml2ZXIoRHJpdmVyKToKIAog ICAgIGRlZiBydW5fdGVzdChzZWxmLCBkcml2ZXJfaW5wdXQpOgogICAgICAgICBpZiBub3Qgc2Vs Zi5fc2VydmVyX3Byb2Nlc3M6Ci0gICAgICAgICAgICBzZWxmLl9zdGFydCgpCisgICAgICAgICAg ICBzZWxmLl9zdGFydChkcml2ZXJfaW5wdXQuaXNfcmVmdGVzdCBvciBzZWxmLl9waXhlbF90ZXN0 cywgZHJpdmVyX2lucHV0LmFyZ3MpCiAgICAgICAgIHNlbGYuZXJyb3JfZnJvbV90ZXN0ID0gc3Ry KCkKICAgICAgICAgc2VsZi5lcnJfc2Vlbl9lb2YgPSBGYWxzZQogCkBAIC02NDUsMTAgKzY0OCw2 IEBAIGNsYXNzIFdlYktpdERyaXZlcihEcml2ZXIpOgogICAgICAgICBibG9jay5kZWNvZGVfY29u dGVudCgpCiAgICAgICAgIHJldHVybiBibG9jawogCi0gICAgZGVmIHN0YXJ0KHNlbGYpOgotICAg ICAgICBpZiBub3Qgc2VsZi5fc2VydmVyX3Byb2Nlc3M6Ci0gICAgICAgICAgICBzZWxmLl9zdGFy dCgpCi0KICAgICBkZWYgc3RvcChzZWxmKToKICAgICAgICAgaWYgc2VsZi5fc2VydmVyX3Byb2Nl c3M6CiAgICAgICAgICAgICBzZWxmLl9zZXJ2ZXJfcHJvY2Vzcy5zdG9wKCkKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0X3VuaXR0ZXN0 LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRfdW5p dHRlc3QucHkKaW5kZXggZmZhYWU2ZWI3NjU1Yjg5OTNiZTRhNTE5ZDhhNWMzZTkyMWZkYWY4NC4u YWFkYmY3MmZkMzU3NzgzOWY5MmY4Y2IwN2ZlOTFiZDNlZTFjYWFjZiAxMDA3NTUKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93ZWJraXRfdW5p dHRlc3QucHkKQEAgLTMwMCw0ICszMDAsNCBAQCBjbGFzcyBXZWJLaXREcml2ZXJUZXN0KHVuaXR0 ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9ub190aW1lb3V0KHNlbGYpOgogICAgICAgICBw b3J0ID0gVGVzdFdlYktpdFBvcnQoKQogICAgICAgICBkcml2ZXIgPSBXZWJLaXREcml2ZXIocG9y dCwgMCwgcGl4ZWxfdGVzdHM9VHJ1ZSwgbm9fdGltZW91dD1UcnVlKQotICAgICAgICBzZWxmLmFz c2VydEVxdWFscyhkcml2ZXIuY21kX2xpbmUoKSwgWydNT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9j ZXNzL0R1bXBSZW5kZXJUcmVlJywgJy0tcGl4ZWwtdGVzdHMnLCAnLS1uby10aW1lb3V0JywgJy0n XSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZHJpdmVyLmNtZF9saW5lKFRydWUsIFtdKSwg WydNT0NLIG91dHB1dCBvZiBjaGlsZCBwcm9jZXNzL0R1bXBSZW5kZXJUcmVlJywgJy0tbm8tdGlt ZW91dCcsICctLXBpeGVsLXRlc3RzJywgJy0nXSkK