89038 2012-06-13 14:21:37 -0700 Remove webkitpy code to support legacy test_expectations.txt files 2012-06-13 14:35:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 86690 1 rniwa rniwa abarth dpranke levin ojan webkit.review.bot oldest_to_newest 648463 0 rniwa 2012-06-13 14:21:37 -0700 Remove webkitpy code to support legacy test_expectations.txt files 648465 1 147412 rniwa 2012-06-13 14:21:56 -0700 Created attachment 147412 Patch 648472 2 rniwa 2012-06-13 14:35:35 -0700 Committed r120249: <http://trac.webkit.org/changeset/120249> 147412 2012-06-13 14:21:56 -0700 2012-06-13 14:24:27 -0700 Patch bug-89038-20120613142442.patch text/plain 11469 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEyMDI0OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDEyLTA2LTEzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIFJlbW92ZSB3ZWJraXRweSBjb2RlIHRvIHN1cHBvcnQgbGVnYWN5IHRlc3RfZXhw ZWN0YXRpb25zLnR4dCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODkwMzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weToK KyAgICAgICAgKFBvcnQucGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKToKKyAgICAgICAg KFBvcnQuZXhwZWN0YXRpb25zX2RpY3QpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5weToKKyAgICAgICAgKFBvcnRUZXN0LnRlc3Rf dXNlc190ZXN0X2V4cGVjdGF0aW9uc19maWxlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5weToKKyAgICAgICAgKFdlYktpdFBv cnRUZXN0LnRlc3RfcGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKToKKyAgICAgICAgKHRl c3RfdGVzdF9leHBlY3RhdGlvbnMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUv Y2hlY2tlci5weToKKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyLnNob3VsZF9za2lwX3dpdGhv dXRfd2FybmluZyk6CisgICAgICAgIChDaGVja2VyRGlzcGF0Y2hlci5fY3JlYXRlX2NoZWNrZXIp OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3Rh dGlvbnNfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zVGVzdENhc2UuX2V4 cGVjdF9wb3J0X2Zvcl9leHBlY3RhdGlvbnNfcGF0aCk6CisgICAgICAgICogU2NyaXB0cy93ZWJr aXRweS90b29sL3N0ZXBzL2NvbW1pdC5weToKKyAgICAgICAgKENvbW1pdC5fY2hlY2tfdGVzdF9l eHBlY3RhdGlvbnMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jb21t aXRfdW5pdHRlc3QucHk6CisgICAgICAgIChDb21taXRUZXN0LnRlc3RfY2hlY2tfdGVzdF9leHBl Y3RhdGlvbnMpOgorCiAyMDEyLTA2LTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIG5yd3Q6IHJlbW92ZSBwb3J0LnRlc3RfZXhwZWN0YXRpb25zKCkgYW5k IHBvcnQudGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJpZGVzKCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkJKHJldmlzaW9uIDEyMDI0 OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQko d29ya2luZyBjb3B5KQpAQCAtNjk2LDExICs2OTYsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAg ICAgICAgIGlmIHBvcnRfbmFtZS5zdGFydHN3aXRoKCdjaHJvbWl1bScpIG9yIHBvcnRfbmFtZS5z dGFydHN3aXRoKCdnb29nbGUtY2hyb21lJyk6CiAgICAgICAgICAgICBwb3J0X25hbWUgPSAnY2hy b21pdW0nCiAKLSAgICAgICAgYmFzZWxpbmVfcGF0aCA9IHNlbGYuX3dlYmtpdF9iYXNlbGluZV9w YXRoKHBvcnRfbmFtZSkKLSAgICAgICAgb2xkX2V4cGVjdGF0aW9uc19maWxlID0gc2VsZi5fZmls ZXN5c3RlbS5qb2luKGJhc2VsaW5lX3BhdGgsICd0ZXN0X2V4cGVjdGF0aW9ucy50eHQnKQotICAg ICAgICBpZiBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhvbGRfZXhwZWN0YXRpb25zX2ZpbGUpOgot ICAgICAgICAgICAgcmV0dXJuIG9sZF9leHBlY3RhdGlvbnNfZmlsZQotICAgICAgICByZXR1cm4g c2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2VsaW5lX3BhdGgsICdUZXN0RXhwZWN0YXRpb25zJykK KyAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl93ZWJraXRfYmFzZWxp bmVfcGF0aChwb3J0X25hbWUpLCAnVGVzdEV4cGVjdGF0aW9ucycpCiAKICAgICBkZWYgcmVsYXRp dmVfdGVzdF9maWxlbmFtZShzZWxmLCBmaWxlbmFtZSk6CiAgICAgICAgICIiIlJldHVybnMgYSB0 ZXN0X25hbWUgYSByZWFsdGl2ZSB1bml4LXN0eWxlIHBhdGggZm9yIGEgZmlsZW5hbWUgdW5kZXIg dGhlIExheW91dFRlc3RzCkBAIC04OTcsMTQgKzg5MywxMyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6 CiAgICAgICAgIHJldHVybiBzZWxmLl9maWxlc3lzdGVtLmV4aXN0cyhzZWxmLnBhdGhfdG9fdGVz dF9leHBlY3RhdGlvbnNfZmlsZSgpKQogCiAgICAgZGVmIGV4cGVjdGF0aW9uc19kaWN0KHNlbGYp OgotICAgICAgICAiIiJSZXR1cm5zIGFuIE9yZGVyZWREaWN0IG9mIG5hbWUgLT4gZXhwZWN0YXRp b25zIHN0cmluZ3MuIFRoZSBuYW1lcwotICAgICAgICBhcmUgZXhwZWN0ZWQgdG8gYmUgKGJ1dCBu b3QgcmVxdWlyZWQgdG8gYmUpIHBhdGhzIGluIHRoZSBmaWxlc3lzdGVtLgotICAgICAgICBJZiB0 aGUgbmFtZSBpcyBhIHBhdGgsIHRoZSBmaWxlIGNhbiBiZSBjb25zaWRlcmVkIHVwZGF0YWJsZSBm b3IgdGhpbmdzCi0gICAgICAgIGxpa2UgcmViYXNlbGluaW5nLCBzbyBkb24ndCB1c2UgbmFtZXMg dGhhdCBhcmUgcGF0aHMgaWYgdGhleSdyZSBub3QgcGF0aHMuCi0gICAgICAgIEdlbmVyYWxseSBz cGVha2luZyB0aGUgb3JkZXJpbmcgc2hvdWxkIGJlIGZpbGVzIGluIHRoZSBmaWxlc3lzdGVtIGlu Ci0gICAgICAgIGNhc2NhZGUgb3JkZXIgKHRlc3RfZXhwZWN0YXRpb25zLnR4dCBmb2xsb3dlZCBi eSBTa2lwcGVkLCBpZiB0aGUgcG9ydAotICAgICAgICBob25vcnMgYm90aCBmb3JtYXRzKSwgdGhl biBhbnkgYnVpbHQtaW4gZXhwZWN0YXRpb25zIChlLmcuLCBmcm9tIGNvbXBpbGUtdGltZQotICAg ICAgICBleGNsdXNpb25zKSwgdGhlbiAtLWFkZGl0aW9uYWwtZXhwZWN0YXRpb25zIG9wdGlvbnMu IiIiCisgICAgICAgICIiIlJldHVybnMgYW4gT3JkZXJlZERpY3Qgb2YgbmFtZSAtPiBleHBlY3Rh dGlvbnMgc3RyaW5ncy4KKyAgICAgICAgVGhlIG5hbWVzIGFyZSBleHBlY3RlZCB0byBiZSAoYnV0 IG5vdCByZXF1aXJlZCB0byBiZSkgcGF0aHMgaW4gdGhlIGZpbGVzeXN0ZW0uCisgICAgICAgIElm IHRoZSBuYW1lIGlzIGEgcGF0aCwgdGhlIGZpbGUgY2FuIGJlIGNvbnNpZGVyZWQgdXBkYXRhYmxl IGZvciB0aGluZ3MgbGlrZSByZWJhc2VsaW5pbmcsCisgICAgICAgIHNvIGRvbid0IHVzZSBuYW1l cyB0aGF0IGFyZSBwYXRocyBpZiB0aGV5J3JlIG5vdCBwYXRocy4KKyAgICAgICAgR2VuZXJhbGx5 IHNwZWFraW5nIHRoZSBvcmRlcmluZyBzaG91bGQgYmUgZmlsZXMgaW4gdGhlIGZpbGVzeXN0ZW0g aW4gY2FzY2FkZSBvcmRlcgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucyBmb2xsb3dlZCBieSBT a2lwcGVkLCBpZiB0aGUgcG9ydCBob25vcnMgYm90aCBmb3JtYXRzKSwKKyAgICAgICAgdGhlbiBh bnkgYnVpbHQtaW4gZXhwZWN0YXRpb25zIChlLmcuLCBmcm9tIGNvbXBpbGUtdGltZSBleGNsdXNp b25zKSwgdGhlbiAtLWFkZGl0aW9uYWwtZXhwZWN0YXRpb25zIG9wdGlvbnMuIiIiCiAgICAgICAg ICMgRklYTUU6IHJlbmFtZSB0aGlzIHRvIHRlc3RfZXhwZWN0YXRpb25zKCkgb25jZSBhbGwgdGhl IGNhbGxlcnMgYXJlIHVwZGF0ZWQgdG8ga25vdyBhYm91dCB0aGUgb3JkZXJlZCBkaWN0LgogICAg ICAgICBleHBlY3RhdGlvbnMgPSBPcmRlcmVkRGljdCgpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZV91bml0dGVzdC5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2VfdW5pdHRlc3Qu cHkJKHJldmlzaW9uIDEyMDI0OCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvYmFzZV91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzA0LDkgKzMwNCw5 IEBAIGNsYXNzIFBvcnRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF91c2Vz X3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2Vf cG9ydChwb3J0X25hbWU9J2ZvbycpCiAgICAgICAgIHBvcnQucG9ydF9uYW1lID0gJ2ZvbycKLSAg ICAgICAgcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUgPSBsYW1iZGE6ICcvbW9j ay1yZXN1bHRzL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCcKKyAgICAgICAgcG9ydC5wYXRoX3RvX3Rl c3RfZXhwZWN0YXRpb25zX2ZpbGUgPSBsYW1iZGE6ICcvbW9jay1yZXN1bHRzL1Rlc3RFeHBlY3Rh dGlvbnMnCiAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UocG9ydC51c2VzX3Rlc3RfZXhwZWN0YXRp b25zX2ZpbGUoKSkKLSAgICAgICAgcG9ydC5fZmlsZXN5c3RlbSA9IE1vY2tGaWxlU3lzdGVtKHsn L21vY2stcmVzdWx0cy90ZXN0X2V4cGVjdGF0aW9ucy50eHQnOiAnJ30pCisgICAgICAgIHBvcnQu X2ZpbGVzeXN0ZW0gPSBNb2NrRmlsZVN5c3RlbSh7Jy9tb2NrLXJlc3VsdHMvVGVzdEV4cGVjdGF0 aW9ucyc6ICcnfSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQudXNlc190ZXN0X2V4cGVj dGF0aW9uc19maWxlKCkpCiAKICAgICBkZWYgdGVzdF9maW5kX25vX3BhdGhzX3NwZWNpZmllZChz ZWxmKToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Vi a2l0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvd2Via2l0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAxMjAyNDgpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdF91bml0dGVzdC5w eQkod29ya2luZyBjb3B5KQpAQCAtMTAxLDkgKzEwMSw5IEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0 KHBvcnRfdGVzdGNhc2UuUG9ydFQKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LnBhdGhf dG9fdGVzdF9leHBlY3RhdGlvbnNfZmlsZSgpLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMv cGxhdGZvcm0vdGVzdHdlYmtpdHBvcnQvVGVzdEV4cGVjdGF0aW9ucycpCiAKICAgICAgICAgcG9y dCA9IFRlc3RXZWJLaXRQb3J0KCkKLSAgICAgICAgcG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNb Jy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3R3ZWJraXRwb3J0L3Rlc3Rf ZXhwZWN0YXRpb25zLnR4dCddID0gJ3NvbWUgY29udGVudCcKKyAgICAgICAgcG9ydC5ob3N0LmZp bGVzeXN0ZW0uZmlsZXNbJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3R3 ZWJraXRwb3J0L1Rlc3RFeHBlY3RhdGlvbnMnXSA9ICdzb21lIGNvbnRlbnQnCiAgICAgICAgIHBv cnQuX29wdGlvbnMgPSBNb2NrT3B0aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9RmFsc2UpCi0gICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUo KSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3RzL3BsYXRmb3JtL3Rlc3R3ZWJraXRwb3J0L3Rl c3RfZXhwZWN0YXRpb25zLnR4dCcpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5wYXRo X3RvX3Rlc3RfZXhwZWN0YXRpb25zX2ZpbGUoKSwgJy9tb2NrLWNoZWNrb3V0L0xheW91dFRlc3Rz L3BsYXRmb3JtL3Rlc3R3ZWJraXRwb3J0L1Rlc3RFeHBlY3RhdGlvbnMnKQogCiAgICAgZGVmIHRl c3Rfc2tpcHBlZF9kaXJlY3Rvcmllc19mb3Jfc3ltYm9scyhzZWxmKToKICAgICAgICAgIyBUaGlz IGZpcnN0IHRlc3QgY29uZmlybXMgdGhhdCB0aGUgY29tbW9ubHkgZm91bmQgc3ltYm9scyByZXN1 bHQgaW4gdGhlIGV4cGVjdGVkIHNraXBwZWQgZGlyZWN0b3JpZXMuCkBAIC0xNzcsMTYgKzE3Nyw2 IEBAIGNsYXNzIFdlYktpdFBvcnRUZXN0KHBvcnRfdGVzdGNhc2UuUG9ydFQKICAgICAgICAgcG9y dCA9IFRlc3RXZWJLaXRQb3J0KGhvc3Q9aG9zdCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgn Jy5qb2luKHBvcnQuZXhwZWN0YXRpb25zX2RpY3QoKS52YWx1ZXMoKSksICdCVUdfVEVTVEVYUEVD VEFUSU9OUyBTS0lQIDogZmFzdC9odG1sL2FydGljbGUtZWxlbWVudC5odG1sID0gRkFJTFxuJykK IAotICAgIGRlZiB0ZXN0X2xlZ2FjeV90ZXN0X2V4cGVjdGF0aW9ucyhzZWxmKToKLSAgICAgICAg IyBDaGVjayB0aGF0IHdlIHJlYWQgdGhlIGxlZ2FjeSB0ZXN0X2V4cGVjdGF0aW9ucy50eHQgZmls ZQotICAgICAgICBob3N0ID0gTW9ja1N5c3RlbUhvc3QoKQotICAgICAgICBob3N0LmZpbGVzeXN0 ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS90 ZXN0d2Via2l0cG9ydC90ZXN0X2V4cGVjdGF0aW9ucy50eHQnLAotICAgICAgICAgICAgJ0JVR19U RVNURVhQRUNUQVRJT05TIFNLSVAgOiBmYXN0L2h0bWwvYXJ0aWNsZS1lbGVtZW50Lmh0bWwgPSBG QUlMXG4nKQotICAgICAgICBob3N0LmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKCcvbW9jay1j aGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS90ZXN0d2Via2l0cG9ydC9UZXN0RXhwZWN0YXRp b25zJywKLSAgICAgICAgICAgICdCVUdfQkFERVhQRUNUQVRJT04gU0tJUCA6IGZhc3QvaHRtbC9h cnRpY2xlLWVsZW1lbnQuaHRtbCA9IEZBSUxcbicpCi0gICAgICAgIHBvcnQgPSBUZXN0V2ViS2l0 UG9ydChob3N0PWhvc3QpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJycuam9pbihwb3J0LmV4 cGVjdGF0aW9uc19kaWN0KCkudmFsdWVzKCkpLCAnQlVHX1RFU1RFWFBFQ1RBVElPTlMgU0tJUCA6 IGZhc3QvaHRtbC9hcnRpY2xlLWVsZW1lbnQuaHRtbCA9IEZBSUxcbicpCi0KICAgICBkZWYgdGVz dF9idWlsZF9kcml2ZXIoc2VsZik6CiAgICAgICAgIG91dHB1dCA9IE91dHB1dENhcHR1cmUoKQog ICAgICAgICBwb3J0ID0gVGVzdFdlYktpdFBvcnQoKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9zdHlsZS9jaGVja2VyLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvc3R5bGUvY2hlY2tlci5weQkocmV2aXNpb24gMTIwMjQ4KQorKysgVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2VyLnB5CSh3b3JraW5nIGNvcHkpCkBAIC01MzAsNyArNTMwLDcg QEAgY2xhc3MgQ2hlY2tlckRpc3BhdGNoZXIob2JqZWN0KToKICAgICAgICAgYmFzZW5hbWUgPSBv cy5wYXRoLmJhc2VuYW1lKGZpbGVfcGF0aCkKICAgICAgICAgaWYgYmFzZW5hbWUuc3RhcnRzd2l0 aCgnQ2hhbmdlTG9nJyk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgZWxpZiBi YXNlbmFtZSA9PSAndGVzdF9leHBlY3RhdGlvbnMudHh0JyBvciBiYXNlbmFtZSA9PSAnVGVzdEV4 cGVjdGF0aW9ucyc6CisgICAgICAgIGVsaWYgYmFzZW5hbWUgPT0gJ1Rlc3RFeHBlY3RhdGlvbnMn OgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgIGZvciBza2lwcGVkX2ZpbGUgaW4g X1NLSVBQRURfRklMRVNfV0lUSE9VVF9XQVJOSU5HOgogICAgICAgICAgICAgaWYgc2VsZi5fc2hv dWxkX3NraXBfZmlsZV9wYXRoKGZpbGVfcGF0aCwgc2tpcHBlZF9maWxlKToKQEAgLTU5OCw3ICs1 OTgsNyBAQCBjbGFzcyBDaGVja2VyRGlzcGF0Y2hlcihvYmplY3QpOgogICAgICAgICAgICAgY2hl Y2tlciA9IFBOR0NoZWNrZXIoZmlsZV9wYXRoLCBoYW5kbGVfc3R5bGVfZXJyb3IpCiAgICAgICAg IGVsaWYgZmlsZV90eXBlID09IEZpbGVUeXBlLlRFWFQ6CiAgICAgICAgICAgICBiYXNlbmFtZSA9 IG9zLnBhdGguYmFzZW5hbWUoZmlsZV9wYXRoKQotICAgICAgICAgICAgaWYgYmFzZW5hbWUgPT0g J3Rlc3RfZXhwZWN0YXRpb25zLnR4dCcgb3IgYmFzZW5hbWUgPT0gJ2RydF9leHBlY3RhdGlvbnMu dHh0JzoKKyAgICAgICAgICAgIGlmIGJhc2VuYW1lID09ICdUZXN0RXhwZWN0YXRpb25zJzoKICAg ICAgICAgICAgICAgICBjaGVja2VyID0gVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIoZmlsZV9wYXRo LCBoYW5kbGVfc3R5bGVfZXJyb3IpCiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAg IGNoZWNrZXIgPSBUZXh0Q2hlY2tlcihmaWxlX3BhdGgsIGhhbmRsZV9zdHlsZV9lcnJvcikKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlv bnNfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQkocmV2aXNpb24gMTIwMjQ4 KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0 aW9uc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNzMsMjEgKzczLDYgQEAgY2xhc3Mg VGVzdEV4cGVjdGF0aW9uc1Rlc3RDYXNlKHVuaXR0ZXN0LgogICAgICAgICBlbHNlOgogICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoTm9uZSwgZXhwZWN0ZWRfcG9ydF9pbXBsZW1lbnRhdGlv bikKIAotICAgICAgICBob3N0ID0gTW9ja0hvc3QoKQotICAgICAgICBleHBlY3RhdGlvbnNfcGF0 aCA9IGV4cGVjdGF0aW9uc19wYXRoLnJlcGxhY2UoJ1Rlc3RFeHBlY3RhdGlvbnMnLCAndGVzdF9l eHBlY3RhdGlvbnMudHh0JykKLSAgICAgICAgaWYgbm90IGV4cGVjdGF0aW9uc19wYXRoLnN0YXJ0 c3dpdGgoJy9tb2NrLWNoZWNrb3V0Jyk6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbnNfZnVsbF9w YXRoID0gJy9tb2NrLWNoZWNrb3V0LycgKyBleHBlY3RhdGlvbnNfcGF0aAotICAgICAgICBlbHNl OgotICAgICAgICAgICAgZXhwZWN0YXRpb25zX2Z1bGxfcGF0aCA9IGV4cGVjdGF0aW9uc19wYXRo Ci0gICAgICAgIGhvc3QuZmlsZXN5c3RlbS5maWxlc1tleHBlY3RhdGlvbnNfZnVsbF9wYXRoXSA9 ICdzb21lIGNvbnRlbnQnCi0KLSAgICAgICAgY2hlY2tlciA9IFRlc3RFeHBlY3RhdGlvbnNDaGVj a2VyKGV4cGVjdGF0aW9uc19wYXRoLCBFcnJvckNvbGxlY3RvcigpLCBob3N0PWhvc3QpCi0gICAg ICAgIHBvcnQgPSBjaGVja2VyLl9kZXRlcm1pbmVfcG9ydF9mcm9tX2V4cGVjdGF0aW9uc19wYXRo KGhvc3QsIGV4cGVjdGF0aW9uc19wYXRoKQotICAgICAgICBpZiBwb3J0OgotICAgICAgICAgICAg c2VsZi5hc3NlcnRUcnVlKHBvcnQubmFtZSgpLnN0YXJ0c3dpdGgoZXhwZWN0ZWRfcG9ydF9pbXBs ZW1lbnRhdGlvbikpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs cyhOb25lLCBleHBlY3RlZF9wb3J0X2ltcGxlbWVudGF0aW9uKQotCiAgICAgZGVmIHRlc3RfZGV0 ZXJtaW5lX3BvcnRfZnJvbV9leHBlY3RhdGlvbnNfcGF0aChzZWxmKToKICAgICAgICAgc2VsZi5f ZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKE5vbmUsICcvJykKICAgICAgICAgc2Vs Zi5fZXhwZWN0X3BvcnRfZm9yX2V4cGVjdGF0aW9uc19wYXRoKE5vbmUsICdMYXlvdXRUZXN0cy9j aHJvbWl1bS1tYWMvVGVzdEV4cGVjdGF0aW9ucycpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvc3RlcHMvY29tbWl0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9zdGVwcy9jb21taXQucHkJKHJldmlzaW9uIDEyMDI0OCkKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdG9vbC9zdGVwcy9jb21taXQucHkJKHdvcmtpbmcgY29weSkKQEAgLTU0 LDExICs1NCw3IEBAIGNsYXNzIENvbW1pdChBYnN0cmFjdFN0ZXApOgogICAgICAgICAgICAgICAg IGVycm9yLm51bV9sb2NhbF9jb21taXRzLCB3b3JraW5nX2RpcmVjdG9yeV9tZXNzYWdlKSkKIAog ICAgIGRlZiBfY2hlY2tfdGVzdF9leHBlY3RhdGlvbnMoc2VsZiwgY2hhbmdlZF9maWxlcyk6Ci0g ICAgICAgIHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzID0gW10KLSAgICAgICAgZm9yIGZpbGVuYW1l IGluIGNoYW5nZWRfZmlsZXM6Ci0gICAgICAgICAgICBpZiBmaWxlbmFtZS5lbmRzd2l0aCgndGVz dF9leHBlY3RhdGlvbnMudHh0Jykgb3IgZmlsZW5hbWUuZW5kc3dpdGgoJ1Rlc3RFeHBlY3RhdGlv bnMnKToKLSAgICAgICAgICAgICAgICB0ZXN0X2V4cGVjdGF0aW9uc19maWxlcy5hcHBlbmQoZmls ZW5hbWUpCi0KKyAgICAgICAgdGVzdF9leHBlY3RhdGlvbnNfZmlsZXMgPSBbZmlsZW5hbWUgZm9y IGZpbGVuYW1lIGluIGNoYW5nZWRfZmlsZXMgaWYgZmlsZW5hbWUuZW5kc3dpdGgoJ1Rlc3RFeHBl Y3RhdGlvbnMnKV0KICAgICAgICAgaWYgbm90IHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVzOgogICAg ICAgICAgICAgcmV0dXJuCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdG9vbC9zdGVw cy9jb21taXRfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL3N0ZXBzL2NvbW1pdF91bml0dGVzdC5weQkocmV2aXNpb24gMTIwMjQ4KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS90b29sL3N0ZXBzL2NvbW1pdF91bml0dGVzdC5weQkod29ya2lu ZyBjb3B5KQpAQCAtNjMsNiArNjMsMyBAQCBjbGFzcyBDb21taXRUZXN0KHVuaXR0ZXN0LlRlc3RD YXNlKToKIAogICAgIGRlZiB0ZXN0X2NoZWNrX3Rlc3RfZXhwZWN0YXRpb25zKHNlbGYpOgogICAg ICAgICBzZWxmLl90ZXN0X2NoZWNrX3Rlc3RfZXhwZWN0YXRpb25zKCdUZXN0RXhwZWN0YXRpb25z JykKLQotICAgIGRlZiB0ZXN0X2NoZWNrX2xlZ2FjeV90ZXN0X2V4cGVjdGF0aW9ucyhzZWxmKToK LSAgICAgICAgc2VsZi5fdGVzdF9jaGVja190ZXN0X2V4cGVjdGF0aW9ucygndGVzdF9leHBlY3Rh dGlvbnMudHh0JykK