74898 2011-12-19 16:36:09 -0800 nrwt: rename field references from _fs to _filesystem 2011-12-20 15:40:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth ojan webkit.review.bot oldest_to_newest 524278 0 dpranke 2011-12-19 16:36:09 -0800 nrwt: rename field references from _fs to _filesystem 524280 1 119947 dpranke 2011-12-19 16:37:51 -0800 Created attachment 119947 Patch 524890 2 dpranke 2011-12-20 15:40:16 -0800 Committed r103357: <http://trac.webkit.org/changeset/103357> 119947 2011-12-19 16:37:51 -0800 2011-12-20 01:05:47 -0800 Patch bug-74898-20111219163750.patch text/plain 14822 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzMjcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTgyYTZkOTUxNGQ0YWY2OWJiOGMxNzRlMGU2MGY0MTdl ZTdjZGE2Yi4uN2Y5Njk5YzE0YWJmNjFlZTQ4YmIzYTFkZGYwYTkxZmJhMDk1NDk0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM5 IEBACiAyMDExLTEyLTE5ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IHJlbmFtZSBmaWVsZCByZWZlcmVuY2VzIGZyb20gX2ZzIHRvIF9maWxlc3lz dGVtCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDg5 OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg aXMgYSBzaW1wbGUgY2xlYW51cDsgbW9zdCBvZiB0aGUgY29kZSB1c2VzCisgICAgICAgIHNlbGYu X2ZpbGVzeXN0ZW0sIGJ1dCBzb21lIHVzZWQgc2VsZi5fZnM7IHRoaXMgY2hhbmdlIHJlbmFtZXMK KyAgICAgICAgdGhlIGxhdHRlciB0byB0aGUgZm9ybWVyIHRvIGJlIG1vcmUgY29uc2lzdGVudC4K KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXIucHk6CisgICAgICAgIChNYW5hZ2VyLl9faW5pdF9fKToKKyAgICAgICAgKE1hbmFnZXIu Y29sbGVjdF90ZXN0cyk6CisgICAgICAgIChNYW5hZ2VyLl9zdHJpcF90ZXN0X2Rpcl9wcmVmaXgp OgorICAgICAgICAoTWFuYWdlci5fc3BsaXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KToKKyAg ICAgICAgKE1hbmFnZXIucmVzdWx0c19kaXJlY3RvcnkpOgorICAgICAgICAoTWFuYWdlci5fY2xv YmJlcl9vbGRfcmVzdWx0cyk6CisgICAgICAgIChNYW5hZ2VyLl91cGxvYWRfanNvbl9maWxlcyk6 CisgICAgICAgIChNYW5hZ2VyLnByaW50X2NvbmZpZyk6CisgICAgICAgIChNYW5hZ2VyLl9jb3B5 X3Jlc3VsdHNfaHRtbF9maWxlKToKKyAgICAgICAgKE1hbmFnZXIuX3Nob3dfcmVzdWx0c19odG1s X2ZpbGUpOgorICAgICAgICAoTWFuYWdlci5fbG9nX3dvcmtlcl9zdGFjayk6CisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRf cmVzdWx0c19nZW5lcmF0b3IucHk6CisgICAgICAgIChKU09OTGF5b3V0UmVzdWx0c0dlbmVyYXRv ci5fbm9ybWFsaXplX3Jlc3VsdHNfanNvbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weToKKyAg ICAgICAgKEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZS5fX2luaXRfXyk6CisgICAgICAgIChKU09O UmVzdWx0c0dlbmVyYXRvckJhc2UuZ2VuZXJhdGVfanNvbl9vdXRwdXQpOgorICAgICAgICAoSlNP TlJlc3VsdHNHZW5lcmF0b3JCYXNlLmdlbmVyYXRlX3RpbWVzX21zX2ZpbGUpOgorICAgICAgICAo SlNPTlJlc3VsdHNHZW5lcmF0b3JCYXNlLnVwbG9hZF9qc29uX2ZpbGVzKToKKyAgICAgICAgKEpT T05SZXN1bHRzR2VuZXJhdG9yQmFzZS5fZ2V0X3N2bl9yZXZpc2lvbik6CisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoQmFzZS5fX2luaXRfXyk6CisKKzIwMTEtMTItMTkgIERpcmsgUHJh bmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgd2Via2l0cHk6IHJlbW92ZSBw b3J0LmV4ZWN1dGl2ZSwgcG9ydC5maWxlc3lzdGVtLCBwb3J0LnVzZXIgcHJvcGVydGllcwogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ4OTYKIApkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL21hbmFnZXIucHkKaW5kZXggNWFkZjEyYTlhZDIxMmMwMjU4NjBlNjNkMjkzNzc3YmI4YjZk NmUyYS4uYWZmNjA0ODMzNjAxNjU1MGU3NTZkNTM3Zjg4NWM4MzM4OGY0ZTg3ZCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdl ci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy9tYW5hZ2VyLnB5CkBAIC0yOTAsOCArMjkwLDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgog ICAgICAgICAgIHByaW50ZXI6IGEgUHJpbnRlciBvYmplY3QgdG8gcmVjb3JkIHVwZGF0ZXMgdG8u CiAgICAgICAgICIiIgogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAotICAgICAgICAjIEZJWE1F OiBSZW5hbWUgdG8gc2VsZi5fZmlsZXN5c3RlbSBmb3IgY29uc2lzdGVuY3kgd2l0aCBvdGhlciBj b2RlLgotICAgICAgICBzZWxmLl9mcyA9IHBvcnQuaG9zdC5maWxlc3lzdGVtCisgICAgICAgIHNl bGYuX2ZpbGVzeXN0ZW0gPSBwb3J0Lmhvc3QuZmlsZXN5c3RlbQogICAgICAgICBzZWxmLl9vcHRp b25zID0gb3B0aW9ucwogICAgICAgICBzZWxmLl9wcmludGVyID0gcHJpbnRlcgogICAgICAgICBz ZWxmLl9tZXNzYWdlX2Jyb2tlciA9IE5vbmUKQEAgLTMzMyw3ICszMzIsNyBAQCBjbGFzcyBNYW5h Z2VyKG9iamVjdCk6CiAgICAgICAgICIiIgogICAgICAgICBwYXRocyA9IHNlbGYuX3N0cmlwX3Rl c3RfZGlyX3ByZWZpeGVzKGFyZ3MpCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMudGVzdF9saXN0 OgotICAgICAgICAgICAgcGF0aHMgKz0gc2VsZi5fc3RyaXBfdGVzdF9kaXJfcHJlZml4ZXMocmVh ZF90ZXN0X2ZpbGVzKHNlbGYuX2ZzLCBzZWxmLl9vcHRpb25zLnRlc3RfbGlzdCwgc2VsZi5fcG9y dC5URVNUX1BBVEhfU0VQQVJBVE9SKSkKKyAgICAgICAgICAgIHBhdGhzICs9IHNlbGYuX3N0cmlw X3Rlc3RfZGlyX3ByZWZpeGVzKHJlYWRfdGVzdF9maWxlcyhzZWxmLl9maWxlc3lzdGVtLCBzZWxm Ll9vcHRpb25zLnRlc3RfbGlzdCwgc2VsZi5fcG9ydC5URVNUX1BBVEhfU0VQQVJBVE9SKSkKICAg ICAgICAgc2VsZi5fdGVzdF9maWxlcyA9IHNlbGYuX3BvcnQudGVzdHMocGF0aHMpCiAKICAgICBk ZWYgX3N0cmlwX3Rlc3RfZGlyX3ByZWZpeGVzKHNlbGYsIHBhdGhzKToKQEAgLTM0NCw4ICszNDMs OCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICMgdGhlIGZpbGVzeXN0ZW0gdXNl cyAnXFwnIGFzIGEgZGlyZWN0b3J5IHNlcGFyYXRvci4KICAgICAgICAgaWYgcGF0aC5zdGFydHN3 aXRoKHNlbGYuTEFZT1VUX1RFU1RTX0RJUkVDVE9SWSArIHNlbGYuX3BvcnQuVEVTVF9QQVRIX1NF UEFSQVRPUik6CiAgICAgICAgICAgICByZXR1cm4gcGF0aFtsZW4oc2VsZi5MQVlPVVRfVEVTVFNf RElSRUNUT1JZICsgc2VsZi5fcG9ydC5URVNUX1BBVEhfU0VQQVJBVE9SKTpdCi0gICAgICAgIGlm IHBhdGguc3RhcnRzd2l0aChzZWxmLkxBWU9VVF9URVNUU19ESVJFQ1RPUlkgKyBzZWxmLl9mcy5z ZXApOgotICAgICAgICAgICAgcmV0dXJuIHBhdGhbbGVuKHNlbGYuTEFZT1VUX1RFU1RTX0RJUkVD VE9SWSArIHNlbGYuX2ZzLnNlcCk6XQorICAgICAgICBpZiBwYXRoLnN0YXJ0c3dpdGgoc2VsZi5M QVlPVVRfVEVTVFNfRElSRUNUT1JZICsgc2VsZi5fZmlsZXN5c3RlbS5zZXApOgorICAgICAgICAg ICAgcmV0dXJuIHBhdGhbbGVuKHNlbGYuTEFZT1VUX1RFU1RTX0RJUkVDVE9SWSArIHNlbGYuX2Zp bGVzeXN0ZW0uc2VwKTpdCiAgICAgICAgIHJldHVybiBwYXRoCiAKICAgICBkZWYgbGludChzZWxm KToKQEAgLTQ1Miw4ICs0NTEsOCBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAg ICBzZWxmLl9wcmludGVyLnByaW50X2V4cGVjdGVkKGV4dHJhX21zZykKICAgICAgICAgICAgIHRl c3RzX3J1bl9tc2cgKz0gIlxuIiArIGV4dHJhX21zZwogICAgICAgICAgICAgZmlsZXMuZXh0ZW5k KHRlc3RfZmlsZXNbMDpleHRyYV0pCi0gICAgICAgIHRlc3RzX3J1bl9maWxlbmFtZSA9IHNlbGYu X2ZzLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJ0ZXN0c19ydW4udHh0IikKLSAgICAg ICAgc2VsZi5fZnMud3JpdGVfdGV4dF9maWxlKHRlc3RzX3J1bl9maWxlbmFtZSwgdGVzdHNfcnVu X21zZykKKyAgICAgICAgdGVzdHNfcnVuX2ZpbGVuYW1lID0gc2VsZi5fZmlsZXN5c3RlbS5qb2lu KHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAidGVzdHNfcnVuLnR4dCIpCisgICAgICAgIHNlbGYu X2ZpbGVzeXN0ZW0ud3JpdGVfdGV4dF9maWxlKHRlc3RzX3J1bl9maWxlbmFtZSwgdGVzdHNfcnVu X21zZykKIAogICAgICAgICBsZW5fc2tpcF9jaHVuayA9IGludChsZW4oZmlsZXMpICogbGVuKHNr aXBwZWQpIC8gZmxvYXQobGVuKHNlbGYuX3Rlc3RfZmlsZXMpKSkKICAgICAgICAgc2tpcF9jaHVu a19saXN0ID0gbGlzdChza2lwcGVkKVswOmxlbl9za2lwX2NodW5rXQpAQCAtODI5LDggKzgyOCw4 IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgaWYgbm90IHNlbGYuX3JldHJ5aW5n OgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5CiAgICAgICAgIGVs c2U6Ci0gICAgICAgICAgICBzZWxmLl9mcy5tYXliZV9tYWtlX2RpcmVjdG9yeShzZWxmLl9mcy5q b2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAncmV0cmllcycpKQotICAgICAgICAgICAgcmV0 dXJuIHNlbGYuX2ZzLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICdyZXRyaWVzJykKKyAg ICAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0ubWF5YmVfbWFrZV9kaXJlY3Rvcnkoc2VsZi5fZmls ZXN5c3RlbS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAncmV0cmllcycpKQorICAgICAg ICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2RpcmVjdG9y eSwgJ3JldHJpZXMnKQogCiAgICAgZGVmIHVwZGF0ZShzZWxmKToKICAgICAgICAgc2VsZi51cGRh dGVfc3VtbWFyeShzZWxmLl9jdXJyZW50X3Jlc3VsdF9zdW1tYXJ5KQpAQCAtMTAzNiw4ICsxMDM1 LDggQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBsYXlvdXRfdGVzdHNfZGlyID0g c2VsZi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkKICAgICAgICAgcG9zc2libGVfZGlycyA9IHNl bGYuX3BvcnQudGVzdF9kaXJzKCkKICAgICAgICAgZm9yIGRpcm5hbWUgaW4gcG9zc2libGVfZGly czoKLSAgICAgICAgICAgIGlmIHNlbGYuX2ZzLmlzZGlyKHNlbGYuX2ZzLmpvaW4obGF5b3V0X3Rl c3RzX2RpciwgZGlybmFtZSkpOgotICAgICAgICAgICAgICAgIHNlbGYuX2ZzLnJtdHJlZShzZWxm Ll9mcy5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBkaXJuYW1lKSkKKyAgICAgICAgICAg IGlmIHNlbGYuX2ZpbGVzeXN0ZW0uaXNkaXIoc2VsZi5fZmlsZXN5c3RlbS5qb2luKGxheW91dF90 ZXN0c19kaXIsIGRpcm5hbWUpKToKKyAgICAgICAgICAgICAgICBzZWxmLl9maWxlc3lzdGVtLnJt dHJlZShzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksIGRpcm5h bWUpKQogCiAgICAgZGVmIF9nZXRfZmFpbHVyZXMoc2VsZiwgcmVzdWx0X3N1bW1hcnksIGluY2x1 ZGVfY3Jhc2hlcywgaW5jbHVkZV9taXNzaW5nKToKICAgICAgICAgIiIiRmlsdGVycyBhIGRpY3Qg b2YgcmVzdWx0cyBhbmQgcmV0dXJucyBvbmx5IHRoZSBmYWlsdXJlcy4KQEAgLTEwODMsMTIgKzEw ODIsMTIgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBfbG9nLmRlYnVnKCJXcml0 aW5nIEpTT04gZmlsZXMgaW4gJXMuIiAlIHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5KQogCiAgICAg ICAgIHRpbWVzX3RyaWUgPSBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnRlc3RfdGltaW5nc190cmll KHNlbGYuX3BvcnQsIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzKQotICAgICAgICB0aW1lc19qc29u X3BhdGggPSBzZWxmLl9mcy5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAidGltZXNfbXMu anNvbiIpCi0gICAgICAgIGpzb25fcmVzdWx0c19nZW5lcmF0b3Iud3JpdGVfanNvbihzZWxmLl9m cywgdGltZXNfdHJpZSwgdGltZXNfanNvbl9wYXRoKQorICAgICAgICB0aW1lc19qc29uX3BhdGgg PSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJ0aW1lc19t cy5qc29uIikKKyAgICAgICAganNvbl9yZXN1bHRzX2dlbmVyYXRvci53cml0ZV9qc29uKHNlbGYu X2ZpbGVzeXN0ZW0sIHRpbWVzX3RyaWUsIHRpbWVzX2pzb25fcGF0aCkKIAotICAgICAgICBmdWxs X3Jlc3VsdHNfcGF0aCA9IHNlbGYuX2ZzLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJm dWxsX3Jlc3VsdHMuanNvbiIpCisgICAgICAgIGZ1bGxfcmVzdWx0c19wYXRoID0gc2VsZi5fZmls ZXN5c3RlbS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAiZnVsbF9yZXN1bHRzLmpzb24i KQogICAgICAgICAjIFdlIHdyaXRlIGZ1bGxfcmVzdWx0cy5qc29uIG91dCBhcyBqc29ucCBiZWNh dXNlIHdlIG5lZWQgdG8gbG9hZCBpdCBmcm9tIGEgZmlsZSB1cmwgYW5kIENocm9taXVtIGRvZXNu J3QgYWxsb3cgdGhhdC4KLSAgICAgICAganNvbl9yZXN1bHRzX2dlbmVyYXRvci53cml0ZV9qc29u KHNlbGYuX2ZzLCBzdW1tYXJpemVkX3Jlc3VsdHMsIGZ1bGxfcmVzdWx0c19wYXRoLCBjYWxsYmFj az0iQUREX1JFU1VMVFMiKQorICAgICAgICBqc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLndyaXRlX2pz b24oc2VsZi5fZmlsZXN5c3RlbSwgc3VtbWFyaXplZF9yZXN1bHRzLCBmdWxsX3Jlc3VsdHNfcGF0 aCwgY2FsbGJhY2s9IkFERF9SRVNVTFRTIikKIAogICAgICAgICBnZW5lcmF0b3IgPSBqc29uX2xh eW91dF9yZXN1bHRzX2dlbmVyYXRvci5KU09OTGF5b3V0UmVzdWx0c0dlbmVyYXRvcigKICAgICAg ICAgICAgIHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMuYnVpbGRlcl9uYW1lLCBzZWxmLl9vcHRp b25zLmJ1aWxkX25hbWUsCkBAIC0xMTA1LDEyICsxMTA0LDEyIEBAIGNsYXNzIE1hbmFnZXIob2Jq ZWN0KToKIAogICAgICAgICBnZW5lcmF0b3IudXBsb2FkX2pzb25fZmlsZXMoanNvbl9maWxlcykK IAotICAgICAgICBpbmNyZW1lbnRhbF9yZXN1bHRzX3BhdGggPSBzZWxmLl9mcy5qb2luKHNlbGYu X3Jlc3VsdHNfZGlyZWN0b3J5LCAiaW5jcmVtZW50YWxfcmVzdWx0cy5qc29uIikKKyAgICAgICAg aW5jcmVtZW50YWxfcmVzdWx0c19wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3Jl c3VsdHNfZGlyZWN0b3J5LCAiaW5jcmVtZW50YWxfcmVzdWx0cy5qc29uIikKIAogICAgICAgICAj IFJlbW92ZSB0aGVzZSBmaWxlcyBmcm9tIHRoZSByZXN1bHRzIGRpcmVjdG9yeSBzbyB0aGV5IGRv bid0IHRha2UgdXAgdG9vIG11Y2ggc3BhY2Ugb24gdGhlIGJ1aWxkYm90LgogICAgICAgICAjIFRo ZSB0b29scyB1c2UgdGhlIHZlcnNpb24gd2UgdXBsb2FkZWQgdG8gdGhlIHJlc3VsdHMgc2VydmVy IGFueXdheS4KLSAgICAgICAgc2VsZi5fZnMucmVtb3ZlKHRpbWVzX2pzb25fcGF0aCkKLSAgICAg ICAgc2VsZi5fZnMucmVtb3ZlKGluY3JlbWVudGFsX3Jlc3VsdHNfcGF0aCkKKyAgICAgICAgc2Vs Zi5fZmlsZXN5c3RlbS5yZW1vdmUodGltZXNfanNvbl9wYXRoKQorICAgICAgICBzZWxmLl9maWxl c3lzdGVtLnJlbW92ZShpbmNyZW1lbnRhbF9yZXN1bHRzX3BhdGgpCiAKICAgICBkZWYgcHJpbnRf Y29uZmlnKHNlbGYpOgogICAgICAgICAiIiJQcmludHMgdGhlIGNvbmZpZ3VyYXRpb24gZm9yIHRo ZSB0ZXN0IHJ1bi4iIiIKQEAgLTExMjIsNyArMTEyMSw3IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0 KToKICAgICAgICAgICAgIHAucHJpbnRfY29uZmlnKCJQbGFjaW5nIG5ldyBiYXNlbGluZXMgaW4g JXMiICUKICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3BvcnQuYmFzZWxpbmVfcGF0 aCgpKQogCi0gICAgICAgIGZhbGxiYWNrX3BhdGggPSBbc2VsZi5fZnMuc3BsaXQoeClbMV0gZm9y IHggaW4gc2VsZi5fcG9ydC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpXQorICAgICAgICBmYWxsYmFj a19wYXRoID0gW3NlbGYuX2ZpbGVzeXN0ZW0uc3BsaXQoeClbMV0gZm9yIHggaW4gc2VsZi5fcG9y dC5iYXNlbGluZV9zZWFyY2hfcGF0aCgpXQogICAgICAgICBwLnByaW50X2NvbmZpZygiQmFzZWxp bmUgc2VhcmNoIHBhdGg6ICVzIC0+IGdlbmVyaWMiICUgIiAtPiAiLmpvaW4oZmFsbGJhY2tfcGF0 aCkpCiAKICAgICAgICAgcC5wcmludF9jb25maWcoIlVzaW5nICVzIGJ1aWxkIiAlIHNlbGYuX29w dGlvbnMuY29uZmlndXJhdGlvbikKQEAgLTEzODMsMTAgKzEzODIsMTAgQEAgY2xhc3MgTWFuYWdl cihvYmplY3QpOgogCiAgICAgZGVmIF9jb3B5X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYpOgogICAg ICAgICBiYXNlX2RpciA9IHNlbGYuX3BvcnQucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdMYXlvdXRU ZXN0cycsICdmYXN0JywgJ2hhcm5lc3MnKQotICAgICAgICByZXN1bHRzX2ZpbGUgPSBzZWxmLl9m cy5qb2luKGJhc2VfZGlyLCAncmVzdWx0cy5odG1sJykKKyAgICAgICAgcmVzdWx0c19maWxlID0g c2VsZi5fZmlsZXN5c3RlbS5qb2luKGJhc2VfZGlyLCAncmVzdWx0cy5odG1sJykKICAgICAgICAg IyBGSVhNRTogV2hhdCBzaG91bGQgd2UgZG8gaWYgdGhpcyBkb2Vzbid0IGV4aXN0IChlLmcuLCBp biB1bml0IHRlc3RzKT8KLSAgICAgICAgaWYgc2VsZi5fZnMuZXhpc3RzKHJlc3VsdHNfZmlsZSk6 Ci0gICAgICAgICAgICBzZWxmLl9mcy5jb3B5ZmlsZShyZXN1bHRzX2ZpbGUsIHNlbGYuX2ZzLmpv aW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJyZXN1bHRzLmh0bWwiKSkKKyAgICAgICAgaWYg c2VsZi5fZmlsZXN5c3RlbS5leGlzdHMocmVzdWx0c19maWxlKToKKyAgICAgICAgICAgIHNlbGYu X2ZpbGVzeXN0ZW0uY29weWZpbGUocmVzdWx0c19maWxlLCBzZWxmLl9maWxlc3lzdGVtLmpvaW4o c2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJyZXN1bHRzLmh0bWwiKSkKIAogICAgIGRlZiBfc2hv d19yZXN1bHRzX2h0bWxfZmlsZShzZWxmLCByZXN1bHRfc3VtbWFyeSk6CiAgICAgICAgICIiIlNo b3dzIHRoZSByZXN1bHRzLmh0bWwgcGFnZS4iIiIKQEAgLTEzOTksNyArMTM5OCw3IEBAIGNsYXNz IE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgaWYgbm90IGxlbih0ZXN0X2ZpbGVzKToKICAgICAg ICAgICAgIHJldHVybgogCi0gICAgICAgIHJlc3VsdHNfZmlsZW5hbWUgPSBzZWxmLl9mcy5qb2lu KHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAicmVzdWx0cy5odG1sIikKKyAgICAgICAgcmVzdWx0 c19maWxlbmFtZSA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2RpcmVjdG9y eSwgInJlc3VsdHMuaHRtbCIpCiAgICAgICAgIHNlbGYuX3BvcnQuc2hvd19yZXN1bHRzX2h0bWxf ZmlsZShyZXN1bHRzX2ZpbGVuYW1lKQogCiAgICAgZGVmIG5hbWUoc2VsZik6CkBAIC0xNDYyLDcg KzE0NjEsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3VwZGF0ZV9z dW1tYXJ5X3dpdGhfcmVzdWx0KHNlbGYuX2N1cnJlbnRfcmVzdWx0X3N1bW1hcnksIHJlc3VsdCkK IAogICAgIGRlZiBfbG9nX3dvcmtlcl9zdGFjayhzZWxmLCBzdGFjayk6Ci0gICAgICAgIHdlYmtp dHB5ZGlyID0gc2VsZi5fcG9ydC5wYXRoX2Zyb21fd2Via2l0X2Jhc2UoJ1Rvb2xzJywgJ1Njcmlw dHMnLCAnd2Via2l0cHknKSArIHNlbGYuX2ZzLnNlcAorICAgICAgICB3ZWJraXRweWRpciA9IHNl bGYuX3BvcnQucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdUb29scycsICdTY3JpcHRzJywgJ3dlYmtp dHB5JykgKyBzZWxmLl9maWxlc3lzdGVtLnNlcAogICAgICAgICBmb3IgZmlsZW5hbWUsIGxpbmVf bnVtYmVyLCBmdW5jdGlvbl9uYW1lLCB0ZXh0IGluIHN0YWNrOgogICAgICAgICAgICAgaWYgZmls ZW5hbWUuc3RhcnRzd2l0aCh3ZWJraXRweWRpcik6CiAgICAgICAgICAgICAgICAgZmlsZW5hbWUg PSBmaWxlbmFtZS5yZXBsYWNlKHdlYmtpdHB5ZGlyLCAnJykKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fbGF5b3V0X3Jl c3VsdHNfZ2VuZXJhdG9yLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3IucHkKaW5kZXggZmU3 OWEwZmEyODkxNDRiNjMyOTU3MDg3OWU5MmU0MDhmM2YwMWEwNi4uMTQyZDlhNWVjYTMyOTk2ODZm ZTFmODk4YjkyZDRiNzU3NDBjYjczOSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0 b3IucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvanNvbl9sYXlvdXRfcmVzdWx0c19nZW5lcmF0b3IucHkKQEAgLTE0Nyw5ICsxNDcsOSBA QCBjbGFzcyBKU09OTGF5b3V0UmVzdWx0c0dlbmVyYXRvcihqc29uX3Jlc3VsdHNfZ2VuZXJhdG9y LkpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZQogICAgICAgICAgICAgdGVzdCwgdGVzdF9uYW1lLCB0 ZXN0cykKIAogICAgICAgICAjIFJlbW92ZSB0ZXN0cyB0aGF0IGRvbid0IGV4aXN0IGFueW1vcmUu Ci0gICAgICAgIGZ1bGxfcGF0aCA9IHNlbGYuX2ZzLmpvaW4oc2VsZi5fcG9ydC5sYXlvdXRfdGVz dHNfZGlyKCksIHRlc3RfbmFtZSkKLSAgICAgICAgZnVsbF9wYXRoID0gc2VsZi5fZnMubm9ybXBh dGgoZnVsbF9wYXRoKQotICAgICAgICBpZiBub3Qgc2VsZi5fZnMuZXhpc3RzKGZ1bGxfcGF0aCk6 CisgICAgICAgIGZ1bGxfcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9wb3J0Lmxh eW91dF90ZXN0c19kaXIoKSwgdGVzdF9uYW1lKQorICAgICAgICBmdWxsX3BhdGggPSBzZWxmLl9m aWxlc3lzdGVtLm5vcm1wYXRoKGZ1bGxfcGF0aCkKKyAgICAgICAgaWYgbm90IHNlbGYuX2ZpbGVz eXN0ZW0uZXhpc3RzKGZ1bGxfcGF0aCk6CiAgICAgICAgICAgICBkZWwgdGVzdHNbdGVzdF9uYW1l XQogCiAgICAgZGVmIF9nZXRfZmFpbHVyZV9zdW1tYXJ5X2VudHJ5KHNlbGYsIHRpbWVsaW5lKToK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9w YWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0b3IucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9qc29uX3Jlc3VsdHNfZ2VuZXJhdG9yLnB5Cmlu ZGV4IDRjMzU2MmY2YzRkNjhkNDE2N2FkMTA1OTE1NDZiNmU0M2IzNmFkOGYuLjc5MDIyMjQ3MTY5 YWUzYzllMTZhY2I5ZDVmNTRmZTczN2E0Njg3OWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL2pzb25fcmVzdWx0c19nZW5lcmF0 b3IucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvanNvbl9yZXN1bHRzX2dlbmVyYXRvci5weQpAQCAtMjI0LDcgKzIyNCw3IEBAIGNsYXNz IEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3QpOgogICAgICAgICAgIG1hc3Rlcl9uYW1l OiB0aGUgbmFtZSBvZiB0aGUgYnVpbGRib3QgbWFzdGVyLgogICAgICAgICAiIiIKICAgICAgICAg c2VsZi5fcG9ydCA9IHBvcnQKLSAgICAgICAgc2VsZi5fZnMgPSBwb3J0Ll9maWxlc3lzdGVtCisg ICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0gPSBwb3J0Ll9maWxlc3lzdGVtCiAgICAgICAgIHNlbGYu X2J1aWxkZXJfbmFtZSA9IGJ1aWxkZXJfbmFtZQogICAgICAgICBzZWxmLl9idWlsZF9uYW1lID0g YnVpbGRfbmFtZQogICAgICAgICBzZWxmLl9idWlsZF9udW1iZXIgPSBidWlsZF9udW1iZXIKQEAg LTI0NywxNSArMjQ3LDE1IEBAIGNsYXNzIEpTT05SZXN1bHRzR2VuZXJhdG9yQmFzZShvYmplY3Qp OgogICAgIGRlZiBnZW5lcmF0ZV9qc29uX291dHB1dChzZWxmKToKICAgICAgICAganNvbl9vYmpl Y3QgPSBzZWxmLmdldF9qc29uKCkKICAgICAgICAgaWYganNvbl9vYmplY3Q6Ci0gICAgICAgICAg ICBmaWxlX3BhdGggPSBzZWxmLl9mcy5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBzZWxm LklOQ1JFTUVOVEFMX1JFU1VMVFNfRklMRU5BTUUpCi0gICAgICAgICAgICB3cml0ZV9qc29uKHNl bGYuX2ZzLCBqc29uX29iamVjdCwgZmlsZV9wYXRoKQorICAgICAgICAgICAgZmlsZV9wYXRoID0g c2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBzZWxmLklOQ1JF TUVOVEFMX1JFU1VMVFNfRklMRU5BTUUpCisgICAgICAgICAgICB3cml0ZV9qc29uKHNlbGYuX2Zp bGVzeXN0ZW0sIGpzb25fb2JqZWN0LCBmaWxlX3BhdGgpCiAKICAgICBkZWYgZ2VuZXJhdGVfdGlt ZXNfbXNfZmlsZShzZWxmKToKICAgICAgICAgIyBGSVhNRTogcmVuYW1lIHRvIGdlbmVyYXRlX3Rp bWVzX21zX2ZpbGUuIFRoaXMgbmVlZHMgdG8gYmUgY29vcmRpbmF0ZWQgd2l0aAogICAgICAgICAj IGNoYW5naW5nIHRoZSBjYWxscyB0byB0aGlzIG9uIHRoZSBjaHJvbWl1bSBidWlsZCBzbGF2ZXMu CiAgICAgICAgIHRpbWVzID0gdGVzdF90aW1pbmdzX3RyaWUoc2VsZi5fcG9ydCwgc2VsZi5fdGVz dF9yZXN1bHRzX21hcC52YWx1ZXMoKSkKLSAgICAgICAgZmlsZV9wYXRoID0gc2VsZi5fZnMuam9p bihzZWxmLl9yZXN1bHRzX2RpcmVjdG9yeSwgc2VsZi5USU1FU19NU19GSUxFTkFNRSkKLSAgICAg ICAgd3JpdGVfanNvbihzZWxmLl9mcywgdGltZXMsIGZpbGVfcGF0aCkKKyAgICAgICAgZmlsZV9w YXRoID0gc2VsZi5fZmlsZXN5c3RlbS5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBzZWxm LlRJTUVTX01TX0ZJTEVOQU1FKQorICAgICAgICB3cml0ZV9qc29uKHNlbGYuX2ZpbGVzeXN0ZW0s IHRpbWVzLCBmaWxlX3BhdGgpCiAKICAgICBkZWYgZ2V0X2pzb24oc2VsZik6CiAgICAgICAgICIi IkdldHMgdGhlIHJlc3VsdHMgZm9yIHRoZSByZXN1bHRzLmpzb24gZmlsZS4iIiIKQEAgLTMxNyw3 ICszMTcsNyBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRvckJhc2Uob2JqZWN0KToKICAgICAg ICAgICAgICAgICAgKCJ0ZXN0dHlwZSIsIHNlbGYuX3Rlc3RfdHlwZSksCiAgICAgICAgICAgICAg ICAgICgibWFzdGVyIiwgc2VsZi5fbWFzdGVyX25hbWUpXQogCi0gICAgICAgIGZpbGVzID0gWyhm aWxlLCBzZWxmLl9mcy5qb2luKHNlbGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCBmaWxlKSkKKyAgICAg ICAgZmlsZXMgPSBbKGZpbGUsIHNlbGYuX2ZpbGVzeXN0ZW0uam9pbihzZWxmLl9yZXN1bHRzX2Rp cmVjdG9yeSwgZmlsZSkpCiAgICAgICAgICAgICBmb3IgZmlsZSBpbiBqc29uX2ZpbGVzXQogCiAg ICAgICAgIHVybCA9ICJodHRwOi8vJXMvdGVzdGZpbGUvdXBsb2FkIiAlIHNlbGYuX3Rlc3RfcmVz dWx0c19zZXJ2ZXIKQEAgLTM4NCw3ICszODQsNyBAQCBjbGFzcyBKU09OUmVzdWx0c0dlbmVyYXRv ckJhc2Uob2JqZWN0KToKICAgICAgICAgQXJnczoKICAgICAgICAgICBpbl9kaXJlY3Rvcnk6IFRo ZSBkaXJlY3Rvcnkgd2hlcmUgc3ZuIGlzIHRvIGJlIHJ1bi4KICAgICAgICAgIiIiCi0gICAgICAg IGlmIHNlbGYuX2ZzLmV4aXN0cyhzZWxmLl9mcy5qb2luKGluX2RpcmVjdG9yeSwgJy5zdm4nKSk6 CisgICAgICAgIGlmIHNlbGYuX2ZpbGVzeXN0ZW0uZXhpc3RzKHNlbGYuX2ZpbGVzeXN0ZW0uam9p bihpbl9kaXJlY3RvcnksICcuc3ZuJykpOgogICAgICAgICAgICAgIyBOb3RlOiBOb3QgdGhyZWFk IHNhZmU6IGh0dHA6Ly9idWdzLnB5dGhvbi5vcmcvaXNzdWUyMzIwCiAgICAgICAgICAgICBvdXRw dXQgPSBzdWJwcm9jZXNzLlBvcGVuKFsic3ZuIiwgImluZm8iLCAiLS14bWwiXSwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY3dkPWluX2RpcmVjdG9yeSwKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVj dGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQppbmRleCBkYTc4ZWQ0MTZmZDdi MmY2M2ViYzk0M2UzNGRlMDU1YzdhZGEyMmQ4Li4zNDYzMDBhZGNkNDY3ZWFkZDU4NTJkNTkxNGNh ODk1ODg1NmE1YjgwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0 ZXN0LnB5CkBAIC05NCw3ICs5NCw2IEBAIGNsYXNzIEJhc2UodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgIGRlZiBfX2luaXRfXyhzZWxmLCB0ZXN0RnVuYywgc2V0VXA9Tm9uZSwgdGVhckRvd249Tm9u ZSwgZGVzY3JpcHRpb249Tm9uZSk6CiAgICAgICAgIGhvc3QgPSBNb2NrSG9zdCgpCiAgICAgICAg IHNlbGYuX3BvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQoJ3Rlc3Qtd2luLXhwJywgTm9uZSkK LSAgICAgICAgc2VsZi5fZnMgPSBob3N0LmZpbGVzeXN0ZW0KICAgICAgICAgc2VsZi5fZXhwID0g Tm9uZQogICAgICAgICB1bml0dGVzdC5UZXN0Q2FzZS5fX2luaXRfXyhzZWxmLCB0ZXN0RnVuYykK IAo=