92702 2012-07-30 19:09:02 -0700 nrwt: clean up self._test_files_list vs. self._test_files, other nits 2012-07-31 12:11:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92701 89267 92781 1 dpranke dpranke abarth eric ojan rniwa tony oldest_to_newest 682626 0 dpranke 2012-07-30 19:09:02 -0700 nrwt: clean up self._test_files_list vs. self._test_files, other nits 682628 1 155420 dpranke 2012-07-30 19:11:06 -0700 Created attachment 155420 Patch 683364 2 dpranke 2012-07-31 12:11:19 -0700 Committed r124236: <http://trac.webkit.org/changeset/124236> 155420 2012-07-30 19:11:06 -0700 2012-07-31 11:42:27 -0700 Patch bug-92702-20120730191050.patch text/plain 15359 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTM5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2QwNzQyNDM3NGU1OTE1MjU5NzgzMDdjOTllMWExNzM1 NzRhZjBiNy4uNGE0NmE4NjBkOTY5YWZkYWVmODU3ZmYyNWE2YjAzOTZkMWJiMWVlMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3 IEBACiAyMDEyLTA3LTMwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCB2cy4gc2VsZi5fdGVz dF9maWxlcywgb3RoZXIgbml0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTI3MDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBHZXQgcmlkIG9mIHNlbGYuX3Rlc3RfZmlsZXMsIHJlbmFtZSBzZWxmLl90ZXN0 X2ZpbGVzX2xpc3QgdG8KKyAgICAgICAgc2VsZi5fdGVzdF9uYW1lcyAocmVtb3ZpbmcgdGhlIGNv bmZ1c2lvbiBiZXR3ZWVuIHRoZSB0d28gZmllbGRzKS4KKworICAgICAgICBBbHNvIGlubGluZSB0 aGUgb25lIGNhbGwgdG8gX3BhcnNlX2V4cGVjdGF0aW9ucywgcmVtb3ZlIHRoZSBvbmUKKyAgICAg ICAgdXNlIG9mIG1vcmVfdGVzdHNfdG9fc2tpcCwgYW5kIGZpeCBhIGNvdXBsZSBvZiBtaW5vciBu aXRzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvZmluZGVyLnB5OgorICAgICAgICAoTGF5b3V0VGVzdEZpbmRlci5zcGxpdF9pbnRvX2NodW5r cyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlci5weToKKyAgICAgICAgKE1hbmFnZXIuX19pbml0X18pOgorICAgICAgICAoTWFuYWdl ci5fY29sbGVjdF90ZXN0cyk6CisgICAgICAgIChNYW5hZ2VyLl9odHRwX3Rlc3RzKToKKyAgICAg ICAgKE1hbmFnZXIuX3dlYnNvY2tldF90ZXN0cyk6CisgICAgICAgIChNYW5hZ2VyLl9pc19wZXJm X3Rlc3QpOgorICAgICAgICAoTWFuYWdlci5wcmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRwdXQp OgorICAgICAgICAoTWFuYWdlci5uZWVkc19zZXJ2ZXJzKToKKyAgICAgICAgKE1hbmFnZXIucnVu KToKKyAgICAgICAgKE1hbmFnZXIuX21hcmtfaW50ZXJydXB0ZWRfdGVzdHNfYXNfc2tpcHBlZCk6 CisgICAgICAgIChNYW5hZ2VyLl91cGRhdGVfc3VtbWFyeV93aXRoX3Jlc3VsdCk6CisgICAgICAg IChNYW5hZ2VyLl91cGxvYWRfanNvbl9maWxlcyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weToKKyAgICAgICAg KE1hbmFnZXJUZXN0LnRlc3RfaW50ZXJydXB0X2lmX2F0X2ZhaWx1cmVfbGltaXRzKToKKyAgICAg ICAgKE1hbmFnZXJUZXN0LnRlc3RfbmVlZHNfc2VydmVycy5nZXRfbWFuYWdlcl93aXRoX3Rlc3Rz KToKKyAgICAgICAgKE1hbmFnZXJUZXN0LnRlc3Rfc2VydmVyc19zdGFydGVkKToKKworMjAxMi0w Ny0zMCAgRGlyayBQcmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICBucnd0 OiBtb3ZlIGhhbmRsaW5nIHRoZSBpbml0aWFsIGxpc3Qgb2YgdGVzdHMgdG8gc2tpcCB0byBmaW5k ZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNzAx CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL2ZpbmRlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL2ZpbmRlci5weQppbmRleCBlNmZjYTcyM2RmZDdiM2NlMTdkMTBiNmZiYmJkZDYx NGFiNTM2ZDEwLi4yZmVhMjI2MGVkZGM0NmEyNzUxODQ2Y2ZiM2EyOWU2NjA4OGI1N2QxIDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9m aW5kZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvZmluZGVyLnB5CkBAIC0xMjAsOSArMTIwLDEwIEBAIGNsYXNzIExheW91dFRlc3RGaW5k ZXIob2JqZWN0KToKIAogICAgICAgICByZXR1cm4gdGVzdHNfdG9fc2tpcAogCi0gICAgZGVmIHNw bGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeShzZWxmLCB0ZXN0X2ZpbGVzX2xpc3QpOgorICAg IGRlZiBzcGxpdF9pbnRvX2NodW5rcyhzZWxmLCB0ZXN0X25hbWVzKToKKyAgICAgICAgIiIic3Bs aXQgaW50byBhIGxpc3QgdG8gcnVuIGFuZCBhIHNldCB0byBza2lwLCBiYXNlZCBvbiAtLXJ1bi1j aHVuayBhbmQgLS1ydW4tcGFydC4iIiIKICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMucnVu X2NodW5rIGFuZCBub3Qgc2VsZi5fb3B0aW9ucy5ydW5fcGFydDoKLSAgICAgICAgICAgIHJldHVy biB0ZXN0X2ZpbGVzX2xpc3QsIHNldCgpCisgICAgICAgICAgICByZXR1cm4gdGVzdF9uYW1lcywg c2V0KCkKIAogICAgICAgICAjIElmIHRoZSB1c2VyIHNwZWNpZmllcyB0aGV5IGp1c3Qgd2FudCB0 byBydW4gYSBzdWJzZXQgb2YgdGhlIHRlc3RzLAogICAgICAgICAjIGp1c3QgZ3JhYiBhIHN1YnNl dCBvZiB0aGUgbm9uLXNraXBwZWQgdGVzdHMuCkBAIC0xMzUsMTAgKzEzNiwxMCBAQCBjbGFzcyBM YXlvdXRUZXN0RmluZGVyKG9iamVjdCk6CiAgICAgICAgICAgICBhc3NlcnQodGVzdF9zaXplID4g MCkKICAgICAgICAgZXhjZXB0IEFzc2VydGlvbkVycm9yOgogICAgICAgICAgICAgX2xvZy5jcml0 aWNhbCgiaW52YWxpZCBjaHVuayAnJXMnIiAlIGNodW5rX3ZhbHVlKQotICAgICAgICAgICAgcmV0 dXJuIE5vbmUKKyAgICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSkKIAogICAgICAgICAjIEdl dCB0aGUgbnVtYmVyIG9mIHRlc3RzCi0gICAgICAgIG51bV90ZXN0cyA9IGxlbih0ZXN0X2ZpbGVz X2xpc3QpCisgICAgICAgIG51bV90ZXN0cyA9IGxlbih0ZXN0X25hbWVzKQogCiAgICAgICAgICMg R2V0IHRoZSBzdGFydCBvZmZzZXQgb2YgdGhlIHNsaWNlLgogICAgICAgICBpZiBzZWxmLl9vcHRp b25zLnJ1bl9jaHVuazoKQEAgLTE2NSw3ICsxNjYsNyBAQCBjbGFzcyBMYXlvdXRUZXN0RmluZGVy KG9iamVjdCk6CiAgICAgICAgICMgR2V0IHRoZSBlbmQgb2Zmc2V0IG9mIHRoZSBzbGljZS4KICAg ICAgICAgc2xpY2VfZW5kID0gbWluKG51bV90ZXN0cywgc2xpY2Vfc3RhcnQgKyBjaHVua19sZW4p CiAKLSAgICAgICAgdGVzdHNfdG9fcnVuID0gdGVzdF9maWxlc19saXN0W3NsaWNlX3N0YXJ0OnNs aWNlX2VuZF0KKyAgICAgICAgdGVzdHNfdG9fcnVuID0gdGVzdF9uYW1lc1tzbGljZV9zdGFydDpz bGljZV9lbmRdCiAKICAgICAgICAgX2xvZy5kZWJ1ZygnY2h1bmsgc2xpY2UgWyVkOiVkXSBvZiAl ZCBpcyAlZCB0ZXN0cycgJSAoc2xpY2Vfc3RhcnQsIHNsaWNlX2VuZCwgbnVtX3Rlc3RzLCAoc2xp Y2VfZW5kIC0gc2xpY2Vfc3RhcnQpKSkKIApAQCAtMTc0LDcgKzE3NSw2IEBAIGNsYXNzIExheW91 dFRlc3RGaW5kZXIob2JqZWN0KToKICAgICAgICAgaWYgc2xpY2VfZW5kIC0gc2xpY2Vfc3RhcnQg PCBjaHVua19sZW46CiAgICAgICAgICAgICBleHRyYSA9IGNodW5rX2xlbiAtIChzbGljZV9lbmQg LSBzbGljZV9zdGFydCkKICAgICAgICAgICAgIF9sb2cuZGVidWcoJyAgIGxhc3QgY2h1bmsgaXMg cGFydGlhbCwgYXBwZW5kaW5nIFswOiVkXScgJSBleHRyYSkKLSAgICAgICAgICAgIHRlc3RzX3Rv X3J1bi5leHRlbmQodGVzdF9maWxlc19saXN0WzA6ZXh0cmFdKQorICAgICAgICAgICAgdGVzdHNf dG9fcnVuLmV4dGVuZCh0ZXN0X25hbWVzWzA6ZXh0cmFdKQogCi0gICAgICAgIG1vcmVfdGVzdHNf dG9fc2tpcCA9IHNldCh0ZXN0X2ZpbGVzX2xpc3QpIC0gc2V0KHRlc3RzX3RvX3J1bikKLSAgICAg ICAgcmV0dXJuICh0ZXN0c190b19ydW4sIG1vcmVfdGVzdHNfdG9fc2tpcCkKKyAgICAgICAgcmV0 dXJuICh0ZXN0c190b19ydW4sIHNldCh0ZXN0X25hbWVzKSAtIHNldCh0ZXN0c190b19ydW4pKQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL21hbmFnZXIucHkKaW5kZXggMDY3NjFhM2RiNzk4MWQ2MjVmNTRjZDkzOTc3ZGI1ZmE4 YzhmZWQ5My4uYWVjNjI3MzU5YzUzYjg4N2QyZmYxNTc5YTQwYmMwOGJjM2M1OGU2ZSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFu YWdlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyLnB5CkBAIC0zMTgsOSArMzE4LDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3Qp OgogCiAgICAgICAgIHNlbGYuX3BhdGhzID0gc2V0KCkKIAotICAgICAgICAjIEZJWE1FOiBSZW5h bWUgdG8gdGVzdF9uYW1lcy4KLSAgICAgICAgc2VsZi5fdGVzdF9maWxlcyA9IHNldCgpCi0gICAg ICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCA9IE5vbmUKKyAgICAgICAgc2VsZi5fdGVzdF9uYW1l cyA9IE5vbmUKICAgICAgICAgc2VsZi5fcmVzdWx0X3F1ZXVlID0gUXVldWUuUXVldWUoKQogICAg ICAgICBzZWxmLl9yZXRyeWluZyA9IEZhbHNlCiAgICAgICAgIHNlbGYuX3Jlc3VsdHNfZGlyZWN0 b3J5ID0gc2VsZi5fcG9ydC5yZXN1bHRzX2RpcmVjdG9yeSgpCkBAIC0zMzIsNjMgKzMzMCw1NyBA QCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2ZpbmRlciA9IExheW91dFRl c3RGaW5kZXIoc2VsZi5fcG9ydCwgc2VsZi5fb3B0aW9ucykKIAogICAgIGRlZiBfY29sbGVjdF90 ZXN0cyhzZWxmLCBhcmdzKToKLSAgICAgICAgc2VsZi5fcGF0aHMsIHNlbGYuX3Rlc3RfZmlsZXNf bGlzdCA9IHNlbGYuX2ZpbmRlci5maW5kX3Rlc3RzKHNlbGYuX29wdGlvbnMsIGFyZ3MpCi0gICAg ICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZXQoc2VsZi5fdGVzdF9maWxlc19saXN0KQorICAgICAg ICBzZWxmLl9wYXRocywgc2VsZi5fdGVzdF9uYW1lcyA9IHNlbGYuX2ZpbmRlci5maW5kX3Rlc3Rz KHNlbGYuX29wdGlvbnMsIGFyZ3MpCiAKICAgICBkZWYgX2lzX2h0dHBfdGVzdChzZWxmLCB0ZXN0 KToKICAgICAgICAgcmV0dXJuIHNlbGYuSFRUUF9TVUJESVIgaW4gdGVzdCBvciBzZWxmLldFQlNP Q0tFVF9TVUJESVIgaW4gdGVzdAogCiAgICAgZGVmIF9odHRwX3Rlc3RzKHNlbGYpOgotICAgICAg ICByZXR1cm4gc2V0KHRlc3QgZm9yIHRlc3QgaW4gc2VsZi5fdGVzdF9maWxlcyBpZiBzZWxmLl9p c19odHRwX3Rlc3QodGVzdCkpCisgICAgICAgIHJldHVybiBzZXQodGVzdCBmb3IgdGVzdCBpbiBz ZWxmLl90ZXN0X25hbWVzIGlmIHNlbGYuX2lzX2h0dHBfdGVzdCh0ZXN0KSkKIAogICAgIGRlZiBf d2Vic29ja2V0X3Rlc3RzKHNlbGYpOgotICAgICAgICByZXR1cm4gc2V0KHRlc3QgZm9yIHRlc3Qg aW4gc2VsZi5fdGVzdF9maWxlcyBpZiBzZWxmLldFQlNPQ0tFVF9TVUJESVIgaW4gdGVzdCkKKyAg ICAgICAgcmV0dXJuIHNldCh0ZXN0IGZvciB0ZXN0IGluIHNlbGYuX3Rlc3RfbmFtZXMgaWYgc2Vs Zi5XRUJTT0NLRVRfU1VCRElSIGluIHRlc3QpCiAKICAgICBkZWYgX2lzX3BlcmZfdGVzdChzZWxm LCB0ZXN0KToKICAgICAgICAgcmV0dXJuIHNlbGYuUEVSRl9TVUJESVIgPT0gdGVzdCBvciAoc2Vs Zi5QRVJGX1NVQkRJUiArIHNlbGYuX3BvcnQuVEVTVF9QQVRIX1NFUEFSQVRPUikgaW4gdGVzdAog Ci0gICAgZGVmIF9wYXJzZV9leHBlY3RhdGlvbnMoc2VsZik6Ci0gICAgICAgIHNlbGYuX2V4cGVj dGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBlY3RhdGlvbnMoc2VsZi5fcG9ydCwg c2VsZi5fdGVzdF9maWxlcykKLQogICAgICMgRklYTUU6IFRoaXMgbWV0aG9kIGlzIHdheSB0b28g bG9uZyBhbmQgbmVlZHMgdG8gYmUgYnJva2VuIGludG8gcGllY2VzLgogICAgIGRlZiBwcmVwYXJl X2xpc3RzX2FuZF9wcmludF9vdXRwdXQoc2VsZik6CiAgICAgICAgICIiIkNyZWF0ZSBhcHByb3By aWF0ZSBzdWJzZXRzIG9mIHRlc3QgbGlzdHMgYW5kIHJldHVybnMgYQogICAgICAgICBSZXN1bHRT dW1tYXJ5IG9iamVjdC4gQWxzbyBwcmludHMgZXhwZWN0ZWQgdGVzdCBjb3VudHMuCiAgICAgICAg ICIiIgotICAgICAgICBudW1fYWxsX3Rlc3RfZmlsZXMgPSBsZW4oc2VsZi5fdGVzdF9maWxlc19s aXN0KQorICAgICAgICBudW1fYWxsX3Rlc3RfZmlsZXMgPSBsZW4oc2VsZi5fdGVzdF9uYW1lcykK IAotICAgICAgICB0ZXN0c190b19za2lwID0gc2VsZi5fZmluZGVyLnNraXBfdGVzdHMoc2VsZi5f cGF0aHMsIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCwgc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl9o dHRwX3Rlc3RzKCkpCi0gICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZXQoc2VsZi5fdGVzdF9m aWxlc19saXN0KSAtIHRlc3RzX3RvX3NraXAKLSAgICAgICAgaWYgbm90IHNlbGYuX3Rlc3RfZmls ZXNfbGlzdDoKKyAgICAgICAgdGVzdHNfdG9fc2tpcCA9IHNlbGYuX2ZpbmRlci5za2lwX3Rlc3Rz KHNlbGYuX3BhdGhzLCBzZWxmLl90ZXN0X25hbWVzLCBzZWxmLl9leHBlY3RhdGlvbnMsIHNlbGYu X2h0dHBfdGVzdHMoKSkKKyAgICAgICAgaWYgbm90IHNlbGYuX3Rlc3RfbmFtZXM6CiAgICAgICAg ICAgICBfbG9nLmNyaXRpY2FsKCdObyB0ZXN0cyB0byBydW4uJykKICAgICAgICAgICAgIHJldHVy biBOb25lCiAKICAgICAgICAgIyBDcmVhdGUgYSBzb3J0ZWQgbGlzdCBvZiB0ZXN0IGZpbGVzIHNv IHRoZSBzdWJzZXQgY2h1bmssCiAgICAgICAgICMgaWYgdXNlZCwgY29udGFpbnMgYWxwaGFiZXRp Y2FsbHkgY29uc2VjdXRpdmUgdGVzdHMuCi0gICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCA9 IGxpc3Qoc2VsZi5fdGVzdF9maWxlcykKKyAgICAgICAgc2VsZi5fdGVzdF9uYW1lcyA9IGxpc3Qo c2V0KHNlbGYuX3Rlc3RfbmFtZXMpIC0gdGVzdHNfdG9fc2tpcCkKICAgICAgICAgaWYgc2VsZi5f b3B0aW9ucy5yYW5kb21pemVfb3JkZXI6Ci0gICAgICAgICAgICByYW5kb20uc2h1ZmZsZShzZWxm Ll90ZXN0X2ZpbGVzX2xpc3QpCisgICAgICAgICAgICByYW5kb20uc2h1ZmZsZShzZWxmLl90ZXN0 X25hbWVzKQogICAgICAgICBlbHNlOgotICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0 LnNvcnQoa2V5PWxhbWJkYSB0ZXN0OiB0ZXN0X2tleShzZWxmLl9wb3J0LCB0ZXN0KSkKKyAgICAg ICAgICAgIHNlbGYuX3Rlc3RfbmFtZXMuc29ydChrZXk9bGFtYmRhIHRlc3Q6IHRlc3Rfa2V5KHNl bGYuX3BvcnQsIHRlc3QpKQogCi0gICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCwgdGVzdHNf aW5fb3RoZXJfY2h1bmtzID0gc2VsZi5fZmluZGVyLnNwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vz c2FyeShzZWxmLl90ZXN0X2ZpbGVzX2xpc3QpCisgICAgICAgIHNlbGYuX3Rlc3RfbmFtZXMsIHRl c3RzX2luX290aGVyX2NodW5rcyA9IHNlbGYuX2ZpbmRlci5zcGxpdF9pbnRvX2NodW5rcyhzZWxm Ll90ZXN0X25hbWVzKQogICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMuYWRkX3NraXBwZWRfdGVz dHModGVzdHNfaW5fb3RoZXJfY2h1bmtzKQogICAgICAgICB0ZXN0c190b19za2lwLnVwZGF0ZSh0 ZXN0c19pbl9vdGhlcl9jaHVua3MpCi0gICAgICAgIHNlbGYuX3Rlc3RzID0gc2V0KHNlbGYuX3Rl c3RfZmlsZXNfbGlzdCkKIAotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoOgor ICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoID4gMToKICAgICAgICAgICAgIGxp c3Rfd2l0aF9yZXBldGl0aW9ucyA9IFtdCi0gICAgICAgICAgICBmb3IgdGVzdCBpbiBzZWxmLl90 ZXN0X2ZpbGVzX2xpc3Q6CisgICAgICAgICAgICBmb3IgdGVzdCBpbiBzZWxmLl90ZXN0X25hbWVz OgogICAgICAgICAgICAgICAgIGxpc3Rfd2l0aF9yZXBldGl0aW9ucyArPSAoW3Rlc3RdICogc2Vs Zi5fb3B0aW9ucy5yZXBlYXRfZWFjaCkKLSAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlz dCA9IGxpc3Rfd2l0aF9yZXBldGl0aW9ucworICAgICAgICAgICAgc2VsZi5fdGVzdF9uYW1lcyA9 IGxpc3Rfd2l0aF9yZXBldGl0aW9ucwogCi0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMuaXRlcmF0 aW9uczoKLSAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCA9IHNlbGYuX3Rlc3RfZmls ZXNfbGlzdCAqIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucworICAgICAgICBpZiBzZWxmLl9vcHRp b25zLml0ZXJhdGlvbnMgPiAxOgorICAgICAgICAgICAgc2VsZi5fdGVzdF9uYW1lcyA9IHNlbGYu X3Rlc3RfbmFtZXMgKiBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMKIAogICAgICAgICBpdGVyYXRp b25zID0gc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCAqIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9u cwotICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoc2VsZi5fZXhwZWN0YXRp b25zLCBzZWxmLl90ZXN0X2ZpbGVzLCBpdGVyYXRpb25zLCB0ZXN0c190b19za2lwKQorICAgICAg ICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoc2VsZi5fZXhwZWN0YXRpb25zLCBzZXQo c2VsZi5fdGVzdF9uYW1lcyksIGl0ZXJhdGlvbnMsIHRlc3RzX3RvX3NraXApCiAKLSAgICAgICAg c2VsZi5fcHJpbnRlci5wcmludF9mb3VuZChudW1fYWxsX3Rlc3RfZmlsZXMsIGxlbihzZWxmLl90 ZXN0X2ZpbGVzKSwgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCwgc2VsZi5fb3B0aW9ucy5pdGVy YXRpb25zKQorICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2ZvdW5kKG51bV9hbGxfdGVzdF9m aWxlcywgbGVuKHNlbGYuX3Rlc3RfbmFtZXMpLCBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoLCBz ZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMpCiAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhw ZWN0ZWQocmVzdWx0X3N1bW1hcnksIHNlbGYuX2V4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9y ZXN1bHRfdHlwZSkKIAogICAgICAgICByZXR1cm4gcmVzdWx0X3N1bW1hcnkKQEAgLTY2OCw3ICs2 NjAsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5f ZmlsZXN5c3RlbS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAncmV0cmllcycpCiAKICAg ICBkZWYgbmVlZHNfc2VydmVycyhzZWxmKToKLSAgICAgICAgcmV0dXJuIGFueShzZWxmLl90ZXN0 X3JlcXVpcmVzX2xvY2sodGVzdF9uYW1lKSBmb3IgdGVzdF9uYW1lIGluIHNlbGYuX3Rlc3RfZmls ZXMpIGFuZCBzZWxmLl9vcHRpb25zLmh0dHAKKyAgICAgICAgcmV0dXJuIGFueShzZWxmLl90ZXN0 X3JlcXVpcmVzX2xvY2sodGVzdF9uYW1lKSBmb3IgdGVzdF9uYW1lIGluIHNlbGYuX3Rlc3RfbmFt ZXMpIGFuZCBzZWxmLl9vcHRpb25zLmh0dHAKIAogICAgIGRlZiBfc2V0X3VwX3J1bihzZWxmKToK ICAgICAgICAgIiIiQ29uZmlndXJlcyB0aGUgc3lzdGVtIHRvIGJlIHJlYWR5IHRvIHJ1biB0ZXN0 cy4KQEAgLTcyMCwxNyArNzEyLDE3IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAg ICAgIHJldHVybiAtMQogCiAgICAgICAgIHNlbGYuX3ByaW50ZXIud3JpdGVfdXBkYXRlKCJQYXJz aW5nIGV4cGVjdGF0aW9ucyAuLi4iKQotICAgICAgICBzZWxmLl9wYXJzZV9leHBlY3RhdGlvbnMo KQorICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhw ZWN0YXRpb25zKHNlbGYuX3BvcnQsIHNlbGYuX3Rlc3RfbmFtZXMpCiAKICAgICAgICAgcmVzdWx0 X3N1bW1hcnkgPSBzZWxmLl9zZXRfdXBfcnVuKCkKICAgICAgICAgaWYgbm90IHJlc3VsdF9zdW1t YXJ5OgogICAgICAgICAgICAgcmV0dXJuIC0xCiAKLSAgICAgICAgYXNzZXJ0KGxlbihzZWxmLl90 ZXN0X2ZpbGVzKSkKKyAgICAgICAgYXNzZXJ0KHNlbGYuX3Rlc3RfbmFtZXMpCiAKICAgICAgICAg c3RhcnRfdGltZSA9IHRpbWUudGltZSgpCiAKLSAgICAgICAgaW50ZXJydXB0ZWQsIGtleWJvYXJk X2ludGVycnVwdGVkLCB0aHJlYWRfdGltaW5ncywgdGVzdF90aW1pbmdzLCBpbmRpdmlkdWFsX3Rl c3RfdGltaW5ncyA9IHNlbGYuX3J1bl90ZXN0cyhzZWxmLl90ZXN0X2ZpbGVzX2xpc3QsIHJlc3Vs dF9zdW1tYXJ5LCBpbnQoc2VsZi5fb3B0aW9ucy5jaGlsZF9wcm9jZXNzZXMpKQorICAgICAgICBp bnRlcnJ1cHRlZCwga2V5Ym9hcmRfaW50ZXJydXB0ZWQsIHRocmVhZF90aW1pbmdzLCB0ZXN0X3Rp bWluZ3MsIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzID0gc2VsZi5fcnVuX3Rlc3RzKHNlbGYuX3Rl c3RfbmFtZXMsIHJlc3VsdF9zdW1tYXJ5LCBpbnQoc2VsZi5fb3B0aW9ucy5jaGlsZF9wcm9jZXNz ZXMpKQogCiAgICAgICAgICMgV2UgZXhjbHVkZSB0aGUgY3Jhc2hlcyBmcm9tIHRoZSBsaXN0IG9m IHJlc3VsdHMgdG8gcmV0cnksIGJlY2F1c2UKICAgICAgICAgIyB3ZSB3YW50IHRvIHRyZWF0IGV2 ZW4gYSBwb3RlbnRpYWxseSBmbGFreSBjcmFzaCBhcyBhbiBlcnJvci4KQEAgLTgzNiw3ICs4Mjgs NyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgd3JpdGVyLndyaXRl X2NyYXNoX2xvZyhjcmFzaF9sb2cpCiAKICAgICBkZWYgX21hcmtfaW50ZXJydXB0ZWRfdGVzdHNf YXNfc2tpcHBlZChzZWxmLCByZXN1bHRfc3VtbWFyeSk6Ci0gICAgICAgIGZvciB0ZXN0X25hbWUg aW4gc2VsZi5fdGVzdF9maWxlczoKKyAgICAgICAgZm9yIHRlc3RfbmFtZSBpbiBzZWxmLl90ZXN0 X25hbWVzOgogICAgICAgICAgICAgaWYgdGVzdF9uYW1lIG5vdCBpbiByZXN1bHRfc3VtbWFyeS5y ZXN1bHRzOgogICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRlc3RfcmVzdWx0cy5UZXN0UmVzdWx0 KHRlc3RfbmFtZSwgW3Rlc3RfZmFpbHVyZXMuRmFpbHVyZUVhcmx5RXhpdCgpXSkKICAgICAgICAg ICAgICAgICAjIEZJWE1FOiBXZSBwcm9iYWJseSBuZWVkIHRvIGxvb3AgaGVyZSBpZiB0aGVyZSBh cmUgbXVsdGlwbGUgaXRlcmF0aW9ucy4KQEAgLTg3Nyw3ICs4NjksNyBAQCBjbGFzcyBNYW5hZ2Vy KG9iamVjdCk6CiAgICAgICAgIHJlc3VsdF9zdW1tYXJ5LmFkZChyZXN1bHQsIGV4cGVjdGVkLCBz ZWxmLl90ZXN0X2lzX3Nsb3cocmVzdWx0LnRlc3RfbmFtZSkpCiAKICAgICAgICAgIyBGSVhNRTog dGhlcmUncyB0b28gbWFueSBhcmd1bWVudHMgdG8gdGhpcyBmdW5jdGlvbi4KLSAgICAgICAgc2Vs Zi5fcHJpbnRlci5wcmludF9maW5pc2hlZF90ZXN0KHJlc3VsdCwgZXhwZWN0ZWQsIGV4cF9zdHIs IGdvdF9zdHIsIHJlc3VsdF9zdW1tYXJ5LCBzZWxmLl9yZXRyeWluZywgc2VsZi5fdGVzdF9maWxl c19saXN0KQorICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2ZpbmlzaGVkX3Rlc3QocmVzdWx0 LCBleHBlY3RlZCwgZXhwX3N0ciwgZ290X3N0ciwgcmVzdWx0X3N1bW1hcnksIHNlbGYuX3JldHJ5 aW5nLCBzZWxmLl90ZXN0X25hbWVzKQogCiAgICAgICAgIHNlbGYuX2ludGVycnVwdF9pZl9hdF9m YWlsdXJlX2xpbWl0cyhyZXN1bHRfc3VtbWFyeSkKIApAQCAtOTQ4LDcgKzk0MCw3IEBAIGNsYXNz IE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMu YnVpbGRlcl9uYW1lLCBzZWxmLl9vcHRpb25zLmJ1aWxkX25hbWUsCiAgICAgICAgICAgICBzZWxm Ll9vcHRpb25zLmJ1aWxkX251bWJlciwgc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksCiAgICAgICAg ICAgICBCVUlMREVSX0JBU0VfVVJMLCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncywKLSAgICAgICAg ICAgIHNlbGYuX2V4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHNlbGYuX3Rlc3RfZmlsZXNf bGlzdCwKKyAgICAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHNl bGYuX3Rlc3RfbmFtZXMsCiAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLnRlc3RfcmVzdWx0c19z ZXJ2ZXIsCiAgICAgICAgICAgICAibGF5b3V0LXRlc3RzIiwKICAgICAgICAgICAgIHNlbGYuX29w dGlvbnMubWFzdGVyX25hbWUpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weQpp bmRleCBkMTNiMWI1OWYwZDBkMDc3NThmMTBjODkxY2ZkNDIwYjFhZDgxMWY2Li5iNDFjMTFhMzBk ZTU4OWE5YTQyNDViYTNhZjUzZGE0MTRkODgzZDU2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXJfdW5pdHRlc3QucHkKQEAgLTI4NCwxMCArMjg0LDEwIEBAIGNsYXNzIE1hbmFnZXJUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgbWFuYWdlciA9IE1hbmFnZXIocG9ydD1wb3J0LCBv cHRpb25zPU1vY2tPcHRpb25zKCksIHByaW50ZXI9TW9jaygpKQogCiAgICAgICAgIG1hbmFnZXIu X29wdGlvbnMgPSBNb2NrT3B0aW9ucyhleGl0X2FmdGVyX25fZmFpbHVyZXM9Tm9uZSwgZXhpdF9h ZnRlcl9uX2NyYXNoZXNfb3JfdGltZW91dHM9Tm9uZSkKLSAgICAgICAgbWFuYWdlci5fdGVzdF9m aWxlcyA9IFsnZm9vL2Jhci5odG1sJywgJ2Jhei5odG1sJ10KKyAgICAgICAgbWFuYWdlci5fdGVz dF9uYW1lcyA9IFsnZm9vL2Jhci5odG1sJywgJ2Jhei5odG1sJ10KICAgICAgICAgbWFuYWdlci5f dGVzdF9pc19zbG93ID0gbGFtYmRhIHRlc3RfbmFtZTogRmFsc2UKIAotICAgICAgICByZXN1bHRf c3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoTW9jaygpLCBtYW5hZ2VyLl90ZXN0X2ZpbGVzLCAxLCBz ZXQoKSkKKyAgICAgICAgcmVzdWx0X3N1bW1hcnkgPSBSZXN1bHRTdW1tYXJ5KE1vY2soKSwgbWFu YWdlci5fdGVzdF9uYW1lcywgMSwgc2V0KCkpCiAgICAgICAgIHJlc3VsdF9zdW1tYXJ5LnVuZXhw ZWN0ZWRfZmFpbHVyZXMgPSAxMDAKICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZF9j cmFzaGVzID0gNTAKICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZF90aW1lb3V0cyA9 IDUwCkBAIC0zMzAsOCArMzMwLDcgQEAgY2xhc3MgTWFuYWdlclRlc3QodW5pdHRlc3QuVGVzdENh c2UpOgogICAgICAgICAgICAgcG9ydCA9IE1vY2soKSAgIyBGSVhNRTogVXNlIGEgdGlnaHRlciBt b2NrLgogICAgICAgICAgICAgcG9ydC5URVNUX1BBVEhfU0VQQVJBVE9SID0gJy8nCiAgICAgICAg ICAgICBtYW5hZ2VyID0gTWFuYWdlcihwb3J0LCBvcHRpb25zPU1vY2tPcHRpb25zKGh0dHA9VHJ1 ZSksIHByaW50ZXI9TW9jaygpKQotICAgICAgICAgICAgbWFuYWdlci5fdGVzdF9maWxlcyA9IHNl dCh0ZXN0X25hbWVzKQotICAgICAgICAgICAgbWFuYWdlci5fdGVzdF9maWxlc19saXN0ID0gdGVz dF9uYW1lcworICAgICAgICAgICAgbWFuYWdlci5fdGVzdF9uYW1lcyA9IHRlc3RfbmFtZXMKICAg ICAgICAgICAgIHJldHVybiBtYW5hZ2VyCiAKICAgICAgICAgbWFuYWdlciA9IGdldF9tYW5hZ2Vy X3dpdGhfdGVzdHMoWydmYXN0L2h0bWwnXSkKQEAgLTM5OSw3ICszOTgsNyBAQCBjbGFzcyBNYW5h Z2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICAgICAgc2VsZi5odHRwX3N0YXJ0ZWQg PSBzZWxmLmh0dHBfc3RvcHBlZCA9IHNlbGYud2Vic29ja2V0X3N0YXJ0ZWQgPSBzZWxmLndlYnNv Y2tldF9zdG9wcGVkID0gRmFsc2UKICAgICAgICAgbWFuYWdlciA9IE1hbmFnZXIocG9ydD1wb3J0 LCBvcHRpb25zPU1vY2tPcHRpb25zKGh0dHA9VHJ1ZSksIHByaW50ZXI9TW9jaygpKQotICAgICAg ICBtYW5hZ2VyLl90ZXN0X2ZpbGVzID0gWydodHRwL3Rlc3RzL3Bhc3MudHh0J10KKyAgICAgICAg bWFuYWdlci5fdGVzdF9uYW1lcyA9IFsnaHR0cC90ZXN0cy9wYXNzLnR4dCddCiAgICAgICAgIG1h bmFnZXIuc3RhcnRfc2VydmVyc193aXRoX2xvY2sobnVtYmVyX29mX3NlcnZlcnM9NCkKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5odHRwX3N0YXJ0ZWQsIFRydWUpCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKHNlbGYud2Vic29ja2V0X3N0YXJ0ZWQsIEZhbHNlKQpAQCAtNDA5LDcg KzQwOCw3IEBAIGNsYXNzIE1hbmFnZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKIAogICAgICAg ICBzZWxmLmh0dHBfc3RhcnRlZCA9IHNlbGYuaHR0cF9zdG9wcGVkID0gc2VsZi53ZWJzb2NrZXRf c3RhcnRlZCA9IHNlbGYud2Vic29ja2V0X3N0b3BwZWQgPSBGYWxzZQogICAgICAgICBtYW5hZ2Vy ID0gTWFuYWdlcihwb3J0PXBvcnQsIG9wdGlvbnM9TW9ja09wdGlvbnMoaHR0cD1UcnVlKSwgcHJp bnRlcj1Nb2NrKCkpCi0gICAgICAgIG1hbmFnZXIuX3Rlc3RfZmlsZXMgPSBbJ3dlYnNvY2tldC9w YXNzLnR4dCddCisgICAgICAgIG1hbmFnZXIuX3Rlc3RfbmFtZXMgPSBbJ3dlYnNvY2tldC9wYXNz LnR4dCddCiAgICAgICAgIG1hbmFnZXIuc3RhcnRfc2VydmVyc193aXRoX2xvY2sobnVtYmVyX29m X3NlcnZlcnM9NCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc2VsZi5odHRwX3N0YXJ0ZWQs IFRydWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYud2Vic29ja2V0X3N0YXJ0ZWQs IFRydWUpCkBAIC00MTksNyArNDE4LDcgQEAgY2xhc3MgTWFuYWdlclRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgogCiAgICAgICAgIHNlbGYuaHR0cF9zdGFydGVkID0gc2VsZi5odHRwX3N0b3BwZWQg PSBzZWxmLndlYnNvY2tldF9zdGFydGVkID0gc2VsZi53ZWJzb2NrZXRfc3RvcHBlZCA9IEZhbHNl CiAgICAgICAgIG1hbmFnZXIgPSBNYW5hZ2VyKHBvcnQ9cG9ydCwgb3B0aW9ucz1Nb2NrT3B0aW9u cyhodHRwPVRydWUpLCBwcmludGVyPU1vY2soKSkKLSAgICAgICAgbWFuYWdlci5fdGVzdF9maWxl cyA9IFsncGVyZi9mb28vdGVzdC5odG1sJ10KKyAgICAgICAgbWFuYWdlci5fdGVzdF9uYW1lcyA9 IFsncGVyZi9mb28vdGVzdC5odG1sJ10KICAgICAgICAgbWFuYWdlci5zdGFydF9zZXJ2ZXJzX3dp dGhfbG9jayhudW1iZXJfb2Zfc2VydmVycz00KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhz ZWxmLmh0dHBfc3RhcnRlZCwgRmFsc2UpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHNlbGYu d2Vic29ja2V0X3N0YXJ0ZWQsIEZhbHNlKQo=