97364 2012-09-21 14:54:34 -0700 webkitpy: drop support for old TestExpectations syntax 2012-09-21 15:35:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 97362 1 dpranke dpranke ojan rniwa oldest_to_newest 725844 0 dpranke 2012-09-21 14:54:34 -0700 webkitpy: drop support for old TestExpectations syntax 725846 1 165198 dpranke 2012-09-21 14:55:12 -0700 Created attachment 165198 Patch 725890 2 dpranke 2012-09-21 15:35:22 -0700 Committed r129265: <http://trac.webkit.org/changeset/129265> 165198 2012-09-21 14:55:12 -0700 2012-09-21 15:00:22 -0700 Patch bug-97364-20120921145436.patch text/plain 15636 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MjQ1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjVkNDM4MDkzMTdiNGMxMWQ5MjVmN2E3YTc2ZDkxNjQ4 NTRlZDI3ZC4uYzYwYTBkYmYxMDY0N2E4MzJiZGEwMTY4ODk4Y2I0Yjk5YjhlMWJiZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMy IEBACiAyMDEyLTA5LTIxICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBkcm9wIHN1cHBvcnQgZm9yIG9sZCBUZXN0RXhwZWN0YXRpb25zIHN5 bnRheAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcz NjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weToK KyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblBhcnNlci5fY29sbGVjdF9tYXRjaGluZ190ZXN0cyk6 CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25QYXJzZXIpOgorICAgICAgICAoVGVzdEV4cGVjdGF0 aW9uUGFyc2VyLl90b2tlbml6ZV9saW5lKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHk6CisgICAgICAg IChTa2lwcGVkVGVzdHMudGVzdF9za2lwcGVkX2VudHJ5X2RvbnRfZXhpc3QpOgorICAgICAgICAo RXhwZWN0YXRpb25TeW50YXhUZXN0cy5hc3NlcnRfdG9rZW5pemVfZXhwKToKKyAgICAgICAgKEV4 cGVjdGF0aW9uU3ludGF4VGVzdHMudGVzdF9iYXJlX25hbWUpOgorICAgICAgICAoRXhwZWN0YXRp b25TeW50YXhUZXN0cy50ZXN0X2JhcmVfbmFtZV9hbmRfYnVncyk6CisgICAgICAgIChFeHBlY3Rh dGlvblN5bnRheFRlc3RzLnRlc3RfY29tbWVudHMpOgorICAgICAgICAoRXhwZWN0YXRpb25TeW50 YXhUZXN0cy50ZXN0X2NvbmZpZ19tb2RpZmllcnMpOgorICAgICAgICAoRXhwZWN0YXRpb25TeW50 YXhUZXN0cy50ZXN0X3Vua25vd25fY29uZmlnKToKKyAgICAgICAgKEV4cGVjdGF0aW9uU3ludGF4 VGVzdHMudGVzdF91bmtub3duX2V4cGVjdGF0aW9uKToKKyAgICAgICAgKEV4cGVjdGF0aW9uU3lu dGF4VGVzdHMudGVzdF9za2lwKToKKyAgICAgICAgKEV4cGVjdGF0aW9uU3ludGF4VGVzdHMudGVz dF9zbG93KToKKyAgICAgICAgKEV4cGVjdGF0aW9uU3ludGF4VGVzdHMudGVzdF93b250Zml4KToK KyAgICAgICAgKEV4cGVjdGF0aW9uU3ludGF4VGVzdHMudGVzdF9ibGFua19saW5lKToKKyAgICAg ICAgKEV4cGVjdGF0aW9uU3ludGF4VGVzdHMudGVzdF93YXJuaW5ncyk6CisgICAgICAgIChSZWJh c2VsaW5pbmdUZXN0LnRlc3Rfbm9fZ2V0X3JlYmFzZWxpbmluZ19mYWlsdXJlcyk6CisKKzIwMTIt MDktMjEgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgd2Vi a2l0cHk6IHVwZGF0ZSByZW1haW5pbmcgdGVzdHMgdG8gdXNlIHRoZSBuZXcgZXhwZWN0YXRpb24g c3ludGF4CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NzM2MgogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9t b2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggODVlOGQxNzEzMTJkYzNj ZGYxY2JhZWFmZmE1NDllODhjN2Y0OWQyNC4uNDJiNTE4ZjdmYjg5NTM3Mzc3NmM0YmE1ZDNjYmRh YmEzMzU4MzBkYiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQpAQCAtMjA4LDU2ICsy MDgsNiBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25QYXJzZXIob2JqZWN0KToKICAgICAgICAgaWYg ZXhwZWN0YXRpb25fbGluZS5wYXRoIGluIHNlbGYuX2Z1bGxfdGVzdF9saXN0OgogICAgICAgICAg ICAgZXhwZWN0YXRpb25fbGluZS5tYXRjaGluZ190ZXN0cy5hcHBlbmQoZXhwZWN0YXRpb25fbGlu ZS5wYXRoKQogCi0gICAgIyBGSVhNRTogU2VlbXMgbGlrZSB0aGVzZSBzaG91bGQgYmUgY2xhc3Nt ZXRob2RzIG9uIFRlc3RFeHBlY3RhdGlvbkxpbmUgaW5zdGVhZCBvZiBUZXN0RXhwZWN0YXRpb25Q YXJzZXIuCi0gICAgQGNsYXNzbWV0aG9kCi0gICAgZGVmIF90b2tlbml6ZV9saW5lKGNscywgZmls ZW5hbWUsIGV4cGVjdGF0aW9uX3N0cmluZywgbGluZV9udW1iZXIpOgotICAgICAgICBleHBlY3Rh dGlvbl9saW5lID0gY2xzLl90b2tlbml6ZV9saW5lX3VzaW5nX25ld19mb3JtYXQoZmlsZW5hbWUs IGV4cGVjdGF0aW9uX3N0cmluZywgbGluZV9udW1iZXIpCi0gICAgICAgIGlmIGV4cGVjdGF0aW9u X2xpbmUuaXNfaW52YWxpZCgpOgotICAgICAgICAgICAgb2xkX2V4cGVjdGF0aW9uX2xpbmUgPSBj bHMuX3Rva2VuaXplX2xpbmVfdXNpbmdfb2xkX2Zvcm1hdChmaWxlbmFtZSwgZXhwZWN0YXRpb25f c3RyaW5nLCBsaW5lX251bWJlcikKLSAgICAgICAgICAgIGlmIG5vdCBvbGRfZXhwZWN0YXRpb25f bGluZS5pc19pbnZhbGlkKCk6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIG9sZF9leHBlY3RhdGlv bl9saW5lCi0gICAgICAgIHJldHVybiBleHBlY3RhdGlvbl9saW5lCi0KLSAgICBAY2xhc3NtZXRo b2QKLSAgICBkZWYgX3Rva2VuaXplX2xpbmVfdXNpbmdfb2xkX2Zvcm1hdChjbHMsIGZpbGVuYW1l LCBleHBlY3RhdGlvbl9zdHJpbmcsIGxpbmVfbnVtYmVyKToKLSAgICAgICAgIiIiVG9rZW5pemVz IGEgbGluZSBmcm9tIFRlc3RFeHBlY3RhdGlvbnMgYW5kIHJldHVybnMgYW4gdW5wYXJzZWQgVGVz dEV4cGVjdGF0aW9uTGluZSBpbnN0YW5jZS4KLQotICAgICAgICBUaGUgZm9ybWF0IG9mIGEgdGVz dCBleHBlY3RhdGlvbiBsaW5lIGlzOgotCi0gICAgICAgIFtbPG1vZGlmaWVycz5dIDogPG5hbWU+ ID0gPGV4cGVjdGF0aW9ucz5dWyAvLzxjb21tZW50Pl0KLQotICAgICAgICBBbnkgZXJyYW50IHdo aXRlc3BhY2UgaXMgbm90IHByZXNlcnZlZC4KLQotICAgICAgICAiIiIKLSAgICAgICAgZXhwZWN0 YXRpb25fbGluZSA9IFRlc3RFeHBlY3RhdGlvbkxpbmUoKQotICAgICAgICBleHBlY3RhdGlvbl9s aW5lLm9yaWdpbmFsX3N0cmluZyA9IGV4cGVjdGF0aW9uX3N0cmluZwotICAgICAgICBleHBlY3Rh dGlvbl9saW5lLmxpbmVfbnVtYmVyID0gbGluZV9udW1iZXIKLSAgICAgICAgZXhwZWN0YXRpb25f bGluZS5maWxlbmFtZSA9IGZpbGVuYW1lCi0gICAgICAgIGNvbW1lbnRfaW5kZXggPSBleHBlY3Rh dGlvbl9zdHJpbmcuZmluZCgiLy8iKQotICAgICAgICBpZiBjb21tZW50X2luZGV4ID09IC0xOgot ICAgICAgICAgICAgY29tbWVudF9pbmRleCA9IGxlbihleHBlY3RhdGlvbl9zdHJpbmcpCi0gICAg ICAgIGVsc2U6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLmNvbW1lbnQgPSBleHBlY3Rh dGlvbl9zdHJpbmdbY29tbWVudF9pbmRleCArIDI6XQotCi0gICAgICAgIHJlbWFpbmluZ19zdHJp bmcgPSByZS5zdWIociJccysiLCAiICIsIGV4cGVjdGF0aW9uX3N0cmluZ1s6Y29tbWVudF9pbmRl eF0uc3RyaXAoKSkKLSAgICAgICAgaWYgbGVuKHJlbWFpbmluZ19zdHJpbmcpID09IDA6Ci0gICAg ICAgICAgICByZXR1cm4gZXhwZWN0YXRpb25fbGluZQotCi0gICAgICAgIHBhcnRzID0gcmVtYWlu aW5nX3N0cmluZy5zcGxpdCgnOicpCi0gICAgICAgIGlmIGxlbihwYXJ0cykgIT0gMjoKLSAgICAg ICAgICAgIGV4cGVjdGF0aW9uX2xpbmUud2FybmluZ3MuYXBwZW5kKCJNaXNzaW5nIGEgJzonIiBp ZiBsZW4ocGFydHMpIDwgMiBlbHNlICJFeHRyYW5lb3VzICc6JyIpCi0gICAgICAgIGVsc2U6Ci0g ICAgICAgICAgICB0ZXN0X2FuZF9leHBlY3RhdGlvbiA9IHBhcnRzWzFdLnNwbGl0KCc9JykKLSAg ICAgICAgICAgIGlmIGxlbih0ZXN0X2FuZF9leHBlY3RhdGlvbikgIT0gMjoKLSAgICAgICAgICAg ICAgICBleHBlY3RhdGlvbl9saW5lLndhcm5pbmdzLmFwcGVuZCgiTWlzc2luZyBleHBlY3RhdGlv bnMiIGlmIGxlbih0ZXN0X2FuZF9leHBlY3RhdGlvbikgPCAyIGVsc2UgIkV4dHJhbmVvdXMgJz0n IikKLQotICAgICAgICBpZiBub3QgZXhwZWN0YXRpb25fbGluZS5pc19pbnZhbGlkKCk6Ci0gICAg ICAgICAgICBleHBlY3RhdGlvbl9saW5lLm1vZGlmaWVycyA9IGNscy5fc3BsaXRfc3BhY2Vfc2Vw YXJhdGVkKHBhcnRzWzBdKQotICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5uYW1lID0gdGVz dF9hbmRfZXhwZWN0YXRpb25bMF0uc3RyaXAoKQotICAgICAgICAgICAgZXhwZWN0YXRpb25fbGlu ZS5leHBlY3RhdGlvbnMgPSBjbHMuX3NwbGl0X3NwYWNlX3NlcGFyYXRlZCh0ZXN0X2FuZF9leHBl Y3RhdGlvblsxXSkKLQotICAgICAgICByZXR1cm4gZXhwZWN0YXRpb25fbGluZQotCiAgICAgIyBG SVhNRTogVXBkYXRlIHRoZSBvcmlnaW5hbCBtb2RpZmllcnMgYW5kIHJlbW92ZSB0aGlzIG9uY2Ug dGhlIG9sZCBzeW50YXggaXMgZ29uZS4KICAgICBfY29uZmlndXJhdGlvbl90b2tlbnNfbGlzdCA9 IFsKICAgICAgICAgJ01hYycsICdTbm93TGVvcGFyZCcsICdMaW9uJywgJ01vdW50YWluTGlvbics CkBAIC0yODgsOCArMjM4LDkgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6 CiAgICAgX2ludmVydGVkX2V4cGVjdGF0aW9uX3Rva2VucyA9IGRpY3QoWyh2YWx1ZSwgbmFtZSkg Zm9yIG5hbWUsIHZhbHVlIGluIF9leHBlY3RhdGlvbl90b2tlbnMuaXRlcml0ZW1zKCldICsKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbKCdURVhUJywgJ0ZhaWx1cmUn KSwgKCdJTUFHRStURVhUJywgJ0ZhaWx1cmUnKSwgKCdBVURJTycsICdGYWlsdXJlJyldKQogCisg ICAgIyBGSVhNRTogU2VlbXMgbGlrZSB0aGVzZSBzaG91bGQgYmUgY2xhc3NtZXRob2RzIG9uIFRl c3RFeHBlY3RhdGlvbkxpbmUgaW5zdGVhZCBvZiBUZXN0RXhwZWN0YXRpb25QYXJzZXIuCiAgICAg QGNsYXNzbWV0aG9kCi0gICAgZGVmIF90b2tlbml6ZV9saW5lX3VzaW5nX25ld19mb3JtYXQoY2xz LCBmaWxlbmFtZSwgZXhwZWN0YXRpb25fc3RyaW5nLCBsaW5lX251bWJlcik6CisgICAgZGVmIF90 b2tlbml6ZV9saW5lKGNscywgZmlsZW5hbWUsIGV4cGVjdGF0aW9uX3N0cmluZywgbGluZV9udW1i ZXIpOgogICAgICAgICAiIiJUb2tlbml6ZXMgYSBsaW5lIGZyb20gVGVzdEV4cGVjdGF0aW9ucyBh bmQgcmV0dXJucyBhbiB1bnBhcnNlZCBUZXN0RXhwZWN0YXRpb25MaW5lIGluc3RhbmNlIHVzaW5n IHRoZSBvbGQgZm9ybWF0LgogCiAgICAgICAgIFRoZSBuZXcgZm9ybWF0IGZvciBhIHRlc3QgZXhw ZWN0YXRpb24gbGluZSBpczoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0 dGVzdC5weQppbmRleCBlYTQwZGZiNDhhNTYxY2Q5OTA2MWRkMDk0ZDNjMDhlZTJkOWE4Y2M5Li5j NTYwNjA3MWQ2OTFiMzBmZjA0MmMxYjEyMjM1YzAxZmFmMmM1YWNkIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNf dW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k ZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CkBAIC0yOTAsMjQgKzI5MCw3IEBAIGNs YXNzIFNraXBwZWRUZXN0cyhCYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnVGhlIGZv bGxvd2luZyB0ZXN0IGZvby9iYXIvYmF6Lmh0bWwgZnJvbSB0aGUgU2tpcHBlZCBsaXN0IGRvZXNu XCd0IGV4aXN0XG4nLCBsb2dzKQogCiAKLSMgRklYTUU6IHJlbW92ZSB0aGVzZSB0ZXN0cyB3aGVu IHdlIHN0b3Agc3VwcG9ydGluZyB0aGUgb2xkIHN5bnRheC4KLQogY2xhc3MgRXhwZWN0YXRpb25T eW50YXhUZXN0cyhCYXNlKToKLSAgICBkZWYgZGlzYWJsZWRfdGVzdF9taXNzaW5nX2V4cGVjdGF0 aW9uKHNlbGYpOgotICAgICAgICAjIFRoaXMgaXMgbWlzc2luZyB0aGUgZXhwZWN0YXRpb24uCi0g ICAgICAgIHNlbGYuYXNzZXJ0X2JhZF9leHBlY3RhdGlvbnMoJ0JVR19URVNUOiBmYWlsdXJlcy9l eHBlY3RlZC90ZXh0Lmh0bWwnKQotCi0gICAgZGVmIGRpc2FibGVkX3Rlc3RfbWlzc2luZ19jb2xv bihzZWxmKToKLSAgICAgICAgIyBUaGlzIGlzIG1pc3NpbmcgdGhlIG1vZGlmaWVycyBhbmQgdGhl ICc6JwotICAgICAgICBzZWxmLmFzc2VydF9iYWRfZXhwZWN0YXRpb25zKCdmYWlsdXJlcy9leHBl Y3RlZC90ZXh0Lmh0bWwgWyBGYWlsdXJlIF0nKQotCi0gICAgZGVmIGRpc2FibGVkX3Rlc3RfdG9v X21hbnlfY29sb25zKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9iYWRfZXhwZWN0YXRpb25z KCdCVUdfVEVTVDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sID0gUEFTUyA6JykKLQotICAg IGRlZiBkaXNhYmxlZF90ZXN0X3Rvb19tYW55X2VxdWFsc19zaWducyhzZWxmKToKLSAgICAgICAg c2VsZi5hc3NlcnRfYmFkX2V4cGVjdGF0aW9ucygnQlVHX1RFU1Q6IGZhaWx1cmVzL2V4cGVjdGVk L3RleHQuaHRtbCA9IEZBSUwgPSBJTUFHRScpCi0KLSAgICAjIEtlZXAgdGhlc2UgdHdvCiAgICAg ZGVmIHRlc3RfdW5yZWNvZ25pemVkX2V4cGVjdGF0aW9uKHNlbGYpOgogICAgICAgICBzZWxmLmFz c2VydF9iYWRfZXhwZWN0YXRpb25zKCdCdWcodGVzdCkgZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5o dG1sIFsgVW5rbm93biBdJykKIApAQCAtMzE2LDE3ICsyOTksMTQgQEAgY2xhc3MgRXhwZWN0YXRp b25TeW50YXhUZXN0cyhCYXNlKToKICAgICAgICAgc2VsZi5wYXJzZV9leHAoZXhwX3N0cikKICAg ICAgICAgc2VsZi5hc3NlcnRfZXhwKCdmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnLCBGQUlM KQogCi0KLQotY2xhc3MgTmV3RXhwZWN0YXRpb25TeW50YXhUZXN0cyh1bml0dGVzdC5UZXN0Q2Fz ZSk6Ci0gICAgZGVmIGFzc2VydF9leHAoc2VsZiwgbGluZSwgYnVncz1Ob25lLCBtb2RpZmllcnM9 Tm9uZSwgZXhwZWN0YXRpb25zPU5vbmUsIHdhcm5pbmdzPU5vbmUsIGNvbW1lbnQ9Tm9uZSwgbmFt ZT0nZm9vLmh0bWwnKToKKyAgICBkZWYgYXNzZXJ0X3Rva2VuaXplX2V4cChzZWxmLCBsaW5lLCBi dWdzPU5vbmUsIG1vZGlmaWVycz1Ob25lLCBleHBlY3RhdGlvbnM9Tm9uZSwgd2FybmluZ3M9Tm9u ZSwgY29tbWVudD1Ob25lLCBuYW1lPSdmb28uaHRtbCcpOgogICAgICAgICBidWdzID0gYnVncyBv ciBbXQogICAgICAgICBtb2RpZmllcnMgPSBtb2RpZmllcnMgb3IgW10KICAgICAgICAgZXhwZWN0 YXRpb25zID0gZXhwZWN0YXRpb25zIG9yIFtdCiAgICAgICAgIHdhcm5pbmdzID0gd2FybmluZ3Mg b3IgW10KICAgICAgICAgZmlsZW5hbWUgPSAnVGVzdEV4cGVjdGF0aW9ucycKICAgICAgICAgbGlu ZV9udW1iZXIgPSAxCi0gICAgICAgIGV4cGVjdGF0aW9uX2xpbmUgPSBUZXN0RXhwZWN0YXRpb25Q YXJzZXIuX3Rva2VuaXplX2xpbmVfdXNpbmdfbmV3X2Zvcm1hdChmaWxlbmFtZSwgbGluZSwgbGlu ZV9udW1iZXIpCisgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUgPSBUZXN0RXhwZWN0YXRpb25QYXJz ZXIuX3Rva2VuaXplX2xpbmUoZmlsZW5hbWUsIGxpbmUsIGxpbmVfbnVtYmVyKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFscyhleHBlY3RhdGlvbl9saW5lLndhcm5pbmdzLCB3YXJuaW5ncykKICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwZWN0YXRpb25fbGluZS5uYW1lLCBuYW1lKQogICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhleHBlY3RhdGlvbl9saW5lLmZpbGVuYW1lLCBmaWxlbmFt ZSkKQEAgLTMzNiw0NyArMzE2LDQ3IEBAIGNsYXNzIE5ld0V4cGVjdGF0aW9uU3ludGF4VGVzdHMo dW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwZWN0 YXRpb25fbGluZS5leHBlY3RhdGlvbnMsIGV4cGVjdGF0aW9ucykKIAogICAgIGRlZiB0ZXN0X2Jh cmVfbmFtZShzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdmb28uaHRtbCcsIG1vZGlm aWVycz1bJ1NLSVAnXSwgZXhwZWN0YXRpb25zPVsnUEFTUyddKQorICAgICAgICBzZWxmLmFzc2Vy dF90b2tlbml6ZV9leHAoJ2Zvby5odG1sJywgbW9kaWZpZXJzPVsnU0tJUCddLCBleHBlY3RhdGlv bnM9WydQQVNTJ10pCiAKICAgICBkZWYgdGVzdF9iYXJlX25hbWVfYW5kX2J1Z3Moc2VsZik6Ci0g ICAgICAgIHNlbGYuYXNzZXJ0X2V4cCgnd2Via2l0Lm9yZy9iLzEyMzQ1IGZvby5odG1sJywgbW9k aWZpZXJzPVsnQlVHV0sxMjM0NScsICdTS0lQJ10sIGV4cGVjdGF0aW9ucz1bJ1BBU1MnXSkKLSAg ICAgICAgc2VsZi5hc3NlcnRfZXhwKCdjcmJ1Zy5jb20vMTIzNDUgZm9vLmh0bWwnLCBtb2RpZmll cnM9WydCVUdDUjEyMzQ1JywgJ1NLSVAnXSwgZXhwZWN0YXRpb25zPVsnUEFTUyddKQotICAgICAg ICBzZWxmLmFzc2VydF9leHAoJ0J1ZyhkcHJhbmtlKSBmb28uaHRtbCcsIG1vZGlmaWVycz1bJ0JV R0RQUkFOS0UnLCAnU0tJUCddLCBleHBlY3RhdGlvbnM9WydQQVNTJ10pCi0gICAgICAgIHNlbGYu YXNzZXJ0X2V4cCgnY3JidWcuY29tLzEyMzQ1IGNyYnVnLmNvbS8zNDU2NyBmb28uaHRtbCcsIG1v ZGlmaWVycz1bJ0JVR0NSMTIzNDUnLCAnQlVHQ1IzNDU2NycsICdTS0lQJ10sIGV4cGVjdGF0aW9u cz1bJ1BBU1MnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRfdG9rZW5pemVfZXhwKCd3ZWJraXQub3Jn L2IvMTIzNDUgZm9vLmh0bWwnLCBtb2RpZmllcnM9WydCVUdXSzEyMzQ1JywgJ1NLSVAnXSwgZXhw ZWN0YXRpb25zPVsnUEFTUyddKQorICAgICAgICBzZWxmLmFzc2VydF90b2tlbml6ZV9leHAoJ2Ny YnVnLmNvbS8xMjM0NSBmb28uaHRtbCcsIG1vZGlmaWVycz1bJ0JVR0NSMTIzNDUnLCAnU0tJUCdd LCBleHBlY3RhdGlvbnM9WydQQVNTJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0X3Rva2VuaXplX2V4 cCgnQnVnKGRwcmFua2UpIGZvby5odG1sJywgbW9kaWZpZXJzPVsnQlVHRFBSQU5LRScsICdTS0lQ J10sIGV4cGVjdGF0aW9ucz1bJ1BBU1MnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRfdG9rZW5pemVf ZXhwKCdjcmJ1Zy5jb20vMTIzNDUgY3JidWcuY29tLzM0NTY3IGZvby5odG1sJywgbW9kaWZpZXJz PVsnQlVHQ1IxMjM0NScsICdCVUdDUjM0NTY3JywgJ1NLSVAnXSwgZXhwZWN0YXRpb25zPVsnUEFT UyddKQogCiAgICAgZGVmIHRlc3RfY29tbWVudHMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0 X2V4cCgiIyBjb21tZW50IiwgbmFtZT1Ob25lLCBjb21tZW50PSIjIGNvbW1lbnQiKQotICAgICAg ICBzZWxmLmFzc2VydF9leHAoImZvby5odG1sICMgY29tbWVudCIsIGNvbW1lbnQ9IiMgY29tbWVu dCIsIGV4cGVjdGF0aW9ucz1bJ1BBU1MnXSwgbW9kaWZpZXJzPVsnU0tJUCddKQorICAgICAgICBz ZWxmLmFzc2VydF90b2tlbml6ZV9leHAoIiMgY29tbWVudCIsIG5hbWU9Tm9uZSwgY29tbWVudD0i IyBjb21tZW50IikKKyAgICAgICAgc2VsZi5hc3NlcnRfdG9rZW5pemVfZXhwKCJmb28uaHRtbCAj IGNvbW1lbnQiLCBjb21tZW50PSIjIGNvbW1lbnQiLCBleHBlY3RhdGlvbnM9WydQQVNTJ10sIG1v ZGlmaWVycz1bJ1NLSVAnXSkKIAogICAgIGRlZiB0ZXN0X2NvbmZpZ19tb2RpZmllcnMoc2VsZik6 Ci0gICAgICAgIHNlbGYuYXNzZXJ0X2V4cCgnWyBNYWMgXSBmb28uaHRtbCcsIG1vZGlmaWVycz1b J01BQycsICdTS0lQJ10sIGV4cGVjdGF0aW9ucz1bJ1BBU1MnXSkKLSAgICAgICAgc2VsZi5hc3Nl cnRfZXhwKCdbIE1hYyBWaXN0YSBdIGZvby5odG1sJywgbW9kaWZpZXJzPVsnTUFDJywgJ1ZJU1RB JywgJ1NLSVAnXSwgZXhwZWN0YXRpb25zPVsnUEFTUyddKQotICAgICAgICBzZWxmLmFzc2VydF9l eHAoJ1sgTWFjIF0gZm9vLmh0bWwgWyBGYWlsdXJlIF0gJywgbW9kaWZpZXJzPVsnTUFDJ10sIGV4 cGVjdGF0aW9ucz1bJ0ZBSUwnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRfdG9rZW5pemVfZXhwKCdb IE1hYyBdIGZvby5odG1sJywgbW9kaWZpZXJzPVsnTUFDJywgJ1NLSVAnXSwgZXhwZWN0YXRpb25z PVsnUEFTUyddKQorICAgICAgICBzZWxmLmFzc2VydF90b2tlbml6ZV9leHAoJ1sgTWFjIFZpc3Rh IF0gZm9vLmh0bWwnLCBtb2RpZmllcnM9WydNQUMnLCAnVklTVEEnLCAnU0tJUCddLCBleHBlY3Rh dGlvbnM9WydQQVNTJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0X3Rva2VuaXplX2V4cCgnWyBNYWMg XSBmb28uaHRtbCBbIEZhaWx1cmUgXSAnLCBtb2RpZmllcnM9WydNQUMnXSwgZXhwZWN0YXRpb25z PVsnRkFJTCddKQogCiAgICAgZGVmIHRlc3RfdW5rbm93bl9jb25maWcoc2VsZik6Ci0gICAgICAg IHNlbGYuYXNzZXJ0X2V4cCgnWyBGb28gXSBmb28uaHRtbCAnLCBtb2RpZmllcnM9WydGb28nLCAn U0tJUCddLCBleHBlY3RhdGlvbnM9WydQQVNTJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0X3Rva2Vu aXplX2V4cCgnWyBGb28gXSBmb28uaHRtbCAnLCBtb2RpZmllcnM9WydGb28nLCAnU0tJUCddLCBl eHBlY3RhdGlvbnM9WydQQVNTJ10pCiAKICAgICBkZWYgdGVzdF91bmtub3duX2V4cGVjdGF0aW9u KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9leHAoJ2Zvby5odG1sIFsgQXVkaW8gXScsIGV4 cGVjdGF0aW9ucz1bJ0F1ZGlvJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0X3Rva2VuaXplX2V4cCgn Zm9vLmh0bWwgWyBBdWRpbyBdJywgZXhwZWN0YXRpb25zPVsnQXVkaW8nXSkKIAogICAgIGRlZiB0 ZXN0X3NraXAoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0X2V4cCgnZm9vLmh0bWwgWyBTa2lw IF0nLCBtb2RpZmllcnM9WydTS0lQJ10sIGV4cGVjdGF0aW9ucz1bJ1BBU1MnXSkKKyAgICAgICAg c2VsZi5hc3NlcnRfdG9rZW5pemVfZXhwKCdmb28uaHRtbCBbIFNraXAgXScsIG1vZGlmaWVycz1b J1NLSVAnXSwgZXhwZWN0YXRpb25zPVsnUEFTUyddKQogCiAgICAgZGVmIHRlc3Rfc2xvdyhzZWxm KToKLSAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdmb28uaHRtbCBbIFNsb3cgXScsIG1vZGlmaWVy cz1bJ1NMT1cnXSwgZXhwZWN0YXRpb25zPVsnUEFTUyddKQorICAgICAgICBzZWxmLmFzc2VydF90 b2tlbml6ZV9leHAoJ2Zvby5odG1sIFsgU2xvdyBdJywgbW9kaWZpZXJzPVsnU0xPVyddLCBleHBl Y3RhdGlvbnM9WydQQVNTJ10pCiAKICAgICBkZWYgdGVzdF93b250Zml4KHNlbGYpOgotICAgICAg ICBzZWxmLmFzc2VydF9leHAoJ2Zvby5odG1sIFsgV29udEZpeCBdJywgbW9kaWZpZXJzPVsnV09O VEZJWCcsICdTS0lQJ10sIGV4cGVjdGF0aW9ucz1bJ1BBU1MnXSkKKyAgICAgICAgc2VsZi5hc3Nl cnRfdG9rZW5pemVfZXhwKCdmb28uaHRtbCBbIFdvbnRGaXggXScsIG1vZGlmaWVycz1bJ1dPTlRG SVgnLCAnU0tJUCddLCBleHBlY3RhdGlvbnM9WydQQVNTJ10pCiAKICAgICBkZWYgdGVzdF9ibGFu a19saW5lKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydF9leHAoJycsIG5hbWU9Tm9uZSkKKyAg ICAgICAgc2VsZi5hc3NlcnRfdG9rZW5pemVfZXhwKCcnLCBuYW1lPU5vbmUpCiAKICAgICBkZWYg dGVzdF93YXJuaW5ncyhzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdbIE1hYyBdJywg d2FybmluZ3M9WydEaWQgbm90IGZpbmQgYSB0ZXN0IG5hbWUuJ10sIG5hbWU9Tm9uZSkKLSAgICAg ICAgc2VsZi5hc3NlcnRfZXhwKCdbIFsnLCB3YXJuaW5ncz1bJ3VuZXhwZWN0ZWQgIlsiJ10sIG5h bWU9Tm9uZSkKLSAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdjcmJ1Zy5jb20vMTIzNDUgXScsIHdh cm5pbmdzPVsndW5leHBlY3RlZCAiXSInXSwgbmFtZT1Ob25lKQorICAgICAgICBzZWxmLmFzc2Vy dF90b2tlbml6ZV9leHAoJ1sgTWFjIF0nLCB3YXJuaW5ncz1bJ0RpZCBub3QgZmluZCBhIHRlc3Qg bmFtZS4nXSwgbmFtZT1Ob25lKQorICAgICAgICBzZWxmLmFzc2VydF90b2tlbml6ZV9leHAoJ1sg WycsIHdhcm5pbmdzPVsndW5leHBlY3RlZCAiWyInXSwgbmFtZT1Ob25lKQorICAgICAgICBzZWxm LmFzc2VydF90b2tlbml6ZV9leHAoJ2NyYnVnLmNvbS8xMjM0NSBdJywgd2FybmluZ3M9Wyd1bmV4 cGVjdGVkICJdIiddLCBuYW1lPU5vbmUpCiAKLSAgICAgICAgc2VsZi5hc3NlcnRfZXhwKCdmb28u aHRtbCBjcmJ1Zy5jb20vMTIzNDUgXScsIHdhcm5pbmdzPVsnImNyYnVnLmNvbS8xMjM0NSIgaXMg bm90IGF0IHRoZSBzdGFydCBvZiB0aGUgbGluZS4nXSkKKyAgICAgICAgc2VsZi5hc3NlcnRfdG9r ZW5pemVfZXhwKCdmb28uaHRtbCBjcmJ1Zy5jb20vMTIzNDUgXScsIHdhcm5pbmdzPVsnImNyYnVn LmNvbS8xMjM0NSIgaXMgbm90IGF0IHRoZSBzdGFydCBvZiB0aGUgbGluZS4nXSkKIAogCiBjbGFz cyBTZW1hbnRpY1Rlc3RzKEJhc2UpOgpAQCAtNTM4LDY5ICs1MTgsNiBAQCBjbGFzcyBSZWJhc2Vs aW5pbmdUZXN0KEJhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihzZWxmLl9leHAu Z2V0X3JlYmFzZWxpbmluZ19mYWlsdXJlcygpKSwgMCkKIAogCi0jIEZJWE1FOiByZW1vdmUgbW9z dCBvZiB0aGVzZSB0ZXN0cyB3aGVuIHdlIG5vIGxvbmdlciBzdXBwb3J0IHRoZSBvbGQgc3ludGF4 LgotCi1jbGFzcyBPbGRFeHBlY3RhdGlvblBhcnNlclRlc3RzKHVuaXR0ZXN0LlRlc3RDYXNlKToK LSAgICBkZWYgX3Rva2VuaXplKHNlbGYsIGxpbmUpOgotICAgICAgICByZXR1cm4gVGVzdEV4cGVj dGF0aW9uUGFyc2VyLl90b2tlbml6ZV9saW5lX3VzaW5nX29sZF9mb3JtYXQoJ3BhdGgnLCBsaW5l LCAwKQotCi0gICAgZGVmIHRlc3RfdG9rZW5pemVfYmxhbmsoc2VsZik6Ci0gICAgICAgIGV4cGVj dGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJycpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhw ZWN0YXRpb24uY29tbWVudCwgTm9uZSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oZXhw ZWN0YXRpb24ud2FybmluZ3MpLCAwKQotCi0gICAgZGVmIHRlc3RfdG9rZW5pemVfZXh0cmFfY29s b24oc2VsZik6Ci0gICAgICAgIGV4cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJ0ZPTyA6IDog YmFyJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RhdGlvbi53YXJuaW5ncywgWyJF eHRyYW5lb3VzICc6JyJdKQotCi0gICAgZGVmIHRlc3RfdG9rZW5pemVfZW1wdHlfY29tbWVudChz ZWxmKToKLSAgICAgICAgZXhwZWN0YXRpb24gPSBzZWxmLl90b2tlbml6ZSgnLy8nKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLmNvbW1lbnQsICcnKQotICAgICAgICBzZWxm LmFzc2VydEVxdWFsKGxlbihleHBlY3RhdGlvbi53YXJuaW5ncyksIDApCi0KLSAgICBkZWYgdGVz dF90b2tlbml6ZV9jb21tZW50KHNlbGYpOgotICAgICAgICBleHBlY3RhdGlvbiA9IHNlbGYuX3Rv a2VuaXplKCcvL1F1eC4nKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLmNv bW1lbnQsICdRdXguJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oZXhwZWN0YXRpb24u d2FybmluZ3MpLCAwKQotCi0gICAgZGVmIHRlc3RfdG9rZW5pemVfbWlzc2luZ19lcXVhbChzZWxm KToKLSAgICAgICAgZXhwZWN0YXRpb24gPSBzZWxmLl90b2tlbml6ZSgnRk9PIDogYmFyJykKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RhdGlvbi53YXJuaW5ncywgWydNaXNzaW5nIGV4 cGVjdGF0aW9ucyddKQotCi0gICAgZGVmIHRlc3RfdG9rZW5pemVfZXh0cmFfZXF1YWwoc2VsZik6 Ci0gICAgICAgIGV4cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJ0ZPTyA6IGJhciA9IEJBWiA9 IFF1eC4nKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLndhcm5pbmdzLCBb IkV4dHJhbmVvdXMgJz0nIl0pCi0KLSAgICBkZWYgdGVzdF90b2tlbml6ZV92YWxpZChzZWxmKToK LSAgICAgICAgZXhwZWN0YXRpb24gPSBzZWxmLl90b2tlbml6ZSgnRk9PIDogYmFyID0gQkFaJykK LSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RhdGlvbi5jb21tZW50LCBOb25lKQotICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihleHBlY3RhdGlvbi53YXJuaW5ncyksIDApCi0KLSAg ICBkZWYgdGVzdF90b2tlbml6ZV92YWxpZF93aXRoX2NvbW1lbnQoc2VsZik6Ci0gICAgICAgIGV4 cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJ0ZPTyA6IGJhciA9IEJBWiAvL1F1eC4nKQotICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLmNvbW1lbnQsICdRdXguJykKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChzdHIoZXhwZWN0YXRpb24ubW9kaWZpZXJzKSwgIlsnRk9PJ10i KQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihleHBlY3RhdGlvbi5leHBlY3RhdGlvbnMp LCAiWydCQVonXSIpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGV4cGVjdGF0aW9uLndh cm5pbmdzKSwgMCkKLQotICAgIGRlZiB0ZXN0X3Rva2VuaXplX3ZhbGlkX3dpdGhfbXVsdGlwbGVf bW9kaWZpZXJzKHNlbGYpOgotICAgICAgICBleHBlY3RhdGlvbiA9IHNlbGYuX3Rva2VuaXplKCdG T08xIEZPTzIgOiBiYXIgPSBCQVogLy9RdXguJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChl eHBlY3RhdGlvbi5jb21tZW50LCAnUXV4LicpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3Ry KGV4cGVjdGF0aW9uLm1vZGlmaWVycyksICJbJ0ZPTzEnLCAnRk9PMiddIikKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzdHIoZXhwZWN0YXRpb24uZXhwZWN0YXRpb25zKSwgIlsnQkFaJ10iKQot ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihleHBlY3RhdGlvbi53YXJuaW5ncyksIDApCi0K LSAgICBkZWYgdGVzdF9wYXJzZV9lbXB0eV9zdHJpbmcoc2VsZik6Ci0gICAgICAgIGhvc3QgPSBN b2NrSG9zdCgpCi0gICAgICAgIHRlc3RfcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVz dC13aW4teHAnLCBOb25lKQotICAgICAgICB0ZXN0X3BvcnQudGVzdF9leGlzdHMgPSBsYW1iZGEg dGVzdDogVHJ1ZQotICAgICAgICBmdWxsX3Rlc3RfbGlzdCA9IFtdCi0gICAgICAgIGV4cGVjdGF0 aW9uX2xpbmUgPSBzZWxmLl90b2tlbml6ZSgnJykKLSAgICAgICAgcGFyc2VyID0gVGVzdEV4cGVj dGF0aW9uUGFyc2VyKHRlc3RfcG9ydCwgZnVsbF90ZXN0X2xpc3QsIGFsbG93X3JlYmFzZWxpbmVf bW9kaWZpZXI9RmFsc2UpCi0gICAgICAgIHBhcnNlci5fcGFyc2VfbGluZShleHBlY3RhdGlvbl9s aW5lKQotICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGV4cGVjdGF0aW9uX2xpbmUuaXNfaW52YWxp ZCgpKQotCi0KIGNsYXNzIFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6YXRpb25UZXN0cyh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIHRlc3RGdW5jKToKICAgICAgICAg aG9zdCA9IE1vY2tIb3N0KCkK