89051 2012-06-13 18:51:57 -0700 webkit-patch rebaseline-expectations needs to support multiple expectations files 2012-08-08 16:55:56 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED NRWT P2 Normal --- 1 dpranke dpranke abarth epoger eric ojan rniwa oldest_to_newest 648674 0 dpranke 2012-06-13 18:51:57 -0700 and rewrite the contents of each file correctly. Right now it'll rebaseline tests listed as REBASELINE in any of the files, but only update the first expectation file found, so it won't work for updating the skia_test_expectations file or files listed in a cascade for the other ports (not that we support non-chromium ports yet, anyway). 690905 1 157330 dpranke 2012-08-08 16:35:48 -0700 Created attachment 157330 Patch 690940 2 dpranke 2012-08-08 16:55:56 -0700 Committed r125115: <http://trac.webkit.org/changeset/125115> 157330 2012-08-08 16:35:48 -0700 2012-08-08 16:46:48 -0700 Patch bug-89051-20120808163522.patch text/plain 14331 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MDk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjY5ZmRhYTcxN2Y1NTRjMjA1MjNmMDQzZTg4ZTc3NDVh MDNjNmNlMC4uODExYTRmY2E4ZWFkOTYxMzUxMDYyZjgwZTM3YjM4NmE4NjBiYjU4YiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDEyLTA4LTA4ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIHdlYmtpdC1wYXRjaCByZWJhc2VsaW5lLWV4cGVjdGF0aW9ucyBuZWVkcyB0byBzdXBw b3J0IG11bHRpcGxlIGV4cGVjdGF0aW9ucyBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODkwNTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBmaXhlZCB0aGUgYnVnIGRlc2NyaWJlZCBhYm92ZSwgYWRk ZWQgdW5pdCB0ZXN0IGluCisgICAgICAgIHRlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LCBhbmQg dXBkYXRlZCB0aGUgdG9vbCB0ZXN0cworICAgICAgICB0byBub3QgY29udGFpbiBhbGwgb2YgdGhl ICJtaXNzaW5nIHNraWEgZXhwZWN0YXRpb25zIiB3YXJuaW5ncy4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weToKKyAg ICAgICAgKFRlc3RFeHBlY3RhdGlvbnMucmVtb3ZlX3JlYmFzZWxpbmVkX3Rlc3RzKToKKyAgICAg ICAgKFRlc3RFeHBlY3RhdGlvbnMucmVtb3ZlX3JlYmFzZWxpbmVkX3Rlc3RzLndpdGhvdXRfcmVi YXNlbGluZV9tb2RpZmllcik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5OgorICAgICAgICAoUmViYXNl bGluaW5nVGVzdC5hc3NlcnRSZW1vdmUpOgorICAgICAgICAoUmViYXNlbGluaW5nVGVzdC50ZXN0 X3JlbW92ZSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFz ZWxpbmUucHk6CisgICAgICAgIChSZWJhc2VsaW5lRXhwZWN0YXRpb25zLl91cGRhdGVfZXhwZWN0 YXRpb25zX2ZpbGVzKToKKyAgICAgICAgKFJlYmFzZWxpbmVFeHBlY3RhdGlvbnMuZXhlY3V0ZSk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5p dHRlc3QucHk6CisgICAgICAgIChUZXN0UmViYXNlbGluZS50ZXN0X3JlYmFzZWxpbmVfdXBkYXRl c19leHBlY3RhdGlvbnNfZmlsZV9ub29wKToKKyAgICAgICAgKHRlc3RfcmViYXNlbGluZV9leHBl Y3RhdGlvbnMpOgorCiAyMDEyLTA4LTA4ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIEFwcGx5IGFsbCBMaW51eCBs YXlvdXQgdGVzdCBleHBlY3RhdGlvbnMKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRl eCBlMzUxZGI4OWM5YTJjZTUwMzM0YTY2YWVjYjBhMzFiNWI0NGJhZDNiLi5iYWI3NDE4MzkwNjQ2 YWY4ZTE0YjZkNWI3MzQwMDllZTIxOTJkNDQ3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25z LnB5CkBAIC04NTIsMTAgKzg1MiwxMyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zKG9iamVjdCk6 CiAKICAgICAgICAgcmV0dXJuIFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXIubGlzdF90b19zdHJp bmcoc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl9wYXJzZXIuX3Rlc3RfY29uZmlndXJhdGlvbl9j b252ZXJ0ZXIsIG1vZGlmaWVkX2V4cGVjdGF0aW9ucykKIAotICAgIGRlZiByZW1vdmVfcmViYXNl bGluZWRfdGVzdHMoc2VsZiwgZXhjZXB0X3RoZXNlX3Rlc3RzKToKLSAgICAgICAgIiIiUmV0dXJu cyBhIGNvcHkgb2YgdGhlIGV4cGVjdGF0aW9ucyB3aXRoIHRoZSB0ZXN0cyByZW1vdmVkLiIiIgor ICAgIGRlZiByZW1vdmVfcmViYXNlbGluZWRfdGVzdHMoc2VsZiwgZXhjZXB0X3RoZXNlX3Rlc3Rz LCBmaWxlbmFtZSk6CisgICAgICAgICIiIlJldHVybnMgYSBjb3B5IG9mIHRoZSBleHBlY3RhdGlv bnMgaW4gdGhlIGZpbGUgd2l0aCB0aGUgdGVzdHMgcmVtb3ZlZC4iIiIKICAgICAgICAgZGVmIHdp dGhvdXRfcmViYXNlbGluZV9tb2RpZmllcihleHBlY3RhdGlvbik6Ci0gICAgICAgICAgICByZXR1 cm4gbm90IChub3QgZXhwZWN0YXRpb24uaXNfaW52YWxpZCgpIGFuZCBleHBlY3RhdGlvbi5uYW1l IGluIGV4Y2VwdF90aGVzZV90ZXN0cyBhbmQgInJlYmFzZWxpbmUiIGluIGV4cGVjdGF0aW9uLm1v ZGlmaWVycykKKyAgICAgICAgICAgIHJldHVybiBub3QgKG5vdCBleHBlY3RhdGlvbi5pc19pbnZh bGlkKCkgYW5kCisgICAgICAgICAgICAgICAgICAgICAgICBleHBlY3RhdGlvbi5uYW1lIGluIGV4 Y2VwdF90aGVzZV90ZXN0cyBhbmQKKyAgICAgICAgICAgICAgICAgICAgICAgICJyZWJhc2VsaW5l IiBpbiBleHBlY3RhdGlvbi5tb2RpZmllcnMgYW5kCisgICAgICAgICAgICAgICAgICAgICAgICBm aWxlbmFtZSA9PSBleHBlY3RhdGlvbi5maWxlbmFtZSkKIAogICAgICAgICByZXR1cm4gVGVzdEV4 cGVjdGF0aW9uU2VyaWFsaXplci5saXN0X3RvX3N0cmluZyhmaWx0ZXIod2l0aG91dF9yZWJhc2Vs aW5lX21vZGlmaWVyLCBzZWxmLl9leHBlY3RhdGlvbnMpKQogCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5p dHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVz dF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKaW5kZXggMmI0ODUzZmE4OWYzNjA0YjgxMDAyYWE5 MmNmMjgxZjdlZTZmMDIzMi4uYjY1MTUxZDcyNTY0NDNjMTc0ZTRiZDI5Y2EzZGI4ODNjNjhmMGVh ZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQpAQCAt NDU2LDkgKzQ1Niw5IEBAIEJVR1kgV0lOIERFQlVHIDogZmFpbHVyZXMvZXhwZWN0ZWQvZm9vLmh0 bWwgPSBDUkFTSAogCiBjbGFzcyBSZWJhc2VsaW5pbmdUZXN0KEJhc2UpOgogICAgICIiIlRlc3Qg cmViYXNlbGluaW5nLXNwZWNpZmljIGZ1bmN0aW9uYWxpdHkuIiIiCi0gICAgZGVmIGFzc2VydFJl bW92ZShzZWxmLCBpbnB1dF9leHBlY3RhdGlvbnMsIHRlc3RzLCBleHBlY3RlZF9leHBlY3RhdGlv bnMpOgorICAgIGRlZiBhc3NlcnRSZW1vdmUoc2VsZiwgaW5wdXRfZXhwZWN0YXRpb25zLCB0ZXN0 cywgZXhwZWN0ZWRfZXhwZWN0YXRpb25zLCBmaWxlbmFtZSk6CiAgICAgICAgIHNlbGYucGFyc2Vf ZXhwKGlucHV0X2V4cGVjdGF0aW9ucywgaXNfbGludF9tb2RlPUZhbHNlKQotICAgICAgICBhY3R1 YWxfZXhwZWN0YXRpb25zID0gc2VsZi5fZXhwLnJlbW92ZV9yZWJhc2VsaW5lZF90ZXN0cyh0ZXN0 cykKKyAgICAgICAgYWN0dWFsX2V4cGVjdGF0aW9ucyA9IHNlbGYuX2V4cC5yZW1vdmVfcmViYXNl bGluZWRfdGVzdHModGVzdHMsIGZpbGVuYW1lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4 cGVjdGVkX2V4cGVjdGF0aW9ucywgYWN0dWFsX2V4cGVjdGF0aW9ucykKIAogICAgIGRlZiB0ZXN0 X3JlbW92ZShzZWxmKToKQEAgLTQ2Nyw3ICs0NjcsMTkgQEAgY2xhc3MgUmViYXNlbGluaW5nVGVz dChCYXNlKToKICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JVR1ogUkVCQVNFTElORSA6IGZh aWx1cmVzL2V4cGVjdGVkL2NyYXNoLmh0bWwgPSBDUkFTSFxuJywKICAgICAgICAgICAgICAgICAg ICAgICAgICAgWydmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnXSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgJ0JVR1kgOiBmYWlsdXJlcy9leHBlY3RlZC9pbWFnZS5odG1sID0gSU1BR0Vc bicKLSAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JVR1ogUkVCQVNFTElORSA6IGZhaWx1cmVz L2V4cGVjdGVkL2NyYXNoLmh0bWwgPSBDUkFTSFxuJykKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgJ0JVR1ogUkVCQVNFTElORSA6IGZhaWx1cmVzL2V4cGVjdGVkL2NyYXNoLmh0bWwgPSBDUkFT SFxuJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgJ2V4cGVjdGF0aW9ucycpCisKKyAgICAg ICAgIyB0ZXN0IHRoYXQgd2UgZG9uJ3QgcmVtb3ZlIGxpbmVzIGZyb20gdGhlIGV4cGVjdGF0aW9u cyBpZiB3ZSdyZSBhc2tpbmcgZm9yIHRoZSBvdmVycmlkZXMKKyAgICAgICAgc2VsZi5hc3NlcnRS ZW1vdmUoJ0JVR1ggUkVCQVNFTElORSA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCA9IFRF WFRcbicKKyAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JVR1kgOiBmYWlsdXJlcy9leHBlY3Rl ZC9pbWFnZS5odG1sID0gSU1BR0VcbicKKyAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JVR1og UkVCQVNFTElORSA6IGZhaWx1cmVzL2V4cGVjdGVkL2NyYXNoLmh0bWwgPSBDUkFTSFxuJywKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgWydmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnXSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JVR1ggUkVCQVNFTElORSA6IGZhaWx1cmVzL2V4 cGVjdGVkL3RleHQuaHRtbCA9IFRFWFRcbicKKyAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JV R1kgOiBmYWlsdXJlcy9leHBlY3RlZC9pbWFnZS5odG1sID0gSU1BR0VcbicKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgJ0JVR1ogUkVCQVNFTElORSA6IGZhaWx1cmVzL2V4cGVjdGVkL2NyYXNo Lmh0bWwgPSBDUkFTSFxuJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgJ292ZXJyaWRlcycp CisKIAogICAgIGRlZiB0ZXN0X25vX2dldF9yZWJhc2VsaW5pbmdfZmFpbHVyZXMoc2VsZik6CiAg ICAgICAgIHNlbGYucGFyc2VfZXhwKHNlbGYuZ2V0X2Jhc2ljX2V4cGVjdGF0aW9ucygpKQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmUu cHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQpp bmRleCBlZDI3YWI1NTM5N2QzZTE0YjVlYTBkZGY5NzVkNWU2YjlmYWVhZWQwLi43Y2NiZjU2NWEz ZTZkZWMzZTE0NWIwMTcxYTAyM2I2ZDFlZGEzMGQ0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZS5weQpAQCAtMzIxLDE2ICszMjEsMTMg QEAgY2xhc3MgUmViYXNlbGluZUV4cGVjdGF0aW9ucyhBYnN0cmFjdFBhcmFsbGVsUmViYXNlbGlu ZUNvbW1hbmQpOgogICAgIG5hbWUgPSAicmViYXNlbGluZS1leHBlY3RhdGlvbnMiCiAgICAgaGVs cF90ZXh0ID0gIlJlYmFzZWxpbmVzIHRoZSB0ZXN0cyBpbmRpY2F0ZWQgaW4gVGVzdEV4cGVjdGF0 aW9ucy4iCiAKLSAgICBkZWYgX3VwZGF0ZV9leHBlY3RhdGlvbnNfZmlsZShzZWxmLCBwb3J0X25h bWUpOgorICAgIGRlZiBfdXBkYXRlX2V4cGVjdGF0aW9uc19maWxlcyhzZWxmLCBwb3J0X25hbWUp OgogICAgICAgICBwb3J0ID0gc2VsZi5fdG9vbC5wb3J0X2ZhY3RvcnkuZ2V0KHBvcnRfbmFtZSkK IAotICAgICAgICAjIEZJWE1FOiBUaGlzIHdpbGwgaW50ZW50aW9uYWxseSBza2lwIG92ZXIgYW55 IFJFQkFTRUxJTkUgZXhwZWN0YXRpb25zIHRoYXQgd2VyZSBpbiBhbiBvdmVycmlkZXMgZmlsZS4K LSAgICAgICAgIyBUaGlzIGlzIG5vdCBnb29kLCBidXQgYXZvaWRzIGhhdmluZyB0aGUgb3ZlcnJp ZGVzIGdldHRpbmcgd3JpdHRlbiBpbnRvIHRoZSBtYWluIGZpbGUuCi0gICAgICAgICMgU2VlIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04ODQ1NiBmb3IgY29udGV4dC4g VGhpcyB3aWxsIG5vIGxvbmdlciBiZSBuZWVkZWQKLSAgICAgICAgIyBvbmNlIHdlIHByb3Blcmx5 IHN1cHBvcnQgY2FzY2FkaW5nIGV4cGVjdGF0aW9ucyBmaWxlcy4KICAgICAgICAgZXhwZWN0YXRp b25zID0gVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCBpbmNsdWRlX292ZXJyaWRlcz1GYWxzZSkKLSAg ICAgICAgcGF0aCA9IHBvcnQucGF0aF90b190ZXN0X2V4cGVjdGF0aW9uc19maWxlKCkKLSAgICAg ICAgc2VsZi5fdG9vbC5maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShwYXRoLCBleHBlY3RhdGlv bnMucmVtb3ZlX3JlYmFzZWxpbmVkX3Rlc3RzKGV4cGVjdGF0aW9ucy5nZXRfcmViYXNlbGluaW5n X2ZhaWx1cmVzKCkpKQorICAgICAgICBmb3IgcGF0aCBpbiBwb3J0LmV4cGVjdGF0aW9uc19kaWN0 KCk6CisgICAgICAgICAgICBpZiBzZWxmLl90b29sLmZpbGVzeXN0ZW0uZXhpc3RzKHBhdGgpOgor ICAgICAgICAgICAgICAgIHNlbGYuX3Rvb2wuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUocGF0 aCwgZXhwZWN0YXRpb25zLnJlbW92ZV9yZWJhc2VsaW5lZF90ZXN0cyhleHBlY3RhdGlvbnMuZ2V0 X3JlYmFzZWxpbmluZ19mYWlsdXJlcygpLCBwYXRoKSkKIAogICAgIGRlZiBfdGVzdHNfdG9fcmVi YXNlbGluZShzZWxmLCBwb3J0KToKICAgICAgICAgdGVzdHNfdG9fcmViYXNlbGluZSA9IHt9CkBA IC0zNjEsNyArMzU4LDcgQEAgY2xhc3MgUmViYXNlbGluZUV4cGVjdGF0aW9ucyhBYnN0cmFjdFBh cmFsbGVsUmViYXNlbGluZUNvbW1hbmQpOgogICAgICAgICBzZWxmLl9yZWJhc2VsaW5lKG9wdGlv bnMsIHNlbGYuX3Rlc3RfbGlzdCkKIAogICAgICAgICBmb3IgcG9ydF9uYW1lIGluIHRvb2wucG9y dF9mYWN0b3J5LmFsbF9wb3J0X25hbWVzKCk6Ci0gICAgICAgICAgICBzZWxmLl91cGRhdGVfZXhw ZWN0YXRpb25zX2ZpbGUocG9ydF9uYW1lKQorICAgICAgICAgICAgc2VsZi5fdXBkYXRlX2V4cGVj dGF0aW9uc19maWxlcyhwb3J0X25hbWUpCiAKIAogY2xhc3MgUmViYXNlbGluZShBYnN0cmFjdFBh cmFsbGVsUmViYXNlbGluZUNvbW1hbmQpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS90b29sL2NvbW1hbmRzL3JlYmFzZWxpbmVfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQppbmRleCA0MzM5 MDZiOGM1OTUwYjhkYTlkNDg0MGU5M2EwZGNhYWZmOTY5ZmRiLi45M2JkNWM1MDAxYWNiMGM1NzNk YTQ5Y2ZmZDQ3MDI1YmJkZGEzYjQ2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L3Rvb2wvY29tbWFuZHMvcmViYXNlbGluZV91bml0dGVzdC5weQpAQCAtNjMsNiAr NjMsOCBAQCBjbGFzcyBUZXN0UmViYXNlbGluZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAg IGNvbW1hbmQuYmluZF90b190b29sKHRvb2wpCiAKICAgICAgICAgbGlvbl9wb3J0ID0gdG9vbC5w b3J0X2ZhY3RvcnkuZ2V0X2Zyb21fYnVpbGRlcl9uYW1lKCJXZWJraXQgTWFjMTAuNyIpCisgICAg ICAgICMgRklYTUU6IHdvcmsgYXJvdW5kIHRoZSBjaHJvbWl1bSBza2lhIGV4cGVjdGF0aW9ucyBm aWxlIHRvIGF2b2lkIGdldHRpbmcgYSBidW5jaCBvZiBjb25mdXNpbmcgd2FybmluZ3MuCisgICAg ICAgIHRvb2wuZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUobGlvbl9wb3J0LnBhdGhfZnJvbV9j aHJvbWl1bV9iYXNlKCdza2lhJywgJ3NraWFfdGVzdF9leHBlY3RhdGlvbnMudHh0JyksICcnKQog ICAgICAgICBmb3IgcGF0aCBpbiBsaW9uX3BvcnQuZXhwZWN0YXRpb25zX2ZpbGVzKCk6CiAgICAg ICAgICAgICB0b29sLmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHBhdGgsICcnKQogICAgICAg ICB0b29sLmZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKGxpb25fcG9ydC5wYXRoX3RvX3Rlc3Rf ZXhwZWN0YXRpb25zX2ZpbGUoKSwgIiIiQlVHQiBNQUMgTElOVVggWFAgREVCVUcgOiBmYXN0L2Rv bS9XaW5kb3cvd2luZG93LXBvc3RtZXNzYWdlLWNsb25lLXJlYWxseS1kZWVwLWFycmF5Lmh0bWwg PSBQQVNTCkBAIC03NSw3ICs3Nyw2IEBAIEJVR0EgREVCVUcgOiBmYXN0L2Nzcy9sYXJnZS1saXN0 LW9mLXJ1bGVzLWNyYXNoLmh0bWwgPSBURVhUCiAgICAgICAgIGV4cGVjdGVkX2xvZ3MgPSAiIiJS ZXRyaWV2aW5nIGh0dHA6Ly9leGFtcGxlLmNvbS9mL2J1aWxkZXJzL1dlYmtpdCBNYWMxMC43L3Jl c3VsdHMvbGF5b3V0LXRlc3QtcmVzdWx0cy91c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QtYWN0dWFs LnBuZy4KIFJldHJpZXZpbmcgaHR0cDovL2V4YW1wbGUuY29tL2YvYnVpbGRlcnMvV2Via2l0IE1h YzEwLjcvcmVzdWx0cy9sYXlvdXQtdGVzdC1yZXN1bHRzL3VzZXJzY3JpcHRzL2Fub3RoZXItdGVz dC1hY3R1YWwud2F2LgogUmV0cmlldmluZyBodHRwOi8vZXhhbXBsZS5jb20vZi9idWlsZGVycy9X ZWJraXQgTWFjMTAuNy9yZXN1bHRzL2xheW91dC10ZXN0LXJlc3VsdHMvdXNlcnNjcmlwdHMvYW5v dGhlci10ZXN0LWFjdHVhbC50eHQuCi1Vc2luZyB0aGUgY2hyb21pdW0gcG9ydCB3aXRob3V0IGhh dmluZyB0aGUgZG93bnN0cmVhbSBza2lhX3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBmaWxlIGNoZWNr ZWQgb3V0LiBFeHBlY3RhdGlvbnMgcmVsYXRlZCB0aGluZ3MgbWlnaHQgYmUgd29ua3kuCiAiIiIK ICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRwdXRzKHNlbGYsIGNvbW1hbmQuX3Jl YmFzZWxpbmVfdGVzdF9hbmRfdXBkYXRlX2V4cGVjdGF0aW9ucywgWyJXZWJraXQgTWFjMTAuNyIs ICJ1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCIsIE5vbmVdLCBleHBlY3RlZF9sb2dzPWV4 cGVjdGVkX2xvZ3MpCiAKQEAgLTIyNyw2ICsyMjgsOSBAQCBNT0NLIHJ1bl9jb21tYW5kOiBbJ2Vj aG8nLCAnb3B0aW1pemUtYmFzZWxpbmVzJywgJy0tc3VmZml4ZXMnLCAndHh0JywgJ3VzZXItc2Ny aQogICAgICAgICB0b29sID0gTW9ja1Rvb2woKQogICAgICAgICBjb21tYW5kLmJpbmRfdG9fdG9v bCh0b29sKQogCisgICAgICAgICMgRklYTUU6IHdvcmsgYXJvdW5kIHRoZSBjaHJvbWl1bSBza2lh IGV4cGVjdGF0aW9ucyBmaWxlIHRvIGF2b2lkIGdldHRpbmcgYSBidW5jaCBvZiBjb25mdXNpbmcg d2FybmluZ3MuCisgICAgICAgIGxpb25fcG9ydCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldF9mcm9t X2J1aWxkZXJfbmFtZSgiV2Via2l0IE1hYzEwLjciKQorICAgICAgICB0b29sLmZpbGVzeXN0ZW0u d3JpdGVfdGV4dF9maWxlKGxpb25fcG9ydC5wYXRoX2Zyb21fY2hyb21pdW1fYmFzZSgnc2tpYScs ICdza2lhX3Rlc3RfZXhwZWN0YXRpb25zLnR4dCcpLCAnJykKICAgICAgICAgZm9yIHBvcnRfbmFt ZSBpbiB0b29sLnBvcnRfZmFjdG9yeS5hbGxfcG9ydF9uYW1lcygpOgogICAgICAgICAgICAgcG9y dCA9IHRvb2wucG9ydF9mYWN0b3J5LmdldChwb3J0X25hbWUpCiAgICAgICAgICAgICBmb3IgcGF0 aCBpbiBwb3J0LmV4cGVjdGF0aW9uc19maWxlcygpOgpAQCAtMjc0LDEyICsyNzgsNiBAQCBSZXRy aWV2aW5nIHJlc3VsdHMgZm9yIHF0LWxpbnV4IGZyb20gUXQgTGludXggUmVsZWFzZS4KIFJldHJp ZXZpbmcgcmVzdWx0cyBmb3Igd2luLTdzcDAgZnJvbSBBcHBsZSBXaW4gNyBSZWxlYXNlIChUZXN0 cykuCiAgICAgdXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwgKHR4dCkKICAgICB1c2Vyc2Ny aXB0cy9pbWFnZXMuc3ZnIChwbmcpCi1Vc2luZyB0aGUgY2hyb21pdW0gcG9ydCB3aXRob3V0IGhh dmluZyB0aGUgZG93bnN0cmVhbSBza2lhX3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBmaWxlIGNoZWNr ZWQgb3V0LiBFeHBlY3RhdGlvbnMgcmVsYXRlZCB0aGluZ3MgbWlnaHQgYmUgd29ua3kuCi1Vc2lu ZyB0aGUgY2hyb21pdW0gcG9ydCB3aXRob3V0IGhhdmluZyB0aGUgZG93bnN0cmVhbSBza2lhX3Rl c3RfZXhwZWN0YXRpb25zLnR4dCBmaWxlIGNoZWNrZWQgb3V0LiBFeHBlY3RhdGlvbnMgcmVsYXRl ZCB0aGluZ3MgbWlnaHQgYmUgd29ua3kuCi1Vc2luZyB0aGUgY2hyb21pdW0gcG9ydCB3aXRob3V0 IGhhdmluZyB0aGUgZG93bnN0cmVhbSBza2lhX3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBmaWxlIGNo ZWNrZWQgb3V0LiBFeHBlY3RhdGlvbnMgcmVsYXRlZCB0aGluZ3MgbWlnaHQgYmUgd29ua3kuCi1V c2luZyB0aGUgY2hyb21pdW0gcG9ydCB3aXRob3V0IGhhdmluZyB0aGUgZG93bnN0cmVhbSBza2lh X3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBmaWxlIGNoZWNrZWQgb3V0LiBFeHBlY3RhdGlvbnMgcmVs YXRlZCB0aGluZ3MgbWlnaHQgYmUgd29ua3kuCi1Vc2luZyB0aGUgY2hyb21pdW0gcG9ydCB3aXRo b3V0IGhhdmluZyB0aGUgZG93bnN0cmVhbSBza2lhX3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBmaWxl IGNoZWNrZWQgb3V0LiBFeHBlY3RhdGlvbnMgcmVsYXRlZCB0aGluZ3MgbWlnaHQgYmUgd29ua3ku Ci1Vc2luZyB0aGUgY2hyb21pdW0gcG9ydCB3aXRob3V0IGhhdmluZyB0aGUgZG93bnN0cmVhbSBz a2lhX3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBmaWxlIGNoZWNrZWQgb3V0LiBFeHBlY3RhdGlvbnMg cmVsYXRlZCB0aGluZ3MgbWlnaHQgYmUgd29ua3kuCiAiIiIKIAogICAgICAgICBleHBlY3RlZF9z dGRvdXQgPSAiIiJbKFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3QtaW50ZXJuYWwnLCAnLS1zdWZm aXhlcycsICd0eHQnLCAnLS1idWlsZGVyJywgJ1dlYmtpdCBMaW51eCAzMicsICctLXRlc3QnLCAn dXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwnXSwgJy9tb2NrLWNoZWNrb3V0JyksIChbJ2Vj aG8nLCAncmViYXNlbGluZS10ZXN0LWludGVybmFsJywgJy0tc3VmZml4ZXMnLCAndHh0JywgJy0t YnVpbGRlcicsICdXZWJraXQgTGludXgnLCAnLS10ZXN0JywgJ3VzZXJzY3JpcHRzL2Fub3RoZXIt dGVzdC5odG1sJ10sICcvbW9jay1jaGVja291dCcpLCAoWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVz dC1pbnRlcm5hbCcsICctLXN1ZmZpeGVzJywgJ3R4dCcsICctLWJ1aWxkZXInLCAnV2Via2l0IE1h YzEwLjYnLCAnLS10ZXN0JywgJ3VzZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJ10sICcvbW9j ay1jaGVja291dCcpLCAoWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdC1pbnRlcm5hbCcsICctLXN1 ZmZpeGVzJywgJ3R4dCcsICctLWJ1aWxkZXInLCAnV2Via2l0IE1hYzEwLjcnLCAnLS10ZXN0Jywg J3VzZXJzY3JpcHRzL2Fub3RoZXItdGVzdC5odG1sJ10sICcvbW9jay1jaGVja291dCcpLCAoWydl Y2hvJywgJ3JlYmFzZWxpbmUtdGVzdC1pbnRlcm5hbCcsICctLXN1ZmZpeGVzJywgJ3R4dCcsICct LWJ1aWxkZXInLCAnV2Via2l0IFdpbjcnLCAnLS10ZXN0JywgJ3VzZXJzY3JpcHRzL2Fub3RoZXIt dGVzdC5odG1sJ10sICcvbW9jay1jaGVja291dCcpLCAoWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVz dC1pbnRlcm5hbCcsICctLXN1ZmZpeGVzJywgJ3R4dCcsICctLWJ1aWxkZXInLCAnQXBwbGUgV2lu IDcgUmVsZWFzZSAoVGVzdHMpJywgJy0tdGVzdCcsICd1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3Qu aHRtbCddLCAnL21vY2stY2hlY2tvdXQnKSwgKFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3QtaW50 ZXJuYWwnLCAnLS1zdWZmaXhlcycsICd0eHQnLCAnLS1idWlsZGVyJywgJ0VGTCBMaW51eCA2NC1i aXQgUmVsZWFzZScsICctLXRlc3QnLCAndXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwnXSwg Jy9tb2NrLWNoZWNrb3V0JyksIChbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0LWludGVybmFsJywg Jy0tc3VmZml4ZXMnLCAndHh0JywgJy0tYnVpbGRlcicsICdXZWJraXQgV2luJywgJy0tdGVzdCcs ICd1c2Vyc2NyaXB0cy9hbm90aGVyLXRlc3QuaHRtbCddLCAnL21vY2stY2hlY2tvdXQnKSwgKFsn ZWNobycsICdyZWJhc2VsaW5lLXRlc3QtaW50ZXJuYWwnLCAnLS1zdWZmaXhlcycsICd0eHQnLCAn LS1idWlsZGVyJywgJ0dUSyBMaW51eCA2NC1iaXQgUmVsZWFzZScsICctLXRlc3QnLCAndXNlcnNj cmlwdHMvYW5vdGhlci10ZXN0Lmh0bWwnXSwgJy9tb2NrLWNoZWNrb3V0JyksIChbJ2VjaG8nLCAn cmViYXNlbGluZS10ZXN0LWludGVybmFsJywgJy0tc3VmZml4ZXMnLCAndHh0JywgJy0tYnVpbGRl cicsICdRdCBMaW51eCBSZWxlYXNlJywgJy0tdGVzdCcsICd1c2Vyc2NyaXB0cy9hbm90aGVyLXRl c3QuaHRtbCddLCAnL21vY2stY2hlY2tvdXQnKSwgKFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3Qt aW50ZXJuYWwnLCAnLS1zdWZmaXhlcycsICd0eHQnLCAnLS1idWlsZGVyJywgJ0FwcGxlIExpb24g UmVsZWFzZSBXSzEgKFRlc3RzKScsICctLXRlc3QnLCAndXNlcnNjcmlwdHMvYW5vdGhlci10ZXN0 Lmh0bWwnXSwgJy9tb2NrLWNoZWNrb3V0JyksIChbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0LWlu dGVybmFsJywgJy0tc3VmZml4ZXMnLCAncG5nJywgJy0tYnVpbGRlcicsICdXZWJraXQgTGludXgg MzInLCAnLS10ZXN0JywgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcnXSwgJy9tb2NrLWNoZWNrb3V0 JyksIChbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0LWludGVybmFsJywgJy0tc3VmZml4ZXMnLCAn cG5nJywgJy0tYnVpbGRlcicsICdXZWJraXQgTGludXgnLCAnLS10ZXN0JywgJ3VzZXJzY3JpcHRz L2ltYWdlcy5zdmcnXSwgJy9tb2NrLWNoZWNrb3V0JyksIChbJ2VjaG8nLCAncmViYXNlbGluZS10 ZXN0LWludGVybmFsJywgJy0tc3VmZml4ZXMnLCAncG5nJywgJy0tYnVpbGRlcicsICdXZWJraXQg TWFjMTAuNicsICctLXRlc3QnLCAndXNlcnNjcmlwdHMvaW1hZ2VzLnN2ZyddLCAnL21vY2stY2hl Y2tvdXQnKSwgKFsnZWNobycsICdyZWJhc2VsaW5lLXRlc3QtaW50ZXJuYWwnLCAnLS1zdWZmaXhl cycsICdwbmcnLCAnLS1idWlsZGVyJywgJ1dlYmtpdCBNYWMxMC43JywgJy0tdGVzdCcsICd1c2Vy c2NyaXB0cy9pbWFnZXMuc3ZnJ10sICcvbW9jay1jaGVja291dCcpLCAoWydlY2hvJywgJ3JlYmFz ZWxpbmUtdGVzdC1pbnRlcm5hbCcsICctLXN1ZmZpeGVzJywgJ3BuZycsICctLWJ1aWxkZXInLCAn V2Via2l0IFdpbjcnLCAnLS10ZXN0JywgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcnXSwgJy9tb2Nr LWNoZWNrb3V0JyksIChbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0LWludGVybmFsJywgJy0tc3Vm Zml4ZXMnLCAncG5nJywgJy0tYnVpbGRlcicsICdBcHBsZSBXaW4gNyBSZWxlYXNlIChUZXN0cykn LCAnLS10ZXN0JywgJ3VzZXJzY3JpcHRzL2ltYWdlcy5zdmcnXSwgJy9tb2NrLWNoZWNrb3V0Jyks IChbJ2VjaG8nLCAncmViYXNlbGluZS10ZXN0LWludGVybmFsJywgJy0tc3VmZml4ZXMnLCAncG5n JywgJy0tYnVpbGRlcicsICdFRkwgTGludXggNjQtYml0IFJlbGVhc2UnLCAnLS10ZXN0JywgJ3Vz ZXJzY3JpcHRzL2ltYWdlcy5zdmcnXSwgJy9tb2NrLWNoZWNrb3V0JyksIChbJ2VjaG8nLCAncmVi YXNlbGluZS10ZXN0LWludGVybmFsJywgJy0tc3VmZml4ZXMnLCAncG5nJywgJy0tYnVpbGRlcics ICdXZWJraXQgV2luJywgJy0tdGVzdCcsICd1c2Vyc2NyaXB0cy9pbWFnZXMuc3ZnJ10sICcvbW9j ay1jaGVja291dCcpLCAoWydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdC1pbnRlcm5hbCcsICctLXN1 ZmZpeGVzJywgJ3BuZycsICctLWJ1aWxkZXInLCAnR1RLIExpbnV4IDY0LWJpdCBSZWxlYXNlJywg Jy0tdGVzdCcsICd1c2Vyc2NyaXB0cy9pbWFnZXMuc3ZnJ10sICcvbW9jay1jaGVja291dCcpLCAo WydlY2hvJywgJ3JlYmFzZWxpbmUtdGVzdC1pbnRlcm5hbCcsICctLXN1ZmZpeGVzJywgJ3BuZycs ICctLWJ1aWxkZXInLCAnUXQgTGludXggUmVsZWFzZScsICctLXRlc3QnLCAndXNlcnNjcmlwdHMv aW1hZ2VzLnN2ZyddLCAnL21vY2stY2hlY2tvdXQnKSwgKFsnZWNobycsICdyZWJhc2VsaW5lLXRl c3QtaW50ZXJuYWwnLCAnLS1zdWZmaXhlcycsICdwbmcnLCAnLS1idWlsZGVyJywgJ0FwcGxlIExp b24gUmVsZWFzZSBXSzEgKFRlc3RzKScsICctLXRlc3QnLCAndXNlcnNjcmlwdHMvaW1hZ2VzLnN2 ZyddLCAnL21vY2stY2hlY2tvdXQnKV0K