104047 2012-12-04 15:01:07 -0800 nrwt: make paths and test_names passed arguments in Manager._prepare_lists et al 2012-12-04 15:42:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103824 104048 1 dpranke dpranke abarth eric ojan rniwa oldest_to_newest 782989 0 dpranke 2012-12-04 15:01:07 -0800 nrwt: make paths and test_names passed arguments in Manager._prepare_lists et al 782994 1 177578 dpranke 2012-12-04 15:03:02 -0800 Created attachment 177578 Patch 783005 2 177578 eric 2012-12-04 15:08:50 -0800 Comment on attachment 177578 Patch Seems reasonable 783046 3 dpranke 2012-12-04 15:42:27 -0800 Committed r136585: <http://trac.webkit.org/changeset/136585> 177578 2012-12-04 15:03:02 -0800 2012-12-04 15:08:50 -0800 Patch bug-104047-20121204150028.patch text/plain 15478 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NTgyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDY3ZTU2YThhZWEwZWE2ZDRjNzBiNDNjODNhYWNjYmUx ZmQ4MDdlZC4uYjg0ZmE5MjljNDI1MGFhMDBjODBmODYzNjU4OGQ0NGIxODgzZWNmNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5 IEBACiAyMDEyLTEyLTA0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG1ha2UgcGF0aHMgYW5kIHRlc3RfbmFtZXMgcGFzc2VkIGFyZ3VtZW50cyBp biBNYW5hZ2VyLl9wcmVwYXJlX2xpc3RzIGV0IGFsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQwNDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY29kZSBiZWNvbWVzIGNsZWFuZXIgaWYgd2UgYXJl IGp1c3QgcGFzc2luZyB2YWx1ZXMgYXJvdW5kIHJhdGhlcgorICAgICAgICB0aGFuIGhhbmdpbmcg dGhlbSBvZmYgdGhlIG1hbmFnZXIgb2JqZWN0LCBoZWxwcyBtb3ZlIF9wcmVwYXJlX2xpc3RzKCkK KyAgICAgICAgdG8gYSBwdXJlIGZ1bmN0aW9uLCBhbmQgaXMgbmVlZGVkIHRvIGV2ZW50dWFsbHkg bWFrZSB0aGUKKyAgICAgICAgcmVzdWx0X3N1bW1hcnkgb2JqZWN0IHNvbWV0aGluZyByZXR1cm5l ZCBmcm9tIHJ1bm5lci5ydW5fdGVzdHMoKQorICAgICAgICAobm90ZSB0aGF0IHR3byBtb3JlIHBh dGNoZXMgYXJlIG5lZWRlZCBmb3IgdGhhdCB0byBoYXBwZW4pLgorCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAg KE1hbmFnZXIuX19pbml0X18pOgorICAgICAgICAoTWFuYWdlci5faHR0cF90ZXN0cyk6CisgICAg ICAgIChNYW5hZ2VyLl9wcmVwYXJlX2xpc3RzKToKKyAgICAgICAgKE1hbmFnZXIubmVlZHNfc2Vy dmVycyk6CisgICAgICAgIChNYW5hZ2VyLl9zZXRfdXBfcnVuKToKKyAgICAgICAgKE1hbmFnZXIu cnVuKToKKyAgICAgICAgKE1hbmFnZXIuX3J1bl90ZXN0cyk6CisgICAgICAgIChNYW5hZ2VyLl91 cGxvYWRfanNvbl9maWxlcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weToKKyAgICAgICAgKE1hbmFnZXJUZXN0 LnRlc3RfbmVlZHNfc2VydmVycy5nZXRfbWFuYWdlcik6CisgICAgICAgIChNYW5hZ2VyVGVzdC50 ZXN0X25lZWRzX3NlcnZlcnMpOgorICAgICAgICAoTWFuYWdlclRlc3QuaW50ZWdyYXRpb25fdGVz dF9uZWVkc19zZXJ2ZXJzLmdldF9tYW5hZ2VyKToKKyAgICAgICAgKE1hbmFnZXJUZXN0LmludGVn cmF0aW9uX3Rlc3RfbmVlZHNfc2VydmVycyk6CisgICAgICAgIChNYW5hZ2VyVGVzdC50ZXN0X2xv b2tfZm9yX25ld19jcmFzaF9sb2dzLmdldF9tYW5hZ2VyKToKKyAgICAgICAgKE1hbmFnZXJUZXN0 KToKKyAgICAgICAgKE1hbmFnZXJUZXN0LnRlc3RfbG9va19mb3JfbmV3X2NyYXNoX2xvZ3MpOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pz b25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5OgorICAgICAgICAoSlNPTkxheW91dFJlc3Vs dHNHZW5lcmF0b3IuX19pbml0X18pOgorICAgICAgICAoSlNPTkxheW91dFJlc3VsdHNHZW5lcmF0 b3IuX2dldF9tb2RpZmllcl9jaGFyKToKKworMjAxMi0xMi0wNCAgRGlyayBQcmFua2UgIDxkcHJh bmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICBucnd0OiBzdG9yZSBvbmx5IHRoZSB0b3RhbCBu dW1iZXIgb2YgdGVzdHMgaW4gdGhlIHJlc3VsdCBzdW1tYXJ5CiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDM5NjMKIApkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkK aW5kZXggMjA0MTQwNDMyM2UwZGI5MTQ4ZTlhMTgxMjhjNjcwYTZiMGRjN2JkNi4uYmIwOThkOTYw MzExNTA1ZTk3NTZhYTc2MmIzMzNjYzYwOGNhZDMzZiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CkBA IC0yODEsOCArMjgxLDYgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAjIHNlbGYu X3dlYnNvY2tldF9zZWN1cmVfc2VydmVyID0gd2Vic29ja2V0X3NlcnZlci5QeVdlYlNvY2tldCgK ICAgICAgICAgIyAgICAgICAgb3B0aW9ucy5yZXN1bHRzX2RpcmVjdG9yeSwgdXNlX3Rscz1UcnVl LCBwb3J0PTkzMjMpCiAKLSAgICAgICAgc2VsZi5fcGF0aHMgPSBzZXQoKQotICAgICAgICBzZWxm Ll90ZXN0X25hbWVzID0gTm9uZQogICAgICAgICBzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSA9IHNl bGYuX3BvcnQucmVzdWx0c19kaXJlY3RvcnkoKQogICAgICAgICBzZWxmLl9maW5kZXIgPSBMYXlv dXRUZXN0RmluZGVyKHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMpCiAgICAgICAgIHNlbGYuX3J1 bm5lciA9IExheW91dFRlc3RSdW5uZXIoc2VsZi5fb3B0aW9ucywgc2VsZi5fcG9ydCwgc2VsZi5f cHJpbnRlciwgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksIHNlbGYuX2V4cGVjdGF0aW9ucywgc2Vs Zi5fdGVzdF9pc19zbG93KQpAQCAtMjk2LDQyICsyOTQsMzQgQEAgY2xhc3MgTWFuYWdlcihvYmpl Y3QpOgogICAgIGRlZiBfaXNfd2Vic29ja2V0X3Rlc3Qoc2VsZiwgdGVzdCk6CiAgICAgICAgIHJl dHVybiBzZWxmLldFQlNPQ0tFVF9TVUJESVIgaW4gdGVzdAogCi0gICAgZGVmIF9odHRwX3Rlc3Rz KHNlbGYpOgotICAgICAgICByZXR1cm4gc2V0KHRlc3QgZm9yIHRlc3QgaW4gc2VsZi5fdGVzdF9u YW1lcyBpZiBzZWxmLl9pc19odHRwX3Rlc3QodGVzdCkpCisgICAgZGVmIF9odHRwX3Rlc3RzKHNl bGYsIHRlc3RfbmFtZXMpOgorICAgICAgICByZXR1cm4gc2V0KHRlc3QgZm9yIHRlc3QgaW4gdGVz dF9uYW1lcyBpZiBzZWxmLl9pc19odHRwX3Rlc3QodGVzdCkpCiAKICAgICBkZWYgX2lzX3BlcmZf dGVzdChzZWxmLCB0ZXN0KToKICAgICAgICAgcmV0dXJuIHNlbGYuUEVSRl9TVUJESVIgPT0gdGVz dCBvciAoc2VsZi5QRVJGX1NVQkRJUiArIHNlbGYuX3BvcnQuVEVTVF9QQVRIX1NFUEFSQVRPUikg aW4gdGVzdAogCi0gICAgZGVmIF9wcmVwYXJlX2xpc3RzKHNlbGYpOgotICAgICAgICB0ZXN0c190 b19za2lwID0gc2VsZi5fZmluZGVyLnNraXBfdGVzdHMoc2VsZi5fcGF0aHMsIHNlbGYuX3Rlc3Rf bmFtZXMsIHNlbGYuX2V4cGVjdGF0aW9ucywgc2VsZi5faHR0cF90ZXN0cygpKQotICAgICAgICBz ZWxmLl90ZXN0X25hbWVzID0gW3Rlc3QgZm9yIHRlc3QgaW4gc2VsZi5fdGVzdF9uYW1lcyBpZiB0 ZXN0IG5vdCBpbiB0ZXN0c190b19za2lwXQorICAgIGRlZiBfcHJlcGFyZV9saXN0cyhzZWxmLCBw YXRocywgdGVzdF9uYW1lcyk6CisgICAgICAgIHRlc3RzX3RvX3NraXAgPSBzZWxmLl9maW5kZXIu c2tpcF90ZXN0cyhwYXRocywgdGVzdF9uYW1lcywgc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl9o dHRwX3Rlc3RzKHRlc3RfbmFtZXMpKQorICAgICAgICB0ZXN0c190b19ydW4gPSBbdGVzdCBmb3Ig dGVzdCBpbiB0ZXN0X25hbWVzIGlmIHRlc3Qgbm90IGluIHRlc3RzX3RvX3NraXBdCiAKICAgICAg ICAgIyBDcmVhdGUgYSBzb3J0ZWQgbGlzdCBvZiB0ZXN0IGZpbGVzIHNvIHRoZSBzdWJzZXQgY2h1 bmssCiAgICAgICAgICMgaWYgdXNlZCwgY29udGFpbnMgYWxwaGFiZXRpY2FsbHkgY29uc2VjdXRp dmUgdGVzdHMuCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMub3JkZXIgPT0gJ25hdHVyYWwnOgot ICAgICAgICAgICAgc2VsZi5fdGVzdF9uYW1lcy5zb3J0KGtleT1zZWxmLl9wb3J0LnRlc3Rfa2V5 KQorICAgICAgICAgICAgdGVzdHNfdG9fcnVuLnNvcnQoa2V5PXNlbGYuX3BvcnQudGVzdF9rZXkp CiAgICAgICAgIGVsaWYgc2VsZi5fb3B0aW9ucy5vcmRlciA9PSAncmFuZG9tJzoKLSAgICAgICAg ICAgIHJhbmRvbS5zaHVmZmxlKHNlbGYuX3Rlc3RfbmFtZXMpCisgICAgICAgICAgICByYW5kb20u c2h1ZmZsZSh0ZXN0c190b19ydW4pCiAKLSAgICAgICAgc2VsZi5fdGVzdF9uYW1lcywgdGVzdHNf aW5fb3RoZXJfY2h1bmtzID0gc2VsZi5fZmluZGVyLnNwbGl0X2ludG9fY2h1bmtzKHNlbGYuX3Rl c3RfbmFtZXMpCisgICAgICAgIHRlc3RzX3RvX3J1biwgdGVzdHNfaW5fb3RoZXJfY2h1bmtzID0g c2VsZi5fZmluZGVyLnNwbGl0X2ludG9fY2h1bmtzKHRlc3RzX3RvX3J1bikKICAgICAgICAgc2Vs Zi5fZXhwZWN0YXRpb25zLmFkZF9za2lwcGVkX3Rlc3RzKHRlc3RzX2luX290aGVyX2NodW5rcykK ICAgICAgICAgdGVzdHNfdG9fc2tpcC51cGRhdGUodGVzdHNfaW5fb3RoZXJfY2h1bmtzKQogCi0g ICAgICAgIGlmIHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2ggPiAxOgotICAgICAgICAgICAgbGlz dF93aXRoX3JlcGV0aXRpb25zID0gW10KLSAgICAgICAgICAgIGZvciB0ZXN0IGluIHNlbGYuX3Rl c3RfbmFtZXM6Ci0gICAgICAgICAgICAgICAgbGlzdF93aXRoX3JlcGV0aXRpb25zICs9IChbdGVz dF0gKiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoKQotICAgICAgICAgICAgc2VsZi5fdGVzdF9u YW1lcyA9IGxpc3Rfd2l0aF9yZXBldGl0aW9ucworICAgICAgICBzdW1tYXJ5ID0gUmVzdWx0U3Vt bWFyeShzZWxmLl9leHBlY3RhdGlvbnMsIGxlbih0ZXN0c190b19ydW4pICogc2VsZi5fb3B0aW9u cy5yZXBlYXRfZWFjaCAqIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucykKIAotICAgICAgICBpZiBz ZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMgPiAxOgotICAgICAgICAgICAgc2VsZi5fdGVzdF9uYW1l cyA9IHNlbGYuX3Rlc3RfbmFtZXMgKiBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMKLQotICAgICAg ICBzdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShzZWxmLl9leHBlY3RhdGlvbnMsIGxlbihzZWxmLl90 ZXN0X25hbWVzKSkKICAgICAgICAgZm9yIHRlc3RfbmFtZSBpbiBzZXQodGVzdHNfdG9fc2tpcCk6 CiAgICAgICAgICAgICByZXN1bHQgPSB0ZXN0X3Jlc3VsdHMuVGVzdFJlc3VsdCh0ZXN0X25hbWUp CiAgICAgICAgICAgICByZXN1bHQudHlwZSA9IHRlc3RfZXhwZWN0YXRpb25zLlNLSVAKICAgICAg ICAgICAgIHN1bW1hcnkuYWRkKHJlc3VsdCwgZXhwZWN0ZWQ9VHJ1ZSwgdGVzdF9pc19zbG93PXNl bGYuX3Rlc3RfaXNfc2xvdyh0ZXN0X25hbWUpKQotICAgICAgICByZXR1cm4gc3VtbWFyeQorICAg ICAgICByZXR1cm4gc3VtbWFyeSwgdGVzdHNfdG9fcnVuCiAKICAgICBkZWYgX3Rlc3RfaW5wdXRf Zm9yX2ZpbGUoc2VsZiwgdGVzdF9maWxlKToKICAgICAgICAgcmV0dXJuIFRlc3RJbnB1dCh0ZXN0 X2ZpbGUsCkBAIC0zNDgsMTIgKzMzOCwxMiBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAg ZGVmIF90ZXN0X2lzX3Nsb3coc2VsZiwgdGVzdF9maWxlKToKICAgICAgICAgcmV0dXJuIHNlbGYu X2V4cGVjdGF0aW9ucy5oYXNfbW9kaWZpZXIodGVzdF9maWxlLCB0ZXN0X2V4cGVjdGF0aW9ucy5T TE9XKQogCi0gICAgZGVmIG5lZWRzX3NlcnZlcnMoc2VsZik6Ci0gICAgICAgIHJldHVybiBhbnko c2VsZi5fdGVzdF9yZXF1aXJlc19sb2NrKHRlc3RfbmFtZSkgZm9yIHRlc3RfbmFtZSBpbiBzZWxm Ll90ZXN0X25hbWVzKSBhbmQgc2VsZi5fb3B0aW9ucy5odHRwCisgICAgZGVmIG5lZWRzX3NlcnZl cnMoc2VsZiwgdGVzdF9uYW1lcyk6CisgICAgICAgIHJldHVybiBhbnkoc2VsZi5fdGVzdF9yZXF1 aXJlc19sb2NrKHRlc3RfbmFtZSkgZm9yIHRlc3RfbmFtZSBpbiB0ZXN0X25hbWVzKSBhbmQgc2Vs Zi5fb3B0aW9ucy5odHRwCiAKLSAgICBkZWYgX3NldF91cF9ydW4oc2VsZik6CisgICAgZGVmIF9z ZXRfdXBfcnVuKHNlbGYsIHRlc3RfbmFtZXMpOgogICAgICAgICBzZWxmLl9wcmludGVyLndyaXRl X3VwZGF0ZSgiQ2hlY2tpbmcgYnVpbGQgLi4uIikKLSAgICAgICAgaWYgbm90IHNlbGYuX3BvcnQu Y2hlY2tfYnVpbGQoc2VsZi5uZWVkc19zZXJ2ZXJzKCkpOgorICAgICAgICBpZiBub3Qgc2VsZi5f cG9ydC5jaGVja19idWlsZChzZWxmLm5lZWRzX3NlcnZlcnModGVzdF9uYW1lcykpOgogICAgICAg ICAgICAgX2xvZy5lcnJvcigiQnVpbGQgY2hlY2sgZmFpbGVkIikKICAgICAgICAgICAgIHJldHVy biBGYWxzZQogCkBAIC0zNjYsNyArMzU2LDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAg ICAgICAjIENoZWNrIHRoYXQgdGhlIHN5c3RlbSBkZXBlbmRlbmNpZXMgKHRoZW1lcywgZm9udHMs IC4uLikgYXJlIGNvcnJlY3QuCiAgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLm5vY2hlY2tf c3lzX2RlcHM6CiAgICAgICAgICAgICBzZWxmLl9wcmludGVyLndyaXRlX3VwZGF0ZSgiQ2hlY2tp bmcgc3lzdGVtIGRlcGVuZGVuY2llcyAuLi4iKQotICAgICAgICAgICAgaWYgbm90IHNlbGYuX3Bv cnQuY2hlY2tfc3lzX2RlcHMoc2VsZi5uZWVkc19zZXJ2ZXJzKCkpOgorICAgICAgICAgICAgaWYg bm90IHNlbGYuX3BvcnQuY2hlY2tfc3lzX2RlcHMoc2VsZi5uZWVkc19zZXJ2ZXJzKHRlc3RfbmFt ZXMpKToKICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LnN0b3BfaGVscGVyKCkKICAgICAgICAg ICAgICAgICByZXR1cm4gRmFsc2UKIApAQCAtMzgzLDMyICszNzMsMzIgQEAgY2xhc3MgTWFuYWdl cihvYmplY3QpOgogICAgICAgICAiIiJSdW4gYWxsIG91ciB0ZXN0cyBvbiBhbGwgb3VyIHRlc3Qg ZmlsZXMgYW5kIHJldHVybiB0aGUgbnVtYmVyIG9mIHVuZXhwZWN0ZWQgcmVzdWx0cyAoMCA9PSBz dWNjZXNzKS4iIiIKICAgICAgICAgc2VsZi5fcHJpbnRlci53cml0ZV91cGRhdGUoIkNvbGxlY3Rp bmcgdGVzdHMgLi4uIikKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi5fcGF0aHMsIHNl bGYuX3Rlc3RfbmFtZXMgPSBzZWxmLl9jb2xsZWN0X3Rlc3RzKGFyZ3MpCisgICAgICAgICAgICBw YXRocywgdGVzdF9uYW1lcyA9IHNlbGYuX2NvbGxlY3RfdGVzdHMoYXJncykKICAgICAgICAgZXhj ZXB0IElPRXJyb3IgYXMgZXhjZXB0aW9uOgogICAgICAgICAgICAgIyBUaGlzIGlzIHJhaXNlZCBp ZiAtLXRlc3QtbGlzdCBkb2Vzbid0IGV4aXN0CiAgICAgICAgICAgICByZXR1cm4gLTEKIAogICAg ICAgICBzZWxmLl9wcmludGVyLndyaXRlX3VwZGF0ZSgiUGFyc2luZyBleHBlY3RhdGlvbnMgLi4u IikKLSAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4 cGVjdGF0aW9ucyhzZWxmLl9wb3J0LCBzZWxmLl90ZXN0X25hbWVzKQorICAgICAgICBzZWxmLl9l eHBlY3RhdGlvbnMgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRpb25zKHNlbGYuX3Bv cnQsIHRlc3RfbmFtZXMpCiAKLSAgICAgICAgbnVtX2FsbF90ZXN0X2ZpbGVzX2ZvdW5kID0gbGVu KHNlbGYuX3Rlc3RfbmFtZXMpCi0gICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gc2VsZi5fcHJlcGFy ZV9saXN0cygpCisgICAgICAgIG51bV9hbGxfdGVzdF9maWxlc19mb3VuZCA9IGxlbih0ZXN0X25h bWVzKQorICAgICAgICByZXN1bHRfc3VtbWFyeSwgdGVzdF9uYW1lcyA9IHNlbGYuX3ByZXBhcmVf bGlzdHMocGF0aHMsIHRlc3RfbmFtZXMpCiAKICAgICAgICAgIyBDaGVjayB0byBtYWtlIHN1cmUg d2UncmUgbm90IHNraXBwaW5nIGV2ZXJ5IHRlc3QuCi0gICAgICAgIGlmIG5vdCBzZWxmLl90ZXN0 X25hbWVzOgorICAgICAgICBpZiBub3QgdGVzdF9uYW1lczoKICAgICAgICAgICAgIF9sb2cuY3Jp dGljYWwoJ05vIHRlc3RzIHRvIHJ1bi4nKQogICAgICAgICAgICAgcmV0dXJuIC0xCiAKLSAgICAg ICAgc2VsZi5fcHJpbnRlci5wcmludF9mb3VuZChudW1fYWxsX3Rlc3RfZmlsZXNfZm91bmQsIGxl bihzZWxmLl90ZXN0X25hbWVzKSwgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCwgc2VsZi5fb3B0 aW9ucy5pdGVyYXRpb25zKQorICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2ZvdW5kKG51bV9h bGxfdGVzdF9maWxlc19mb3VuZCwgbGVuKHRlc3RfbmFtZXMpLCBzZWxmLl9vcHRpb25zLnJlcGVh dF9lYWNoLCBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMpCiAgICAgICAgIHNlbGYuX3ByaW50ZXIu cHJpbnRfZXhwZWN0ZWQocmVzdWx0X3N1bW1hcnksIHNlbGYuX2V4cGVjdGF0aW9ucy5nZXRfdGVz dHNfd2l0aF9yZXN1bHRfdHlwZSkKIAotICAgICAgICBpZiBub3Qgc2VsZi5fc2V0X3VwX3J1bigp OgorICAgICAgICBpZiBub3Qgc2VsZi5fc2V0X3VwX3J1bih0ZXN0X25hbWVzKToKICAgICAgICAg ICAgIHJldHVybiAtMQogCiAgICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQogCiAgICAg ICAgIHRyeToKLSAgICAgICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gc2VsZi5fcnVuX3Rlc3RzKHNl bGYuX3Rlc3RfbmFtZXMsIHJlc3VsdF9zdW1tYXJ5LCBpbnQoc2VsZi5fb3B0aW9ucy5jaGlsZF9w cm9jZXNzZXMpLCByZXRyeWluZz1GYWxzZSkKKyAgICAgICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0g c2VsZi5fcnVuX3Rlc3RzKHRlc3RfbmFtZXMsIHJlc3VsdF9zdW1tYXJ5LCBpbnQoc2VsZi5fb3B0 aW9ucy5jaGlsZF9wcm9jZXNzZXMpLCByZXRyeWluZz1GYWxzZSkKIAogICAgICAgICAgICAgIyBX ZSBleGNsdWRlIHRoZSBjcmFzaGVzIGZyb20gdGhlIGxpc3Qgb2YgcmVzdWx0cyB0byByZXRyeSwg YmVjYXVzZQogICAgICAgICAgICAgIyB3ZSB3YW50IHRvIHRyZWF0IGV2ZW4gYSBwb3RlbnRpYWxs eSBmbGFreSBjcmFzaCBhcyBhbiBlcnJvci4KQEAgLTQ1NCw5ICs0NDQsMTMgQEAgY2xhc3MgTWFu YWdlcihvYmplY3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fcG9ydC5leGl0X2NvZGVfZnJvbV9z dW1tYXJpemVkX3Jlc3VsdHModW5leHBlY3RlZF9yZXN1bHRzKQogCiAgICAgZGVmIF9ydW5fdGVz dHMoc2VsZiwgdGVzdHMsIHJlc3VsdF9zdW1tYXJ5LCBudW1fd29ya2VycywgcmV0cnlpbmcpOgot ICAgICAgICB0ZXN0X2lucHV0cyA9IFtzZWxmLl90ZXN0X2lucHV0X2Zvcl9maWxlKHRlc3QpIGZv ciB0ZXN0IGluIHRlc3RzXQogICAgICAgICBuZWVkc19odHRwID0gc2VsZi5fcG9ydC5yZXF1aXJl c19odHRwX3NlcnZlcigpIG9yIGFueShzZWxmLl9pc19odHRwX3Rlc3QodGVzdCkgZm9yIHRlc3Qg aW4gdGVzdHMpCiAgICAgICAgIG5lZWRzX3dlYnNvY2tldHMgPSBhbnkoc2VsZi5faXNfd2Vic29j a2V0X3Rlc3QodGVzdCkgZm9yIHRlc3QgaW4gdGVzdHMpCisgICAgICAgIHRlc3RfaW5wdXRzID0g W10KKyAgICAgICAgZm9yIF8gaW4geHJhbmdlKHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucyk6Cisg ICAgICAgICAgICBmb3IgdGVzdCBpbiB0ZXN0czoKKyAgICAgICAgICAgICAgICBmb3IgXyBpbiB4 cmFuZ2Uoc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCk6CisgICAgICAgICAgICAgICAgICAgIHRl c3RfaW5wdXRzLmFwcGVuZChzZWxmLl90ZXN0X2lucHV0X2Zvcl9maWxlKHRlc3QpKQogICAgICAg ICByZXR1cm4gc2VsZi5fcnVubmVyLnJ1bl90ZXN0cyh0ZXN0X2lucHV0cywgc2VsZi5fZXhwZWN0 YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgbnVtX3dvcmtlcnMsIG5lZWRzX2h0dHAsIG5lZWRzX3dl YnNvY2tldHMsIHJldHJ5aW5nKQogCiAgICAgZGVmIF9jbGVhbl91cF9ydW4oc2VsZik6CkBAIC01 MzgsNyArNTMyLDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5f cG9ydCwgc2VsZi5fb3B0aW9ucy5idWlsZGVyX25hbWUsIHNlbGYuX29wdGlvbnMuYnVpbGRfbmFt ZSwKICAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuYnVpbGRfbnVtYmVyLCBzZWxmLl9yZXN1bHRz X2RpcmVjdG9yeSwKICAgICAgICAgICAgIEJVSUxERVJfQkFTRV9VUkwsCi0gICAgICAgICAgICBz ZWxmLl9leHBlY3RhdGlvbnMsIHJlc3VsdF9zdW1tYXJ5LCBzZWxmLl90ZXN0X25hbWVzLAorICAg ICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwKICAgICAgICAgICAg IHNlbGYuX29wdGlvbnMudGVzdF9yZXN1bHRzX3NlcnZlciwKICAgICAgICAgICAgICJsYXlvdXQt dGVzdHMiLAogICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5tYXN0ZXJfbmFtZSkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250 cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CmluZGV4IDQwZDA1OThjZGU3ZDQ5MDJiOWRlYzI5 MDBhMjA4ZGUwODBmNzhhZWEuLmZiNWYxOGNhMWUzMTJhZTVmMWUxMTQzZDBhMTAzOWIzYzgwYzUx NzUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weQpAQCAtNDUsNTMgKzQ1 LDUwIEBAIGZyb20gd2Via2l0cHkudG9vbC5tb2NrdG9vbCBpbXBvcnQgTW9ja09wdGlvbnMKIAog Y2xhc3MgTWFuYWdlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiB0ZXN0X25lZWRz X3NlcnZlcnMoc2VsZik6Ci0gICAgICAgIGRlZiBnZXRfbWFuYWdlcl93aXRoX3Rlc3RzKHRlc3Rf bmFtZXMpOgorICAgICAgICBkZWYgZ2V0X21hbmFnZXIoKToKICAgICAgICAgICAgIHBvcnQgPSBN b2NrKCkgICMgRklYTUU6IFVzZSBhIHRpZ2h0ZXIgbW9jay4KICAgICAgICAgICAgIHBvcnQuVEVT VF9QQVRIX1NFUEFSQVRPUiA9ICcvJwogICAgICAgICAgICAgbWFuYWdlciA9IE1hbmFnZXIocG9y dCwgb3B0aW9ucz1Nb2NrT3B0aW9ucyhodHRwPVRydWUsIG1heF9sb2NrZWRfc2hhcmRzPTEpLCBw cmludGVyPU1vY2soKSkKLSAgICAgICAgICAgIG1hbmFnZXIuX3Rlc3RfbmFtZXMgPSB0ZXN0X25h bWVzCiAgICAgICAgICAgICByZXR1cm4gbWFuYWdlcgogCi0gICAgICAgIG1hbmFnZXIgPSBnZXRf bWFuYWdlcl93aXRoX3Rlc3RzKFsnZmFzdC9odG1sJ10pCi0gICAgICAgIHNlbGYuYXNzZXJ0RmFs c2UobWFuYWdlci5uZWVkc19zZXJ2ZXJzKCkpCisgICAgICAgIG1hbmFnZXIgPSBnZXRfbWFuYWdl cigpCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UobWFuYWdlci5uZWVkc19zZXJ2ZXJzKFsnZmFz dC9odG1sJ10pKQogCi0gICAgICAgIG1hbmFnZXIgPSBnZXRfbWFuYWdlcl93aXRoX3Rlc3RzKFsn aHR0cC90ZXN0cy9taXNjJ10pCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShtYW5hZ2VyLm5lZWRz X3NlcnZlcnMoKSkKKyAgICAgICAgbWFuYWdlciA9IGdldF9tYW5hZ2VyKCkKKyAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKG1hbmFnZXIubmVlZHNfc2VydmVycyhbJ2h0dHAvdGVzdHMvbWlzYyddKSkK IAogICAgIGRlZiBpbnRlZ3JhdGlvbl90ZXN0X25lZWRzX3NlcnZlcnMoc2VsZik6Ci0gICAgICAg IGRlZiBnZXRfbWFuYWdlcl93aXRoX3Rlc3RzKHRlc3RfbmFtZXMpOgorICAgICAgICBkZWYgZ2V0 X21hbmFnZXIoKToKICAgICAgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAgICAgICAgICBw b3J0ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCkKICAgICAgICAgICAgIG1hbmFnZXIgPSBNYW5h Z2VyKHBvcnQsIG9wdGlvbnM9TW9ja09wdGlvbnModGVzdF9saXN0PU5vbmUsIGh0dHA9VHJ1ZSwg bWF4X2xvY2tlZF9zaGFyZHM9MSksIHByaW50ZXI9TW9jaygpKQotICAgICAgICAgICAgbWFuYWdl ci5fY29sbGVjdF90ZXN0cyh0ZXN0X25hbWVzKQogICAgICAgICAgICAgcmV0dXJuIG1hbmFnZXIK IAotICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0aF90ZXN0cyhbJ2Zhc3QvaHRtbCdd KQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG1hbmFnZXIubmVlZHNfc2VydmVycygpKQorICAg ICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXIoKQorICAgICAgICBzZWxmLmFzc2VydEZhbHNlKG1h bmFnZXIubmVlZHNfc2VydmVycyhbJ2Zhc3QvaHRtbCddKSkKIAotICAgICAgICBtYW5hZ2VyID0g Z2V0X21hbmFnZXJfd2l0aF90ZXN0cyhbJ2h0dHAvdGVzdHMvbWltZSddKQotICAgICAgICBzZWxm LmFzc2VydFRydWUobWFuYWdlci5uZWVkc19zZXJ2ZXJzKCkpCisgICAgICAgIG1hbmFnZXIgPSBn ZXRfbWFuYWdlcigpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShtYW5hZ2VyLm5lZWRzX3NlcnZl cnMoWydodHRwL3Rlc3RzL21pbWUnXSkpCiAKICAgICAgICAgaWYgc3lzLnBsYXRmb3JtID09ICd3 aW4zMic6Ci0gICAgICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0aF90ZXN0cyhbJ2Zh c3RcXGh0bWwnXSkKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UobWFuYWdlci5uZWVkc19z ZXJ2ZXJzKCkpCisgICAgICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXIoKQorICAgICAgICAg ICAgc2VsZi5hc3NlcnRGYWxzZShtYW5hZ2VyLm5lZWRzX3NlcnZlcnMoWydmYXN0XFxodG1sJ10p KQogCi0gICAgICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0aF90ZXN0cyhbJ2h0dHBc XHRlc3RzXFxtaW1lJ10pCi0gICAgICAgICAgICBzZWxmLmFzc2VydFRydWUobWFuYWdlci5uZWVk c19zZXJ2ZXJzKCkpCisgICAgICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXIoKQorICAgICAg ICAgICAgc2VsZi5hc3NlcnRUcnVlKG1hbmFnZXIubmVlZHNfc2VydmVycyhbJ2h0dHBcXHRlc3Rz XFxtaW1lJ10pKQogCiAgICAgZGVmIHRlc3RfbG9va19mb3JfbmV3X2NyYXNoX2xvZ3Moc2VsZik6 Ci0gICAgICAgIGRlZiBnZXRfbWFuYWdlcl93aXRoX3Rlc3RzKHRlc3RfbmFtZXMpOgorICAgICAg ICBkZWYgZ2V0X21hbmFnZXIoKToKICAgICAgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAg ICAgICAgICBwb3J0ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0LW1hYy1sZW9wYXJkJykK ICAgICAgICAgICAgIG1hbmFnZXIgPSBNYW5hZ2VyKHBvcnQsIG9wdGlvbnM9TW9ja09wdGlvbnMo dGVzdF9saXN0PU5vbmUsIGh0dHA9VHJ1ZSwgbWF4X2xvY2tlZF9zaGFyZHM9MSksIHByaW50ZXI9 TW9jaygpKQotICAgICAgICAgICAgbWFuYWdlci5fY29sbGVjdF90ZXN0cyh0ZXN0X25hbWVzKQog ICAgICAgICAgICAgcmV0dXJuIG1hbmFnZXIKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KCkKICAg ICAgICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVzdC1tYWMtbGVvcGFyZCcpCiAg ICAgICAgIHRlc3RzID0gWydmYWlsdXJlcy9leHBlY3RlZC9jcmFzaC5odG1sJ10KICAgICAgICAg ZXhwZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCB0 ZXN0cykKICAgICAgICAgcnMgPSBSZXN1bHRTdW1tYXJ5KGV4cGVjdGF0aW9ucywgbGVuKHRlc3Rz KSkKLSAgICAgICAgbWFuYWdlciA9IGdldF9tYW5hZ2VyX3dpdGhfdGVzdHModGVzdHMpCisgICAg ICAgIG1hbmFnZXIgPSBnZXRfbWFuYWdlcigpCiAgICAgICAgIG1hbmFnZXIuX2xvb2tfZm9yX25l d19jcmFzaF9sb2dzKHJzLCB0aW1lLnRpbWUoKSkKIAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX2xheW91dF9yZXN1 bHRzX2dlbmVyYXRvci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xh eW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CmluZGV4IDJmOWEz MjFkOTdmZjg3YzJmMGZhZDY0OTE5NTY0NDQwMDQyOGNkNTkuLmIxYjhhOTAwYTgwMTMwM2MyMGQ4 NTdjNmRiZjVkMzY5MDBhYWM2ODIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9y LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNr YWdlL2pzb25fbGF5b3V0X3Jlc3VsdHNfZ2VuZXJhdG9yLnB5CkBAIC01Miw3ICs1Miw3IEBAIGNs YXNzIEpTT05MYXlvdXRSZXN1bHRzR2VuZXJhdG9yKGpzb25fcmVzdWx0c19nZW5lcmF0b3IuSlNP TlJlc3VsdHNHZW5lcmF0b3JCYXNlCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgYnVp bGRlcl9uYW1lLCBidWlsZF9uYW1lLCBidWlsZF9udW1iZXIsCiAgICAgICAgIHJlc3VsdHNfZmls ZV9iYXNlX3BhdGgsIGJ1aWxkZXJfYmFzZV91cmwsCi0gICAgICAgIGV4cGVjdGF0aW9ucywgcmVz dWx0X3N1bW1hcnksIGFsbF90ZXN0cywKKyAgICAgICAgZXhwZWN0YXRpb25zLCByZXN1bHRfc3Vt bWFyeSwKICAgICAgICAgdGVzdF9yZXN1bHRzX3NlcnZlcj1Ob25lLCB0ZXN0X3R5cGU9IiIsIG1h c3Rlcl9uYW1lPSIiKToKICAgICAgICAgIiIiTW9kaWZpZXMgdGhlIHJlc3VsdHMuanNvbiBmaWxl LiBHcmFicyBpdCBvZmYgdGhlIGFyY2hpdmUgZGlyZWN0b3J5CiAgICAgICAgIGlmIGl0IGlzIG5v dCBmb3VuZCBsb2NhbGx5LgpAQCAtNzAsNyArNzAsNiBAQCBjbGFzcyBKU09OTGF5b3V0UmVzdWx0 c0dlbmVyYXRvcihqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLkpTT05SZXN1bHRzR2VuZXJhdG9yQmFz ZQogCiAgICAgICAgIHNlbGYuX3Jlc3VsdF9zdW1tYXJ5ID0gcmVzdWx0X3N1bW1hcnkKICAgICAg ICAgc2VsZi5fZmFpbHVyZXMgPSBkaWN0KCh0ZXN0X25hbWUsIHJlc3VsdF9zdW1tYXJ5LnJlc3Vs dHNbdGVzdF9uYW1lXS50eXBlKSBmb3IgdGVzdF9uYW1lIGluIHJlc3VsdF9zdW1tYXJ5LmZhaWx1 cmVzKQotICAgICAgICBzZWxmLl9hbGxfdGVzdHMgPSBhbGxfdGVzdHMKICAgICAgICAgc2VsZi5f dGVzdF90aW1pbmdzID0gcmVzdWx0X3N1bW1hcnkucmVzdWx0cwogCiAgICAgICAgIHNlbGYuZ2Vu ZXJhdGVfanNvbl9vdXRwdXQoKQpAQCAtMTA4LDcgKzEwNyw3IEBAIGNsYXNzIEpTT05MYXlvdXRS ZXN1bHRzR2VuZXJhdG9yKGpzb25fcmVzdWx0c19nZW5lcmF0b3IuSlNPTlJlc3VsdHNHZW5lcmF0 b3JCYXNlCiAKICAgICAjIG92ZXJyaWRlCiAgICAgZGVmIF9nZXRfbW9kaWZpZXJfY2hhcihzZWxm LCB0ZXN0X25hbWUpOgotICAgICAgICBpZiB0ZXN0X25hbWUgbm90IGluIHNlbGYuX2FsbF90ZXN0 czoKKyAgICAgICAgaWYgdGVzdF9uYW1lIG5vdCBpbiBzZWxmLl9yZXN1bHRfc3VtbWFyeS5yZXN1 bHRzOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuTk9fREFUQV9SRVNVTFQKIAogICAgICAgICBp ZiB0ZXN0X25hbWUgaW4gc2VsZi5fZmFpbHVyZXM6Cg==