51081 2010-12-14 18:13:18 -0800 nrwt multiprocessing - start over, prepare to fork the code 2010-12-22 23:18:06 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 51092 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 322414 0 dpranke 2010-12-14 18:13:18 -0800 nrwt multiprocessing - start over, prepare to fork the code 322417 1 76607 dpranke 2010-12-14 18:14:36 -0800 Created attachment 76607 Patch 322420 2 76608 dpranke 2010-12-14 18:16:44 -0800 Created attachment 76608 Patch 322428 3 76610 dpranke 2010-12-14 18:31:56 -0800 Created attachment 76610 Patch 322445 4 76613 dpranke 2010-12-14 19:06:14 -0800 Created attachment 76613 more minor cleanup 322951 5 76613 ojan 2010-12-15 17:02:38 -0800 Comment on attachment 76613 more minor cleanup small-patches++. Sorry this took so long to review. I would have looked earlier if I knew it was such an easy review. :) 325794 6 77279 dpranke 2010-12-22 16:54:39 -0800 Created attachment 77279 rebase after WebKitTools->Tools rename 325795 7 dpranke 2010-12-22 16:55:25 -0800 Committed r74523: <http://trac.webkit.org/changeset/74523> 325905 8 77279 levin 2010-12-22 23:18:06 -0800 Comment on attachment 77279 rebase after WebKitTools->Tools rename Clearing r? as this was landed. 76607 2010-12-14 18:14:36 -0800 2010-12-14 18:16:41 -0800 Patch bug-51081-20101214181435.patch text/plain 5732 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzYWM2YzY2NWU0MWYyNGVlMGI3YWNkNDY2YjlmZjQwYmQ2ZjZkNGE5Li44YWY2YmU5 MmI5YzA2MjhjODFkYzg3Mjg2MGE5ZDUwYTU5ZjEwZGRiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMTItMTQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dCBtdWx0aXByb2Nl c3NpbmcgLSBzdGFydCBvdmVyLCBwcmVwYXJlIHRvIGZvcmsgdGhlIGNvZGUKKworICAgICAgICBU aGlzIGNvZGUgY2xlYW5zIHVwIHRoZSBzaWduYXR1cmVzIGFuZCBpbXBsZW1lbnRhdGlvbiBvZiB0 aGUKKyAgICAgICAgVGVzdFJ1bm5lciBjbGFzcyBzbyB3ZSBjYW4gZWFzaWx5IGZvcmsgaXQgdG8g cnVuIGVpdGhlciB0aGUKKyAgICAgICAgc3RhYmxlIGltcGxlbWVudGF0aW9uIG9yIHRoZSBuZXcs IHVuc3RhYmxlIG1lc3NhZ2UtcGFzc2luZyAKKyAgICAgICAgaW1wbGVtZW50YXRpb24KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEwODEKKworICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 c191bml0dGVzdC5weToKKwogMjAxMC0xMi0xNCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5k QGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZhaS4KZGlmZiAtLWdp dCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzLnB5CmluZGV4IDUxYWRmNjdmY2EyOWQ5YWIzMTA5MzE5NjUwN2VkYzM3NmZk MmE1ODAuLjA1Y2Q4NjE5MmQwZjlhOTk5YjQ5MDAxOGUyNGU1YTY2ZDFlZGQ2YzQgMTAwNzU1Ci0t LSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjQwLDE5ICsyNDAsMTggQEAgY2xhc3MgVGVzdFJ1bm5l cjoKICAgICAjIGluIER1bXBSZW5kZXJUcmVlLgogICAgIERFRkFVTFRfVEVTVF9USU1FT1VUX01T ID0gNiAqIDEwMDAKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBvcHRpb25zLCBwcmlu dGVyLCBtZXNzYWdlX2Jyb2tlcik6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIG9wdGlv bnMsIHByaW50ZXIpOgogICAgICAgICAiIiJJbml0aWFsaXplIHRlc3QgcnVubmVyIGRhdGEgc3Ry dWN0dXJlcy4KIAogICAgICAgICBBcmdzOgogICAgICAgICAgIHBvcnQ6IGFuIG9iamVjdCBpbXBs ZW1lbnRpbmcgcG9ydC1zcGVjaWZpYwogICAgICAgICAgIG9wdGlvbnM6IGEgZGljdGlvbmFyeSBv ZiBjb21tYW5kIGxpbmUgb3B0aW9ucwogICAgICAgICAgIHByaW50ZXI6IGEgUHJpbnRlciBvYmpl Y3QgdG8gcmVjb3JkIHVwZGF0ZXMgdG8uCi0gICAgICAgICAgbWVzc2FnZV9icm9rZXI6IG9iamVj dCB1c2VkIHRvIGNvbW11bmljYXRlIHdpdGggd29ya2Vycy4KICAgICAgICAgIiIiCiAgICAgICAg IHNlbGYuX3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25zCiAgICAg ICAgIHNlbGYuX3ByaW50ZXIgPSBwcmludGVyCi0gICAgICAgIHNlbGYuX21lc3NhZ2VfYnJva2Vy ID0gbWVzc2FnZV9icm9rZXIKKyAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9rZXIgPSBOb25lCiAK ICAgICAgICAgIyBkaXNhYmxlIHdzcyBzZXJ2ZXIuIG5lZWQgdG8gaW5zdGFsbCBweU9wZW5TU0wg b24gYnVpbGRib3RzLgogICAgICAgICAjIHNlbGYuX3dlYnNvY2tldF9zZWN1cmVfc2VydmVyID0g d2Vic29ja2V0X3NlcnZlci5QeVdlYlNvY2tldCgKQEAgLTYwMywxMiArNjAyLDEzIEBAIGNsYXNz IFRlc3RSdW5uZXI6CiAKICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF91cGRhdGUoJ1N0YXJ0 aW5nICVzIC4uLicgJQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBncmFtbWFy LnBsdXJhbGl6ZSgnd29ya2VyJywgbnVtX3dvcmtlcnMpKQotICAgICAgICBtZXNzYWdlX2Jyb2tl ciA9IHNlbGYuX21lc3NhZ2VfYnJva2VyCisgICAgICAgIHNlbGYuX21lc3NhZ2VfYnJva2VyID0g bWVzc2FnZV9icm9rZXIuZ2V0KHNlbGYuX3BvcnQsIHNlbGYuX29wdGlvbnMpCisgICAgICAgIGJy b2tlciA9IHNlbGYuX21lc3NhZ2VfYnJva2VyCiAgICAgICAgIHNlbGYuX2N1cnJlbnRfZmlsZW5h bWVfcXVldWUgPSBmaWxlbmFtZV9xdWV1ZQogICAgICAgICBzZWxmLl9jdXJyZW50X3Jlc3VsdF9z dW1tYXJ5ID0gcmVzdWx0X3N1bW1hcnkKIAogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5k cnlfcnVuOgotICAgICAgICAgICAgdGhyZWFkcyA9IG1lc3NhZ2VfYnJva2VyLnN0YXJ0X3dvcmtl cnMoc2VsZikKKyAgICAgICAgICAgIHRocmVhZHMgPSBicm9rZXIuc3RhcnRfd29ya2VycyhzZWxm KQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgdGhyZWFkcyA9IHt9CiAKQEAgLTYxNiwxMCAr NjE2LDEwIEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIGtleWJvYXJkX2ludGVycnVwdGVk ID0gRmFsc2UKICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuZHJ5X3J1bjoKICAgICAgICAg ICAgIHRyeToKLSAgICAgICAgICAgICAgICBtZXNzYWdlX2Jyb2tlci5ydW5fbWVzc2FnZV9sb29w KCkKKyAgICAgICAgICAgICAgICBicm9rZXIucnVuX21lc3NhZ2VfbG9vcCgpCiAgICAgICAgICAg ICBleGNlcHQgS2V5Ym9hcmRJbnRlcnJ1cHQ6CiAgICAgICAgICAgICAgICAgX2xvZy5pbmZvKCJJ bnRlcnJ1cHRlZCwgZXhpdGluZyIpCi0gICAgICAgICAgICAgICAgbWVzc2FnZV9icm9rZXIuY2Fu Y2VsX3dvcmtlcnMoKQorICAgICAgICAgICAgICAgIGJyb2tlci5jYW5jZWxfd29ya2VycygpCiAg ICAgICAgICAgICAgICAga2V5Ym9hcmRfaW50ZXJydXB0ZWQgPSBUcnVlCiAgICAgICAgICAgICBl eGNlcHQ6CiAgICAgICAgICAgICAgICAgIyBVbmV4cGVjdGVkIGV4Y2VwdGlvbjsgZG9uJ3QgdHJ5 IHRvIGNsZWFuIHVwIHdvcmtlcnMuCkBAIC02MjksNiArNjI5LDggQEAgY2xhc3MgVGVzdFJ1bm5l cjoKICAgICAgICAgdGhyZWFkX3RpbWluZ3MsIHRlc3RfdGltaW5ncywgaW5kaXZpZHVhbF90ZXN0 X3RpbWluZ3MgPSBcCiAgICAgICAgICAgICBzZWxmLl9jb2xsZWN0X3RpbWluZ19pbmZvKHRocmVh ZHMpCiAKKyAgICAgICAgYnJva2VyLmNsZWFudXAoKQorICAgICAgICBzZWxmLl9tZXNzYWdlX2Jy b2tlciA9IE5vbmUKICAgICAgICAgcmV0dXJuIChrZXlib2FyZF9pbnRlcnJ1cHRlZCwgdGhyZWFk X3RpbWluZ3MsIHRlc3RfdGltaW5ncywKICAgICAgICAgICAgICAgICBpbmRpdmlkdWFsX3Rlc3Rf dGltaW5ncykKIApAQCAtMTMwMiwxMyArMTMwNCwxMSBAQCBkZWYgcnVuKHBvcnQsIG9wdGlvbnMs IGFyZ3MsIHJlZ3VsYXJfb3V0cHV0PXN5cy5zdGRlcnIsCiAgICAgICAgIHByaW50ZXIuY2xlYW51 cCgpCiAgICAgICAgIHJldHVybiAwCiAKLSAgICBicm9rZXIgPSBtZXNzYWdlX2Jyb2tlci5nZXQo cG9ydCwgb3B0aW9ucykKLQogICAgICMgV2Ugd3JhcCBhbnkgcGFydHMgb2YgdGhlIHJ1biB0aGF0 IGFyZSBzbG93IG9yIGxpa2VseSB0byByYWlzZSBleGNlcHRpb25zCiAgICAgIyBpbiBhIHRyeS9m aW5hbGx5IHRvIGVuc3VyZSB0aGF0IHdlIGNsZWFuIHVwIHRoZSBsb2dnaW5nIGNvbmZpZ3VyYXRp b24uCiAgICAgbnVtX3VuZXhwZWN0ZWRfcmVzdWx0cyA9IC0xCiAgICAgdHJ5OgotICAgICAgICB0 ZXN0X3J1bm5lciA9IFRlc3RSdW5uZXIocG9ydCwgb3B0aW9ucywgcHJpbnRlciwgYnJva2VyKQor ICAgICAgICB0ZXN0X3J1bm5lciA9IFRlc3RSdW5uZXIocG9ydCwgb3B0aW9ucywgcHJpbnRlcikK ICAgICAgICAgdGVzdF9ydW5uZXIuX3ByaW50X2NvbmZpZygpCiAKICAgICAgICAgcHJpbnRlci5w cmludF91cGRhdGUoIkNvbGxlY3RpbmcgdGVzdHMgLi4uIikKQEAgLTEzMzcsNyArMTMzNyw2IEBA IGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywgcmVndWxhcl9vdXRwdXQ9c3lzLnN0ZGVyciwK ICAgICAgICAgICAgIF9sb2cuZGVidWcoIlRlc3RpbmcgY29tcGxldGVkLCBFeGl0IHN0YXR1czog JWQiICUKICAgICAgICAgICAgICAgICAgICAgICAgbnVtX3VuZXhwZWN0ZWRfcmVzdWx0cykKICAg ICBmaW5hbGx5OgotICAgICAgICBicm9rZXIuY2xlYW51cCgpCiAgICAgICAgIHByaW50ZXIuY2xl YW51cCgpCiAKICAgICByZXR1cm4gbnVtX3VuZXhwZWN0ZWRfcmVzdWx0cwpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0 c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5kZXggODEwZjc4N2Q2ZjZiZmNhZmM3Nzc2 OTQxNzJmMTU4YjQyMGE3MGRmNi4uMjg4ZDBiY2Y4YTg1YTRmN2I3MGQ0YzhkNDkxZjlkMmEwNjE0 NGMxZCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC00 ODUsNyArNDg1LDcgQEAgY2xhc3MgVGVzdFJ1bm5lclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgog ICAgICAgICBtb2NrX3BvcnQuZmlsZW5hbWVfdG9fdXJpID0gbGFtYmRhIG5hbWU6IG5hbWUKIAog ICAgICAgICBydW5uZXIgPSBydW5fd2Via2l0X3Rlc3RzLlRlc3RSdW5uZXIocG9ydD1tb2NrX3Bv cnQsIG9wdGlvbnM9TW9jaygpLAotICAgICAgICAgICAgcHJpbnRlcj1Nb2NrKCksIG1lc3NhZ2Vf YnJva2VyPU1vY2soKSkKKyAgICAgICAgICAgIHByaW50ZXI9TW9jaygpKQogICAgICAgICBleHBl Y3RlZF9odG1sID0gdSIiIjxodG1sPgogICA8aGVhZD4KICAgICA8dGl0bGU+TGF5b3V0IFRlc3Qg UmVzdWx0cyAodGltZSk8L3RpdGxlPgpAQCAtNTAzLDcgKzUwMyw3IEBAIGNsYXNzIFRlc3RSdW5u ZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgIyBUZXN0IHRoYXQgX3NoYXJkX3Rl c3RzIGluIHJ1bl93ZWJraXRfdGVzdHMuVGVzdFJ1bm5lciByZWFsbHkKICAgICAgICAgIyBwdXQg dGhlIGh0dHAgdGVzdHMgZmlyc3QgaW4gdGhlIHF1ZXVlLgogICAgICAgICBydW5uZXIgPSBUZXN0 UnVubmVyV3JhcHBlcihwb3J0PU1vY2soKSwgb3B0aW9ucz1Nb2NrKCksCi0gICAgICAgICAgICBw cmludGVyPU1vY2soKSwgbWVzc2FnZV9icm9rZXI9TW9jaygpKQorICAgICAgICAgICAgcHJpbnRl cj1Nb2NrKCkpCiAKICAgICAgICAgdGVzdF9saXN0ID0gWwogICAgICAgICAgICJMYXlvdXRUZXN0 cy93ZWJzb2NrZXQvdGVzdHMvdW5pY29kZS5odG0iLAo= 76608 2010-12-14 18:16:44 -0800 2010-12-14 18:31:52 -0800 Patch bug-51081-20101214181643.patch text/plain 5821 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzYWM2YzY2NWU0MWYyNGVlMGI3YWNkNDY2YjlmZjQwYmQ2ZjZkNGE5Li5hOGViYmRk ZTU2MjFiM2JhOTk2MjQ5ZDZmMDgwMGNhYzkyNGQwMmYyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTAtMTItMTQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dCBtdWx0aXByb2Nl c3NpbmcgLSBzdGFydCBvdmVyLCBwcmVwYXJlIHRvIGZvcmsgdGhlIGNvZGUKKworICAgICAgICBU aGlzIGNvZGUgY2xlYW5zIHVwIHRoZSBzaWduYXR1cmVzIGFuZCBpbXBsZW1lbnRhdGlvbiBvZiB0 aGUKKyAgICAgICAgVGVzdFJ1bm5lciBjbGFzcyBzbyB3ZSBjYW4gZWFzaWx5IGZvcmsgaXQgdG8g cnVuIGVpdGhlciB0aGUKKyAgICAgICAgc3RhYmxlIGltcGxlbWVudGF0aW9uIG9yIHRoZSBuZXcs IHVuc3RhYmxlIG1lc3NhZ2UtcGFzc2luZworICAgICAgICBpbXBsZW1lbnRhdGlvbi4gVGhlIHR3 byB2YXJpYW50cyB3aWxsIGhhdmUgZGlmZmVyZW50CisgICAgICAgIGltcGxlbWVudGF0aW9ucyBv ZiB0aGUgcnVuX3Rlc3RzKCkgbWV0aG9kLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01MTA4MQorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5OgorCiAyMDEwLTEy LTE0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggNTFh ZGY2N2ZjYTI5ZDlhYjMxMDkzMTk2NTA3ZWRjMzc2ZmQyYTU4MC4uMDVjZDg2MTkyZDBmOWE5OTli NDkwMDE4ZTI0ZTVhNjZkMWVkZDZjNCAxMDA3NTUKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0y NDAsMTkgKzI0MCwxOCBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICMgaW4gRHVtcFJlbmRlclRy ZWUuCiAgICAgREVGQVVMVF9URVNUX1RJTUVPVVRfTVMgPSA2ICogMTAwMAogCi0gICAgZGVmIF9f aW5pdF9fKHNlbGYsIHBvcnQsIG9wdGlvbnMsIHByaW50ZXIsIG1lc3NhZ2VfYnJva2VyKToKKyAg ICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgb3B0aW9ucywgcHJpbnRlcik6CiAgICAgICAgICIi IkluaXRpYWxpemUgdGVzdCBydW5uZXIgZGF0YSBzdHJ1Y3R1cmVzLgogCiAgICAgICAgIEFyZ3M6 CiAgICAgICAgICAgcG9ydDogYW4gb2JqZWN0IGltcGxlbWVudGluZyBwb3J0LXNwZWNpZmljCiAg ICAgICAgICAgb3B0aW9uczogYSBkaWN0aW9uYXJ5IG9mIGNvbW1hbmQgbGluZSBvcHRpb25zCiAg ICAgICAgICAgcHJpbnRlcjogYSBQcmludGVyIG9iamVjdCB0byByZWNvcmQgdXBkYXRlcyB0by4K LSAgICAgICAgICBtZXNzYWdlX2Jyb2tlcjogb2JqZWN0IHVzZWQgdG8gY29tbXVuaWNhdGUgd2l0 aCB3b3JrZXJzLgogICAgICAgICAiIiIKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQKICAgICAg ICAgc2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMKICAgICAgICAgc2VsZi5fcHJpbnRlciA9IHByaW50 ZXIKLSAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9rZXIgPSBtZXNzYWdlX2Jyb2tlcgorICAgICAg ICBzZWxmLl9tZXNzYWdlX2Jyb2tlciA9IE5vbmUKIAogICAgICAgICAjIGRpc2FibGUgd3NzIHNl cnZlci4gbmVlZCB0byBpbnN0YWxsIHB5T3BlblNTTCBvbiBidWlsZGJvdHMuCiAgICAgICAgICMg c2VsZi5fd2Vic29ja2V0X3NlY3VyZV9zZXJ2ZXIgPSB3ZWJzb2NrZXRfc2VydmVyLlB5V2ViU29j a2V0KApAQCAtNjAzLDEyICs2MDIsMTMgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKIAogICAgICAgICBz ZWxmLl9wcmludGVyLnByaW50X3VwZGF0ZSgnU3RhcnRpbmcgJXMgLi4uJyAlCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGdyYW1tYXIucGx1cmFsaXplKCd3b3JrZXInLCBudW1f d29ya2VycykpCi0gICAgICAgIG1lc3NhZ2VfYnJva2VyID0gc2VsZi5fbWVzc2FnZV9icm9rZXIK KyAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9rZXIgPSBtZXNzYWdlX2Jyb2tlci5nZXQoc2VsZi5f cG9ydCwgc2VsZi5fb3B0aW9ucykKKyAgICAgICAgYnJva2VyID0gc2VsZi5fbWVzc2FnZV9icm9r ZXIKICAgICAgICAgc2VsZi5fY3VycmVudF9maWxlbmFtZV9xdWV1ZSA9IGZpbGVuYW1lX3F1ZXVl CiAgICAgICAgIHNlbGYuX2N1cnJlbnRfcmVzdWx0X3N1bW1hcnkgPSByZXN1bHRfc3VtbWFyeQog CiAgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25zLmRyeV9ydW46Ci0gICAgICAgICAgICB0aHJl YWRzID0gbWVzc2FnZV9icm9rZXIuc3RhcnRfd29ya2VycyhzZWxmKQorICAgICAgICAgICAgdGhy ZWFkcyA9IGJyb2tlci5zdGFydF93b3JrZXJzKHNlbGYpCiAgICAgICAgIGVsc2U6CiAgICAgICAg ICAgICB0aHJlYWRzID0ge30KIApAQCAtNjE2LDEwICs2MTYsMTAgQEAgY2xhc3MgVGVzdFJ1bm5l cjoKICAgICAgICAga2V5Ym9hcmRfaW50ZXJydXB0ZWQgPSBGYWxzZQogICAgICAgICBpZiBub3Qg c2VsZi5fb3B0aW9ucy5kcnlfcnVuOgogICAgICAgICAgICAgdHJ5OgotICAgICAgICAgICAgICAg IG1lc3NhZ2VfYnJva2VyLnJ1bl9tZXNzYWdlX2xvb3AoKQorICAgICAgICAgICAgICAgIGJyb2tl ci5ydW5fbWVzc2FnZV9sb29wKCkKICAgICAgICAgICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVw dDoKICAgICAgICAgICAgICAgICBfbG9nLmluZm8oIkludGVycnVwdGVkLCBleGl0aW5nIikKLSAg ICAgICAgICAgICAgICBtZXNzYWdlX2Jyb2tlci5jYW5jZWxfd29ya2VycygpCisgICAgICAgICAg ICAgICAgYnJva2VyLmNhbmNlbF93b3JrZXJzKCkKICAgICAgICAgICAgICAgICBrZXlib2FyZF9p bnRlcnJ1cHRlZCA9IFRydWUKICAgICAgICAgICAgIGV4Y2VwdDoKICAgICAgICAgICAgICAgICAj IFVuZXhwZWN0ZWQgZXhjZXB0aW9uOyBkb24ndCB0cnkgdG8gY2xlYW4gdXAgd29ya2Vycy4KQEAg LTYyOSw2ICs2MjksOCBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgICAgICB0aHJlYWRfdGltaW5n cywgdGVzdF90aW1pbmdzLCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncyA9IFwKICAgICAgICAgICAg IHNlbGYuX2NvbGxlY3RfdGltaW5nX2luZm8odGhyZWFkcykKIAorICAgICAgICBicm9rZXIuY2xl YW51cCgpCisgICAgICAgIHNlbGYuX21lc3NhZ2VfYnJva2VyID0gTm9uZQogICAgICAgICByZXR1 cm4gKGtleWJvYXJkX2ludGVycnVwdGVkLCB0aHJlYWRfdGltaW5ncywgdGVzdF90aW1pbmdzLAog ICAgICAgICAgICAgICAgIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzKQogCkBAIC0xMzAyLDEzICsx MzA0LDExIEBAIGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywgcmVndWxhcl9vdXRwdXQ9c3lz LnN0ZGVyciwKICAgICAgICAgcHJpbnRlci5jbGVhbnVwKCkKICAgICAgICAgcmV0dXJuIDAKIAot ICAgIGJyb2tlciA9IG1lc3NhZ2VfYnJva2VyLmdldChwb3J0LCBvcHRpb25zKQotCiAgICAgIyBX ZSB3cmFwIGFueSBwYXJ0cyBvZiB0aGUgcnVuIHRoYXQgYXJlIHNsb3cgb3IgbGlrZWx5IHRvIHJh aXNlIGV4Y2VwdGlvbnMKICAgICAjIGluIGEgdHJ5L2ZpbmFsbHkgdG8gZW5zdXJlIHRoYXQgd2Ug Y2xlYW4gdXAgdGhlIGxvZ2dpbmcgY29uZmlndXJhdGlvbi4KICAgICBudW1fdW5leHBlY3RlZF9y ZXN1bHRzID0gLTEKICAgICB0cnk6Ci0gICAgICAgIHRlc3RfcnVubmVyID0gVGVzdFJ1bm5lcihw b3J0LCBvcHRpb25zLCBwcmludGVyLCBicm9rZXIpCisgICAgICAgIHRlc3RfcnVubmVyID0gVGVz dFJ1bm5lcihwb3J0LCBvcHRpb25zLCBwcmludGVyKQogICAgICAgICB0ZXN0X3J1bm5lci5fcHJp bnRfY29uZmlnKCkKIAogICAgICAgICBwcmludGVyLnByaW50X3VwZGF0ZSgiQ29sbGVjdGluZyB0 ZXN0cyAuLi4iKQpAQCAtMTMzNyw3ICsxMzM3LDYgQEAgZGVmIHJ1bihwb3J0LCBvcHRpb25zLCBh cmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJyLAogICAgICAgICAgICAgX2xvZy5kZWJ1Zygi VGVzdGluZyBjb21wbGV0ZWQsIEV4aXQgc3RhdHVzOiAlZCIgJQogICAgICAgICAgICAgICAgICAg ICAgICBudW1fdW5leHBlY3RlZF9yZXN1bHRzKQogICAgIGZpbmFsbHk6Ci0gICAgICAgIGJyb2tl ci5jbGVhbnVwKCkKICAgICAgICAgcHJpbnRlci5jbGVhbnVwKCkKIAogICAgIHJldHVybiBudW1f dW5leHBlY3RlZF9yZXN1bHRzCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVz dC5weQppbmRleCA4MTBmNzg3ZDZmNmJmY2FmYzc3NzY5NDE3MmYxNThiNDIwYTcwZGY2Li4yODhk MGJjZjhhODVhNGY3YjcwZDRjOGQ0OTFmOWQyYTA2MTQ0YzFkIDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0 ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAgLTQ4NSw3ICs0ODUsNyBAQCBjbGFzcyBUZXN0 UnVubmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIG1vY2tfcG9ydC5maWxlbmFt ZV90b191cmkgPSBsYW1iZGEgbmFtZTogbmFtZQogCiAgICAgICAgIHJ1bm5lciA9IHJ1bl93ZWJr aXRfdGVzdHMuVGVzdFJ1bm5lcihwb3J0PW1vY2tfcG9ydCwgb3B0aW9ucz1Nb2NrKCksCi0gICAg ICAgICAgICBwcmludGVyPU1vY2soKSwgbWVzc2FnZV9icm9rZXI9TW9jaygpKQorICAgICAgICAg ICAgcHJpbnRlcj1Nb2NrKCkpCiAgICAgICAgIGV4cGVjdGVkX2h0bWwgPSB1IiIiPGh0bWw+CiAg IDxoZWFkPgogICAgIDx0aXRsZT5MYXlvdXQgVGVzdCBSZXN1bHRzICh0aW1lKTwvdGl0bGU+CkBA IC01MDMsNyArNTAzLDcgQEAgY2xhc3MgVGVzdFJ1bm5lclRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICAjIFRlc3QgdGhhdCBfc2hhcmRfdGVzdHMgaW4gcnVuX3dlYmtpdF90ZXN0cy5U ZXN0UnVubmVyIHJlYWxseQogICAgICAgICAjIHB1dCB0aGUgaHR0cCB0ZXN0cyBmaXJzdCBpbiB0 aGUgcXVldWUuCiAgICAgICAgIHJ1bm5lciA9IFRlc3RSdW5uZXJXcmFwcGVyKHBvcnQ9TW9jaygp LCBvcHRpb25zPU1vY2soKSwKLSAgICAgICAgICAgIHByaW50ZXI9TW9jaygpLCBtZXNzYWdlX2Jy b2tlcj1Nb2NrKCkpCisgICAgICAgICAgICBwcmludGVyPU1vY2soKSkKIAogICAgICAgICB0ZXN0 X2xpc3QgPSBbCiAgICAgICAgICAgIkxheW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy91bmljb2Rl Lmh0bSIsCg== 76610 2010-12-14 18:31:56 -0800 2010-12-14 19:06:11 -0800 Patch bug-51081-20101214183155.patch text/plain 9504 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzYWM2YzY2NWU0MWYyNGVlMGI3YWNkNDY2YjlmZjQwYmQ2ZjZkNGE5Li4yMGRkYzg3 NWM5YWQxMGY1NWQ2MmMwOGYxNzE2MWRkZDdkMmU4NzBiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTAtMTItMTQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dCBtdWx0aXByb2Nl c3NpbmcgLSBzdGFydCBvdmVyLCBwcmVwYXJlIHRvIGZvcmsgdGhlIGNvZGUKKworICAgICAgICBU aGlzIGNvZGUgY2xlYW5zIHVwIHRoZSBzaWduYXR1cmVzIGFuZCBpbXBsZW1lbnRhdGlvbiBvZiB0 aGUKKyAgICAgICAgVGVzdFJ1bm5lciBjbGFzcyBzbyB3ZSBjYW4gZWFzaWx5IGZvcmsgaXQgdG8g cnVuIGVpdGhlciB0aGUKKyAgICAgICAgc3RhYmxlIGltcGxlbWVudGF0aW9uIG9yIHRoZSBuZXcs IHVuc3RhYmxlIG1lc3NhZ2UtcGFzc2luZworICAgICAgICBpbXBsZW1lbnRhdGlvbi4gVGhlIHR3 byB2YXJpYW50cyB3aWxsIGhhdmUgZGlmZmVyZW50CisgICAgICAgIGltcGxlbWVudGF0aW9ucyBv ZiB0aGUgcnVuX3Rlc3RzKCkgbWV0aG9kLiBXZSB3aWxsIHN3aXRjaAorICAgICAgICBiZXR3ZWVu IHRoZSB0d28gYmFzZWQgb24gdGhlIHNldHRpbmcgZm9yIHRoZSAnLS13b3JrZXItbW9kZWwnCisg ICAgICAgIHN3aXRjaC4gV2UgcmVuYW1lIHRoZSB0d28gY3VycmVudGx5IHZhbGlkIHZhbHVlcyB0 byAnb2xkLWlubGluZScKKyAgICAgICAgYW5kICdvbGQtdGhyZWFkcycuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMDgxCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRl c3QucHk6CisKIDIwMTAtMTItMTQgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNz YWdlX2Jyb2tlci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL21lc3NhZ2VfYnJva2VyLnB5CmluZGV4IGU1MjBhOWNhYTZiNzY4MmVi ZmRkMmE5OGJiMjE3ZWI4NWQ3MjUxYmMuLmUwY2E4ZGIxZDhhYTU1MDRhMDZlMTg0NjVlNDU3MmJm NjJmZWUxZDUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL21lc3NhZ2VfYnJva2VyLnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21lc3NhZ2VfYnJv a2VyLnB5CkBAIC01Myw5ICs1Myw5IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVf XykKIGRlZiBnZXQocG9ydCwgb3B0aW9ucyk6CiAgICAgIiIiUmV0dXJuIGFuIGluc3RhbmNlIG9m IGEgV29ya2VyTWVzc2FnZUJyb2tlci4iIiIKICAgICB3b3JrZXJfbW9kZWwgPSBvcHRpb25zLndv cmtlcl9tb2RlbAotICAgIGlmIHdvcmtlcl9tb2RlbCA9PSAnaW5saW5lJzoKKyAgICBpZiB3b3Jr ZXJfbW9kZWwgPT0gJ29sZC1pbmxpbmUnOgogICAgICAgICByZXR1cm4gSW5saW5lQnJva2VyKHBv cnQsIG9wdGlvbnMpCi0gICAgaWYgd29ya2VyX21vZGVsID09ICd0aHJlYWRzJzoKKyAgICBpZiB3 b3JrZXJfbW9kZWwgPT0gJ29sZC10aHJlYWRzJzoKICAgICAgICAgcmV0dXJuIE11bHRpVGhyZWFk ZWRCcm9rZXIocG9ydCwgb3B0aW9ucykKICAgICByYWlzZSBWYWx1ZUVycm9yKCd1bnN1cHBvcnRl ZCB2YWx1ZSBmb3IgLS13b3JrZXItbW9kZWw6ICVzJyAlIHdvcmtlcl9tb2RlbCkKIApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHMucHkKaW5kZXggNTFhZGY2N2ZjYTI5ZDlhYjMxMDkzMTk2NTA3ZWRjMzc2 ZmQyYTU4MC4uMzhkOGMwY2JmYmU2MGNkNjg2MmE1MDMwMTZmOGY5YmY5MWQ5MjA5YyAxMDA3NTUK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0yNDAsMTkgKzI0MCwxOCBAQCBjbGFzcyBUZXN0UnVu bmVyOgogICAgICMgaW4gRHVtcFJlbmRlclRyZWUuCiAgICAgREVGQVVMVF9URVNUX1RJTUVPVVRf TVMgPSA2ICogMTAwMAogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIG9wdGlvbnMsIHBy aW50ZXIsIG1lc3NhZ2VfYnJva2VyKToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgb3B0 aW9ucywgcHJpbnRlcik6CiAgICAgICAgICIiIkluaXRpYWxpemUgdGVzdCBydW5uZXIgZGF0YSBz dHJ1Y3R1cmVzLgogCiAgICAgICAgIEFyZ3M6CiAgICAgICAgICAgcG9ydDogYW4gb2JqZWN0IGlt cGxlbWVudGluZyBwb3J0LXNwZWNpZmljCiAgICAgICAgICAgb3B0aW9uczogYSBkaWN0aW9uYXJ5 IG9mIGNvbW1hbmQgbGluZSBvcHRpb25zCiAgICAgICAgICAgcHJpbnRlcjogYSBQcmludGVyIG9i amVjdCB0byByZWNvcmQgdXBkYXRlcyB0by4KLSAgICAgICAgICBtZXNzYWdlX2Jyb2tlcjogb2Jq ZWN0IHVzZWQgdG8gY29tbXVuaWNhdGUgd2l0aCB3b3JrZXJzLgogICAgICAgICAiIiIKICAgICAg ICAgc2VsZi5fcG9ydCA9IHBvcnQKICAgICAgICAgc2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMKICAg ICAgICAgc2VsZi5fcHJpbnRlciA9IHByaW50ZXIKLSAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9r ZXIgPSBtZXNzYWdlX2Jyb2tlcgorICAgICAgICBzZWxmLl9tZXNzYWdlX2Jyb2tlciA9IE5vbmUK IAogICAgICAgICAjIGRpc2FibGUgd3NzIHNlcnZlci4gbmVlZCB0byBpbnN0YWxsIHB5T3BlblNT TCBvbiBidWlsZGJvdHMuCiAgICAgICAgICMgc2VsZi5fd2Vic29ja2V0X3NlY3VyZV9zZXJ2ZXIg PSB3ZWJzb2NrZXRfc2VydmVyLlB5V2ViU29ja2V0KApAQCAtNjAzLDEyICs2MDIsMTMgQEAgY2xh c3MgVGVzdFJ1bm5lcjoKIAogICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3VwZGF0ZSgnU3Rh cnRpbmcgJXMgLi4uJyAlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdyYW1t YXIucGx1cmFsaXplKCd3b3JrZXInLCBudW1fd29ya2VycykpCi0gICAgICAgIG1lc3NhZ2VfYnJv a2VyID0gc2VsZi5fbWVzc2FnZV9icm9rZXIKKyAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9rZXIg PSBtZXNzYWdlX2Jyb2tlci5nZXQoc2VsZi5fcG9ydCwgc2VsZi5fb3B0aW9ucykKKyAgICAgICAg YnJva2VyID0gc2VsZi5fbWVzc2FnZV9icm9rZXIKICAgICAgICAgc2VsZi5fY3VycmVudF9maWxl bmFtZV9xdWV1ZSA9IGZpbGVuYW1lX3F1ZXVlCiAgICAgICAgIHNlbGYuX2N1cnJlbnRfcmVzdWx0 X3N1bW1hcnkgPSByZXN1bHRfc3VtbWFyeQogCiAgICAgICAgIGlmIG5vdCBzZWxmLl9vcHRpb25z LmRyeV9ydW46Ci0gICAgICAgICAgICB0aHJlYWRzID0gbWVzc2FnZV9icm9rZXIuc3RhcnRfd29y a2VycyhzZWxmKQorICAgICAgICAgICAgdGhyZWFkcyA9IGJyb2tlci5zdGFydF93b3JrZXJzKHNl bGYpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICB0aHJlYWRzID0ge30KIApAQCAtNjE2LDEw ICs2MTYsMTAgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAga2V5Ym9hcmRfaW50ZXJydXB0 ZWQgPSBGYWxzZQogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5kcnlfcnVuOgogICAgICAg ICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLnJ1bl9tZXNzYWdlX2xv b3AoKQorICAgICAgICAgICAgICAgIGJyb2tlci5ydW5fbWVzc2FnZV9sb29wKCkKICAgICAgICAg ICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKICAgICAgICAgICAgICAgICBfbG9nLmluZm8o IkludGVycnVwdGVkLCBleGl0aW5nIikKLSAgICAgICAgICAgICAgICBtZXNzYWdlX2Jyb2tlci5j YW5jZWxfd29ya2VycygpCisgICAgICAgICAgICAgICAgYnJva2VyLmNhbmNlbF93b3JrZXJzKCkK ICAgICAgICAgICAgICAgICBrZXlib2FyZF9pbnRlcnJ1cHRlZCA9IFRydWUKICAgICAgICAgICAg IGV4Y2VwdDoKICAgICAgICAgICAgICAgICAjIFVuZXhwZWN0ZWQgZXhjZXB0aW9uOyBkb24ndCB0 cnkgdG8gY2xlYW4gdXAgd29ya2Vycy4KQEAgLTYyOSw2ICs2MjksOCBAQCBjbGFzcyBUZXN0UnVu bmVyOgogICAgICAgICB0aHJlYWRfdGltaW5ncywgdGVzdF90aW1pbmdzLCBpbmRpdmlkdWFsX3Rl c3RfdGltaW5ncyA9IFwKICAgICAgICAgICAgIHNlbGYuX2NvbGxlY3RfdGltaW5nX2luZm8odGhy ZWFkcykKIAorICAgICAgICBicm9rZXIuY2xlYW51cCgpCisgICAgICAgIHNlbGYuX21lc3NhZ2Vf YnJva2VyID0gTm9uZQogICAgICAgICByZXR1cm4gKGtleWJvYXJkX2ludGVycnVwdGVkLCB0aHJl YWRfdGltaW5ncywgdGVzdF90aW1pbmdzLAogICAgICAgICAgICAgICAgIGluZGl2aWR1YWxfdGVz dF90aW1pbmdzKQogCkBAIC0xMzAyLDEzICsxMzA0LDExIEBAIGRlZiBydW4ocG9ydCwgb3B0aW9u cywgYXJncywgcmVndWxhcl9vdXRwdXQ9c3lzLnN0ZGVyciwKICAgICAgICAgcHJpbnRlci5jbGVh bnVwKCkKICAgICAgICAgcmV0dXJuIDAKIAotICAgIGJyb2tlciA9IG1lc3NhZ2VfYnJva2VyLmdl dChwb3J0LCBvcHRpb25zKQotCiAgICAgIyBXZSB3cmFwIGFueSBwYXJ0cyBvZiB0aGUgcnVuIHRo YXQgYXJlIHNsb3cgb3IgbGlrZWx5IHRvIHJhaXNlIGV4Y2VwdGlvbnMKICAgICAjIGluIGEgdHJ5 L2ZpbmFsbHkgdG8gZW5zdXJlIHRoYXQgd2UgY2xlYW4gdXAgdGhlIGxvZ2dpbmcgY29uZmlndXJh dGlvbi4KICAgICBudW1fdW5leHBlY3RlZF9yZXN1bHRzID0gLTEKICAgICB0cnk6Ci0gICAgICAg IHRlc3RfcnVubmVyID0gVGVzdFJ1bm5lcihwb3J0LCBvcHRpb25zLCBwcmludGVyLCBicm9rZXIp CisgICAgICAgIHRlc3RfcnVubmVyID0gVGVzdFJ1bm5lcihwb3J0LCBvcHRpb25zLCBwcmludGVy KQogICAgICAgICB0ZXN0X3J1bm5lci5fcHJpbnRfY29uZmlnKCkKIAogICAgICAgICBwcmludGVy LnByaW50X3VwZGF0ZSgiQ29sbGVjdGluZyB0ZXN0cyAuLi4iKQpAQCAtMTMzNyw3ICsxMzM3LDYg QEAgZGVmIHJ1bihwb3J0LCBvcHRpb25zLCBhcmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJy LAogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiVGVzdGluZyBjb21wbGV0ZWQsIEV4aXQgc3RhdHVz OiAlZCIgJQogICAgICAgICAgICAgICAgICAgICAgICBudW1fdW5leHBlY3RlZF9yZXN1bHRzKQog ICAgIGZpbmFsbHk6Ci0gICAgICAgIGJyb2tlci5jbGVhbnVwKCkKICAgICAgICAgcHJpbnRlci5j bGVhbnVwKCkKIAogICAgIHJldHVybiBudW1fdW5leHBlY3RlZF9yZXN1bHRzCkBAIC0xMzQ2LDkg KzEzNDUsOSBAQCBkZWYgcnVuKHBvcnQsIG9wdGlvbnMsIGFyZ3MsIHJlZ3VsYXJfb3V0cHV0PXN5 cy5zdGRlcnIsCiBkZWYgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydF9vYmosIG9wdGlvbnMp OgogICAgICIiIlNldHMgdGhlIG9wdGlvbnMgdmFsdWVzIHRoYXQgZGVwZW5kIG9uIG90aGVyIG9w dGlvbnMgdmFsdWVzLiIiIgogCi0gICAgaWYgb3B0aW9ucy53b3JrZXJfbW9kZWwgPT0gJ2lubGlu ZSc6CisgICAgaWYgb3B0aW9ucy53b3JrZXJfbW9kZWwgPT0gJ29sZC1pbmxpbmUnOgogICAgICAg ICBpZiBvcHRpb25zLmNoaWxkX3Byb2Nlc3NlcyBhbmQgaW50KG9wdGlvbnMuY2hpbGRfcHJvY2Vz c2VzKSA+IDE6Ci0gICAgICAgICAgICBfbG9nLndhcm5pbmcoIi0td29ya2VyLW1vZGVsPWlubGlu ZSBvdmVycmlkZXMgLS1jaGlsZC1wcm9jZXNzZXMiKQorICAgICAgICAgICAgX2xvZy53YXJuaW5n KCItLXdvcmtlci1tb2RlbD1vbGQtaW5saW5lIG92ZXJyaWRlcyAtLWNoaWxkLXByb2Nlc3NlcyIp CiAgICAgICAgIG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzID0gIjEiCiAgICAgaWYgbm90IG9wdGlv bnMuY2hpbGRfcHJvY2Vzc2VzOgogICAgICAgICBvcHRpb25zLmNoaWxkX3Byb2Nlc3NlcyA9IG9z LmVudmlyb24uZ2V0KCJXRUJLSVRfVEVTVF9DSElMRF9QUk9DRVNTRVMiLApAQCAtMTU3Nyw4ICsx NTc2LDggQEAgZGVmIHBhcnNlX2FyZ3MoYXJncz1Ob25lKToKICAgICAgICAgICAgIGhlbHA9Ik51 bWJlciBvZiBEdW1wUmVuZGVyVHJlZXMgdG8gcnVuIGluIHBhcmFsbGVsLiIpLAogICAgICAgICAj IEZJWE1FOiBEaXNwbGF5IGRlZmF1bHQgbnVtYmVyIG9mIGNoaWxkIHByb2Nlc3NlcyB0aGF0IHdp bGwgcnVuLgogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS13b3JrZXItbW9kZWwiLCBh Y3Rpb249InN0b3JlIiwKLSAgICAgICAgICAgIGRlZmF1bHQ9InRocmVhZHMiLCBoZWxwPSgiY29u dHJvbHMgd29ya2VyIG1vZGVsLiBWYWxpZCB2YWx1ZXMgYXJlICIKLSAgICAgICAgICAgICInaW5s aW5lJyBhbmQgJ3RocmVhZHMnIChkZWZhdWx0KS4iKSksCisgICAgICAgICAgICBkZWZhdWx0PSJv bGQtdGhyZWFkcyIsIGhlbHA9KCJjb250cm9scyB3b3JrZXIgbW9kZWwuIFZhbGlkIHZhbHVlcyAi CisgICAgICAgICAgICAiYXJlICdpbmxpbmUnLCAnb2xkLWlubGluZScsICdvbGQtdGhyZWFkcycs ICd0aHJlYWRzJy4iKSksCiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWV4cGVyaW1l bnRhbC1mdWxseS1wYXJhbGxlbCIsCiAgICAgICAgICAgICBhY3Rpb249InN0b3JlX3RydWUiLCBk ZWZhdWx0PUZhbHNlLAogICAgICAgICAgICAgaGVscD0icnVuIGFsbCB0ZXN0cyBpbiBwYXJhbGxl bCIpLApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5kZXggODEw Zjc4N2Q2ZjZiZmNhZmM3Nzc2OTQxNzJmMTU4YjQyMGE3MGRmNi4uNjMxMTEzODFiOTRlYTFjZTMw MzM4OTA4MTgwZTEyNGQ1MDk3NDUzYSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQorKysgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3Rz X3VuaXR0ZXN0LnB5CkBAIC03Niw3ICs3Niw3IEBAIGRlZiBwYXJzZV9hcmdzKGV4dHJhX2FyZ3M9 Tm9uZSwgcmVjb3JkX3Jlc3VsdHM9RmFsc2UsIHRlc3RzX2luY2x1ZGVkPUZhbHNlLAogICAgIGlm IG5vdCByZWNvcmRfcmVzdWx0czoKICAgICAgICAgYXJncy5hcHBlbmQoJy0tbm8tcmVjb3JkLXJl c3VsdHMnKQogICAgIGlmIG5vdCAnLS1jaGlsZC1wcm9jZXNzZXMnIGluIGV4dHJhX2FyZ3M6Ci0g ICAgICAgIGFyZ3MuZXh0ZW5kKFsnLS13b3JrZXItbW9kZWwnLCAnaW5saW5lJ10pCisgICAgICAg IGFyZ3MuZXh0ZW5kKFsnLS13b3JrZXItbW9kZWwnLCAnb2xkLWlubGluZSddKQogICAgIGFyZ3Mu ZXh0ZW5kKGV4dHJhX2FyZ3MpCiAgICAgaWYgbm90IHRlc3RzX2luY2x1ZGVkOgogICAgICAgICAj IFdlIHVzZSB0aGUgZ2xvYiB0byB0ZXN0IHRoYXQgZ2xvYmJpbmcgd29ya3MuCkBAIC0zOTAsMTQg KzM5MCwxMCBAQCBjbGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoTm9uZSwgdGVzdF9wb3J0LnRvbGVyYW5jZV91c2VkX2Zvcl9kaWZmX2lt YWdlKQogCiAgICAgZGVmIHRlc3Rfd29ya2VyX21vZGVsX19pbmxpbmUoc2VsZik6Ci0gICAgICAg IHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0td29ya2VyLW1vZGVsJywgJ2lubGluZSdd KSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBhc3NpbmdfcnVuKFsnLS13b3JrZXItbW9kZWwn LCAnb2xkLWlubGluZSddKSkKIAogICAgIGRlZiB0ZXN0X3dvcmtlcl9tb2RlbF9fdGhyZWFkcyhz ZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBhc3NpbmdfcnVuKFsnLS13b3JrZXItbW9k ZWwnLCAndGhyZWFkcyddKSkKLQotICAgIGRlZiB0ZXN0X3dvcmtlcl9tb2RlbF9fcHJvY2Vzc2Vz KHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhWYWx1ZUVycm9yLCBsb2dnaW5nX3J1 biwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgWyctLXdvcmtlci1tb2RlbCcsICdwcm9jZXNz ZXMnXSkKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBhc3NpbmdfcnVuKFsnLS13b3JrZXItbW9k ZWwnLCAnb2xkLXRocmVhZHMnXSkpCiAKICAgICBkZWYgdGVzdF93b3JrZXJfbW9kZWxfX3Vua25v d24oc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFZhbHVlRXJyb3IsIGxvZ2dpbmdf cnVuLApAQCAtNDg1LDcgKzQ4MSw3IEBAIGNsYXNzIFRlc3RSdW5uZXJUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgbW9ja19wb3J0LmZpbGVuYW1lX3RvX3VyaSA9IGxhbWJkYSBuYW1l OiBuYW1lCiAKICAgICAgICAgcnVubmVyID0gcnVuX3dlYmtpdF90ZXN0cy5UZXN0UnVubmVyKHBv cnQ9bW9ja19wb3J0LCBvcHRpb25zPU1vY2soKSwKLSAgICAgICAgICAgIHByaW50ZXI9TW9jaygp LCBtZXNzYWdlX2Jyb2tlcj1Nb2NrKCkpCisgICAgICAgICAgICBwcmludGVyPU1vY2soKSkKICAg ICAgICAgZXhwZWN0ZWRfaHRtbCA9IHUiIiI8aHRtbD4KICAgPGhlYWQ+CiAgICAgPHRpdGxlPkxh eW91dCBUZXN0IFJlc3VsdHMgKHRpbWUpPC90aXRsZT4KQEAgLTUwMyw3ICs0OTksNyBAQCBjbGFz cyBUZXN0UnVubmVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICMgVGVzdCB0aGF0 IF9zaGFyZF90ZXN0cyBpbiBydW5fd2Via2l0X3Rlc3RzLlRlc3RSdW5uZXIgcmVhbGx5CiAgICAg ICAgICMgcHV0IHRoZSBodHRwIHRlc3RzIGZpcnN0IGluIHRoZSBxdWV1ZS4KICAgICAgICAgcnVu bmVyID0gVGVzdFJ1bm5lcldyYXBwZXIocG9ydD1Nb2NrKCksIG9wdGlvbnM9TW9jaygpLAotICAg ICAgICAgICAgcHJpbnRlcj1Nb2NrKCksIG1lc3NhZ2VfYnJva2VyPU1vY2soKSkKKyAgICAgICAg ICAgIHByaW50ZXI9TW9jaygpKQogCiAgICAgICAgIHRlc3RfbGlzdCA9IFsKICAgICAgICAgICAi TGF5b3V0VGVzdHMvd2Vic29ja2V0L3Rlc3RzL3VuaWNvZGUuaHRtIiwK 76613 2010-12-14 19:06:14 -0800 2010-12-22 16:54:36 -0800 more minor cleanup bug-51081-20101214190613.patch text/plain 12196 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAzYWM2YzY2NWU0MWYyNGVlMGI3YWNkNDY2YjlmZjQwYmQ2ZjZkNGE5Li4yMGRkYzg3 NWM5YWQxMGY1NWQ2MmMwOGYxNzE2MWRkZDdkMmU4NzBiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTAtMTItMTQgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgbnJ3dCBtdWx0aXByb2Nl c3NpbmcgLSBzdGFydCBvdmVyLCBwcmVwYXJlIHRvIGZvcmsgdGhlIGNvZGUKKworICAgICAgICBU aGlzIGNvZGUgY2xlYW5zIHVwIHRoZSBzaWduYXR1cmVzIGFuZCBpbXBsZW1lbnRhdGlvbiBvZiB0 aGUKKyAgICAgICAgVGVzdFJ1bm5lciBjbGFzcyBzbyB3ZSBjYW4gZWFzaWx5IGZvcmsgaXQgdG8g cnVuIGVpdGhlciB0aGUKKyAgICAgICAgc3RhYmxlIGltcGxlbWVudGF0aW9uIG9yIHRoZSBuZXcs IHVuc3RhYmxlIG1lc3NhZ2UtcGFzc2luZworICAgICAgICBpbXBsZW1lbnRhdGlvbi4gVGhlIHR3 byB2YXJpYW50cyB3aWxsIGhhdmUgZGlmZmVyZW50CisgICAgICAgIGltcGxlbWVudGF0aW9ucyBv ZiB0aGUgcnVuX3Rlc3RzKCkgbWV0aG9kLiBXZSB3aWxsIHN3aXRjaAorICAgICAgICBiZXR3ZWVu IHRoZSB0d28gYmFzZWQgb24gdGhlIHNldHRpbmcgZm9yIHRoZSAnLS13b3JrZXItbW9kZWwnCisg ICAgICAgIHN3aXRjaC4gV2UgcmVuYW1lIHRoZSB0d28gY3VycmVudGx5IHZhbGlkIHZhbHVlcyB0 byAnb2xkLWlubGluZScKKyAgICAgICAgYW5kICdvbGQtdGhyZWFkcycuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUxMDgxCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRl c3QucHk6CisKIDIwMTAtMTItMTQgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCmRpZmYgLS1naXQgYS9XZWJL aXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNz YWdlX2Jyb2tlci5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2xheW91dF9wYWNrYWdlL21lc3NhZ2VfYnJva2VyLnB5CmluZGV4IGU1MjBhOWNhYTZiNzY4MmVi ZmRkMmE5OGJiMjE3ZWI4NWQ3MjUxYmMuLmUwY2E4ZGIxZDhhYTU1MDRhMDZlMTg0NjVlNDU3MmJm NjJmZWUxZDUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL21lc3NhZ2VfYnJva2VyLnB5CisrKyBiL1dlYktpdFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL21lc3NhZ2VfYnJv a2VyLnB5CkBAIC01Myw5ICs1Myw5IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVf XykKIGRlZiBnZXQocG9ydCwgb3B0aW9ucyk6CiAgICAgIiIiUmV0dXJuIGFuIGluc3RhbmNlIG9m IGEgV29ya2VyTWVzc2FnZUJyb2tlci4iIiIKICAgICB3b3JrZXJfbW9kZWwgPSBvcHRpb25zLndv cmtlcl9tb2RlbAotICAgIGlmIHdvcmtlcl9tb2RlbCA9PSAnaW5saW5lJzoKKyAgICBpZiB3b3Jr ZXJfbW9kZWwgPT0gJ29sZC1pbmxpbmUnOgogICAgICAgICByZXR1cm4gSW5saW5lQnJva2VyKHBv cnQsIG9wdGlvbnMpCi0gICAgaWYgd29ya2VyX21vZGVsID09ICd0aHJlYWRzJzoKKyAgICBpZiB3 b3JrZXJfbW9kZWwgPT0gJ29sZC10aHJlYWRzJzoKICAgICAgICAgcmV0dXJuIE11bHRpVGhyZWFk ZWRCcm9rZXIocG9ydCwgb3B0aW9ucykKICAgICByYWlzZSBWYWx1ZUVycm9yKCd1bnN1cHBvcnRl ZCB2YWx1ZSBmb3IgLS13b3JrZXItbW9kZWw6ICVzJyAlIHdvcmtlcl9tb2RlbCkKIApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHMucHkKaW5kZXggNTFhZGY2N2ZjYTI5ZDlhYjMxMDkzMTk2NTA3ZWRjMzc2 ZmQyYTU4MC4uZDU1NTI4NjM4YmVkZTQxZTk3YzY0OTgxMTllMTJkZjQyNTE0Yzc0MCAxMDA3NTUK LS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtp dF90ZXN0cy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC0xMzUsNyArMTM1LDcgQEAgY2xhc3MgUmVzdWx0U3Vt bWFyeShvYmplY3QpOgogICAgICAgICAiIiJBZGQgYSBUZXN0UmVzdWx0IGludG8gdGhlIGFwcHJv cHJpYXRlIGJpbi4KIAogICAgICAgICBBcmdzOgotICAgICAgICAgIHJlc3VsdDogVGVzdFJlc3Vs dCBmcm9tIGR1bXBfcmVuZGVyX3RyZWVfdGhyZWFkLgorICAgICAgICAgIHJlc3VsdDogVGVzdFJl c3VsdAogICAgICAgICAgIGV4cGVjdGVkOiB3aGV0aGVyIHRoZSByZXN1bHQgd2FzIHdoYXQgd2Ug ZXhwZWN0ZWQgaXQgdG8gYmUuCiAgICAgICAgICIiIgogCkBAIC0yNDAsMTkgKzI0MCwxOCBAQCBj bGFzcyBUZXN0UnVubmVyOgogICAgICMgaW4gRHVtcFJlbmRlclRyZWUuCiAgICAgREVGQVVMVF9U RVNUX1RJTUVPVVRfTVMgPSA2ICogMTAwMAogCi0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQs IG9wdGlvbnMsIHByaW50ZXIsIG1lc3NhZ2VfYnJva2VyKToKKyAgICBkZWYgX19pbml0X18oc2Vs ZiwgcG9ydCwgb3B0aW9ucywgcHJpbnRlcik6CiAgICAgICAgICIiIkluaXRpYWxpemUgdGVzdCBy dW5uZXIgZGF0YSBzdHJ1Y3R1cmVzLgogCiAgICAgICAgIEFyZ3M6CiAgICAgICAgICAgcG9ydDog YW4gb2JqZWN0IGltcGxlbWVudGluZyBwb3J0LXNwZWNpZmljCiAgICAgICAgICAgb3B0aW9uczog YSBkaWN0aW9uYXJ5IG9mIGNvbW1hbmQgbGluZSBvcHRpb25zCiAgICAgICAgICAgcHJpbnRlcjog YSBQcmludGVyIG9iamVjdCB0byByZWNvcmQgdXBkYXRlcyB0by4KLSAgICAgICAgICBtZXNzYWdl X2Jyb2tlcjogb2JqZWN0IHVzZWQgdG8gY29tbXVuaWNhdGUgd2l0aCB3b3JrZXJzLgogICAgICAg ICAiIiIKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQKICAgICAgICAgc2VsZi5fb3B0aW9ucyA9 IG9wdGlvbnMKICAgICAgICAgc2VsZi5fcHJpbnRlciA9IHByaW50ZXIKLSAgICAgICAgc2VsZi5f bWVzc2FnZV9icm9rZXIgPSBtZXNzYWdlX2Jyb2tlcgorICAgICAgICBzZWxmLl9tZXNzYWdlX2Jy b2tlciA9IE5vbmUKIAogICAgICAgICAjIGRpc2FibGUgd3NzIHNlcnZlci4gbmVlZCB0byBpbnN0 YWxsIHB5T3BlblNTTCBvbiBidWlsZGJvdHMuCiAgICAgICAgICMgc2VsZi5fd2Vic29ja2V0X3Nl Y3VyZV9zZXJ2ZXIgPSB3ZWJzb2NrZXRfc2VydmVyLlB5V2ViU29ja2V0KApAQCAtNTEzLDcgKzUx Miw3IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgICIiIkdyb3VwcyB0ZXN0cyBpbnRvIGJh dGNoZXMuCiAgICAgICAgIFRoaXMgaGVscHMgZW5zdXJlIHRoYXQgdGVzdHMgdGhhdCBkZXBlbmQg b24gZWFjaCBvdGhlciAoYWthIGJhZCB0ZXN0cyEpCiAgICAgICAgIGNvbnRpbnVlIHRvIHJ1biB0 b2dldGhlciBhcyBtb3N0IGNyb3NzLXRlc3RzIGRlcGVuZGVuY2llcyB0ZW5kIHRvCi0gICAgICAg IG9jY3VyIHdpdGhpbiB0aGUgc2FtZSBkaXJlY3RvcnkuIElmIHVzZV9yZWFsX3NoYXJkcyBpcyBm YWxzZSwgd2UKKyAgICAgICAgb2NjdXIgd2l0aGluIHRoZSBzYW1lIGRpcmVjdG9yeS4gSWYgdXNl X3JlYWxfc2hhcmRzIGlzIEZhbHNlLCB3ZQogICAgICAgICBwdXQgZWFjaCAobm9uLUhUVFAvd2Vi c29ja2V0KSB0ZXN0IGludG8gaXRzIG93biBzaGFyZCBmb3IgbWF4aW11bQogICAgICAgICBjb25j dXJyZW5jeSBpbnN0ZWFkIG9mIHRyeWluZyB0byBkbyBhbnkgc29ydCBvZiByZWFsIHNoYXJkaW5n LgogCkBAIC02MDMsMTIgKzYwMiwxMyBAQCBjbGFzcyBUZXN0UnVubmVyOgogCiAgICAgICAgIHNl bGYuX3ByaW50ZXIucHJpbnRfdXBkYXRlKCdTdGFydGluZyAlcyAuLi4nICUKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZ3JhbW1hci5wbHVyYWxpemUoJ3dvcmtlcicsIG51bV93 b3JrZXJzKSkKLSAgICAgICAgbWVzc2FnZV9icm9rZXIgPSBzZWxmLl9tZXNzYWdlX2Jyb2tlcgor ICAgICAgICBzZWxmLl9tZXNzYWdlX2Jyb2tlciA9IG1lc3NhZ2VfYnJva2VyLmdldChzZWxmLl9w b3J0LCBzZWxmLl9vcHRpb25zKQorICAgICAgICBicm9rZXIgPSBzZWxmLl9tZXNzYWdlX2Jyb2tl cgogICAgICAgICBzZWxmLl9jdXJyZW50X2ZpbGVuYW1lX3F1ZXVlID0gZmlsZW5hbWVfcXVldWUK ICAgICAgICAgc2VsZi5fY3VycmVudF9yZXN1bHRfc3VtbWFyeSA9IHJlc3VsdF9zdW1tYXJ5CiAK ICAgICAgICAgaWYgbm90IHNlbGYuX29wdGlvbnMuZHJ5X3J1bjoKLSAgICAgICAgICAgIHRocmVh ZHMgPSBtZXNzYWdlX2Jyb2tlci5zdGFydF93b3JrZXJzKHNlbGYpCisgICAgICAgICAgICB0aHJl YWRzID0gYnJva2VyLnN0YXJ0X3dvcmtlcnMoc2VsZikKICAgICAgICAgZWxzZToKICAgICAgICAg ICAgIHRocmVhZHMgPSB7fQogCkBAIC02MTYsMTAgKzYxNiwxMCBAQCBjbGFzcyBUZXN0UnVubmVy OgogICAgICAgICBrZXlib2FyZF9pbnRlcnJ1cHRlZCA9IEZhbHNlCiAgICAgICAgIGlmIG5vdCBz ZWxmLl9vcHRpb25zLmRyeV9ydW46CiAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAg bWVzc2FnZV9icm9rZXIucnVuX21lc3NhZ2VfbG9vcCgpCisgICAgICAgICAgICAgICAgYnJva2Vy LnJ1bl9tZXNzYWdlX2xvb3AoKQogICAgICAgICAgICAgZXhjZXB0IEtleWJvYXJkSW50ZXJydXB0 OgogICAgICAgICAgICAgICAgIF9sb2cuaW5mbygiSW50ZXJydXB0ZWQsIGV4aXRpbmciKQotICAg ICAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLmNhbmNlbF93b3JrZXJzKCkKKyAgICAgICAgICAg ICAgICBicm9rZXIuY2FuY2VsX3dvcmtlcnMoKQogICAgICAgICAgICAgICAgIGtleWJvYXJkX2lu dGVycnVwdGVkID0gVHJ1ZQogICAgICAgICAgICAgZXhjZXB0OgogICAgICAgICAgICAgICAgICMg VW5leHBlY3RlZCBleGNlcHRpb247IGRvbid0IHRyeSB0byBjbGVhbiB1cCB3b3JrZXJzLgpAQCAt NjI5LDYgKzYyOSw4IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIHRocmVhZF90aW1pbmdz LCB0ZXN0X3RpbWluZ3MsIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzID0gXAogICAgICAgICAgICAg c2VsZi5fY29sbGVjdF90aW1pbmdfaW5mbyh0aHJlYWRzKQogCisgICAgICAgIGJyb2tlci5jbGVh bnVwKCkKKyAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9rZXIgPSBOb25lCiAgICAgICAgIHJldHVy biAoa2V5Ym9hcmRfaW50ZXJydXB0ZWQsIHRocmVhZF90aW1pbmdzLCB0ZXN0X3RpbWluZ3MsCiAg ICAgICAgICAgICAgICAgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MpCiAKQEAgLTk3Nyw4ICs5Nzks NyBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgIGRlZiBfcHJpbnRfYWdncmVnYXRlX3Rlc3Rfc3Rh dGlzdGljcyhzZWxmLCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncyk6CiAgICAgICAgICIiIlByaW50 cyBhZ2dyZWdhdGUgc3RhdGlzdGljcyAoZS5nLiBtZWRpYW4sIG1lYW4sIGV0Yy4pIGZvciBhbGwg dGVzdHMuCiAgICAgICAgIEFyZ3M6Ci0gICAgICAgICAgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3M6 IExpc3Qgb2YgZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQuVGVzdFN0YXRzCi0gICAgICAgICAgICAg IGZvciBhbGwgdGVzdHMuCisgICAgICAgICAgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3M6IExpc3Qg b2YgVGVzdFJlc3VsdHMgZm9yIGFsbCB0ZXN0cy4KICAgICAgICAgIiIiCiAgICAgICAgIHRlc3Rf dHlwZXMgPSBbXSAgIyBVbml0IHRlc3RzIGRvbid0IGFjdHVhbGx5IHByb2R1Y2UgYW55IHRpbWlu Z3MuCiAgICAgICAgIGlmIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzOgpAQCAtMTAxMyw4ICsxMDE0 LDcgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZXN1bHRfc3VtbWFyeSk6CiAgICAgICAgICIiIlByaW50cyB0aGUgcnVuIHRpbWVzIGZvciBz bG93LCB0aW1lb3V0IGFuZCBjcmFzaCB0ZXN0cy4KICAgICAgICAgQXJnczoKLSAgICAgICAgICBp bmRpdmlkdWFsX3Rlc3RfdGltaW5nczogTGlzdCBvZiBkdW1wX3JlbmRlcl90cmVlX3RocmVhZC5U ZXN0U3RhdHMKLSAgICAgICAgICAgICAgZm9yIGFsbCB0ZXN0cy4KKyAgICAgICAgICBpbmRpdmlk dWFsX3Rlc3RfdGltaW5nczogTGlzdCBvZiBUZXN0U3RhdHMgZm9yIGFsbCB0ZXN0cy4KICAgICAg ICAgICByZXN1bHRfc3VtbWFyeTogc3VtbWFyeSBvYmplY3QgZm9yIHRlc3QgcnVuCiAgICAgICAg ICIiIgogICAgICAgICAjIFJldmVyc2Utc29ydCBieSB0aGUgdGltZSBzcGVudCBpbiBEdW1wUmVu ZGVyVHJlZS4KQEAgLTEyODcsMTAgKzEyODcsMTMgQEAgZGVmIHJ1bihwb3J0LCBvcHRpb25zLCBh cmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJyLAogICAgICAgICAgIGVycm9yLgogCiAgICAg IiIiCi0gICAgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwgb3B0aW9ucykKKyAgICB3YXJu aW5ncyA9IF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnQsIG9wdGlvbnMpCiAKICAgICBwcmlu dGVyID0gcHJpbnRpbmcuUHJpbnRlcihwb3J0LCBvcHRpb25zLCByZWd1bGFyX291dHB1dCwgYnVp bGRib3Rfb3V0cHV0LAogICAgICAgICBpbnQob3B0aW9ucy5jaGlsZF9wcm9jZXNzZXMpLCBvcHRp b25zLmV4cGVyaW1lbnRhbF9mdWxseV9wYXJhbGxlbCkKKyAgICBmb3IgdyBpbiB3YXJuaW5nczoK KyAgICAgICAgX2xvZy53YXJuaW5nKHcpCisKICAgICBpZiBvcHRpb25zLmhlbHBfcHJpbnRpbmc6 CiAgICAgICAgIHByaW50ZXIuaGVscF9wcmludGluZygpCiAgICAgICAgIHByaW50ZXIuY2xlYW51 cCgpCkBAIC0xMzAyLDEzICsxMzA1LDExIEBAIGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywg cmVndWxhcl9vdXRwdXQ9c3lzLnN0ZGVyciwKICAgICAgICAgcHJpbnRlci5jbGVhbnVwKCkKICAg ICAgICAgcmV0dXJuIDAKIAotICAgIGJyb2tlciA9IG1lc3NhZ2VfYnJva2VyLmdldChwb3J0LCBv cHRpb25zKQotCiAgICAgIyBXZSB3cmFwIGFueSBwYXJ0cyBvZiB0aGUgcnVuIHRoYXQgYXJlIHNs b3cgb3IgbGlrZWx5IHRvIHJhaXNlIGV4Y2VwdGlvbnMKICAgICAjIGluIGEgdHJ5L2ZpbmFsbHkg dG8gZW5zdXJlIHRoYXQgd2UgY2xlYW4gdXAgdGhlIGxvZ2dpbmcgY29uZmlndXJhdGlvbi4KICAg ICBudW1fdW5leHBlY3RlZF9yZXN1bHRzID0gLTEKICAgICB0cnk6Ci0gICAgICAgIHRlc3RfcnVu bmVyID0gVGVzdFJ1bm5lcihwb3J0LCBvcHRpb25zLCBwcmludGVyLCBicm9rZXIpCisgICAgICAg IHRlc3RfcnVubmVyID0gVGVzdFJ1bm5lcihwb3J0LCBvcHRpb25zLCBwcmludGVyKQogICAgICAg ICB0ZXN0X3J1bm5lci5fcHJpbnRfY29uZmlnKCkKIAogICAgICAgICBwcmludGVyLnByaW50X3Vw ZGF0ZSgiQ29sbGVjdGluZyB0ZXN0cyAuLi4iKQpAQCAtMTMzNyw3ICsxMzM4LDYgQEAgZGVmIHJ1 bihwb3J0LCBvcHRpb25zLCBhcmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJyLAogICAgICAg ICAgICAgX2xvZy5kZWJ1ZygiVGVzdGluZyBjb21wbGV0ZWQsIEV4aXQgc3RhdHVzOiAlZCIgJQog ICAgICAgICAgICAgICAgICAgICAgICBudW1fdW5leHBlY3RlZF9yZXN1bHRzKQogICAgIGZpbmFs bHk6Ci0gICAgICAgIGJyb2tlci5jbGVhbnVwKCkKICAgICAgICAgcHJpbnRlci5jbGVhbnVwKCkK IAogICAgIHJldHVybiBudW1fdW5leHBlY3RlZF9yZXN1bHRzCkBAIC0xMzQ1LDEwICsxMzQ1LDEy IEBAIGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywgcmVndWxhcl9vdXRwdXQ9c3lzLnN0ZGVy ciwKIAogZGVmIF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnRfb2JqLCBvcHRpb25zKToKICAg ICAiIiJTZXRzIHRoZSBvcHRpb25zIHZhbHVlcyB0aGF0IGRlcGVuZCBvbiBvdGhlciBvcHRpb25z IHZhbHVlcy4iIiIKKyAgICAjIFdlIHJldHVybiBhIGxpc3Qgb2Ygd2FybmluZ3MgdG8gcHJpbnQg YWZ0ZXIgdGhlIHByaW50ZXIgaXMgaW5pdGlhbGl6ZWQuCisgICAgd2FybmluZ3MgPSBbXQogCi0g ICAgaWYgb3B0aW9ucy53b3JrZXJfbW9kZWwgPT0gJ2lubGluZSc6CisgICAgaWYgb3B0aW9ucy53 b3JrZXJfbW9kZWwgPT0gJ29sZC1pbmxpbmUnOgogICAgICAgICBpZiBvcHRpb25zLmNoaWxkX3By b2Nlc3NlcyBhbmQgaW50KG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzKSA+IDE6Ci0gICAgICAgICAg ICBfbG9nLndhcm5pbmcoIi0td29ya2VyLW1vZGVsPWlubGluZSBvdmVycmlkZXMgLS1jaGlsZC1w cm9jZXNzZXMiKQorICAgICAgICAgICAgd2FybmluZ3MuYXBwZW5kKCItLXdvcmtlci1tb2RlbD1v bGQtaW5saW5lIG92ZXJyaWRlcyAtLWNoaWxkLXByb2Nlc3NlcyIpCiAgICAgICAgIG9wdGlvbnMu Y2hpbGRfcHJvY2Vzc2VzID0gIjEiCiAgICAgaWYgbm90IG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2Vz OgogICAgICAgICBvcHRpb25zLmNoaWxkX3Byb2Nlc3NlcyA9IG9zLmVudmlyb24uZ2V0KCJXRUJL SVRfVEVTVF9DSElMRF9QUk9DRVNTRVMiLApAQCAtMTM3Niw2ICsxMzc4LDcgQEAgZGVmIF9zZXRf dXBfZGVyaXZlZF9vcHRpb25zKHBvcnRfb2JqLCBvcHRpb25zKToKICAgICAgICAgICAgIG9wdGlv bnMudGltZV9vdXRfbXMgPSBzdHIoVGVzdFJ1bm5lci5ERUZBVUxUX1RFU1RfVElNRU9VVF9NUykK IAogICAgIG9wdGlvbnMuc2xvd190aW1lX291dF9tcyA9IHN0cig1ICogaW50KG9wdGlvbnMudGlt ZV9vdXRfbXMpKQorICAgIHJldHVybiB3YXJuaW5ncwogCiAKIGRlZiBfZ2F0aGVyX3VuZXhwZWN0 ZWRfcmVzdWx0cyhvcHRpb25zKToKQEAgLTE1NzcsOCArMTU4MCw4IEBAIGRlZiBwYXJzZV9hcmdz KGFyZ3M9Tm9uZSk6CiAgICAgICAgICAgICBoZWxwPSJOdW1iZXIgb2YgRHVtcFJlbmRlclRyZWVz IHRvIHJ1biBpbiBwYXJhbGxlbC4iKSwKICAgICAgICAgIyBGSVhNRTogRGlzcGxheSBkZWZhdWx0 IG51bWJlciBvZiBjaGlsZCBwcm9jZXNzZXMgdGhhdCB3aWxsIHJ1bi4KICAgICAgICAgb3B0cGFy c2UubWFrZV9vcHRpb24oIi0td29ya2VyLW1vZGVsIiwgYWN0aW9uPSJzdG9yZSIsCi0gICAgICAg ICAgICBkZWZhdWx0PSJ0aHJlYWRzIiwgaGVscD0oImNvbnRyb2xzIHdvcmtlciBtb2RlbC4gVmFs aWQgdmFsdWVzIGFyZSAiCi0gICAgICAgICAgICAiJ2lubGluZScgYW5kICd0aHJlYWRzJyAoZGVm YXVsdCkuIikpLAorICAgICAgICAgICAgZGVmYXVsdD0ib2xkLXRocmVhZHMiLCBoZWxwPSgiY29u dHJvbHMgd29ya2VyIG1vZGVsLiBWYWxpZCB2YWx1ZXMgIgorICAgICAgICAgICAgImFyZSAnb2xk LWlubGluZScsICdvbGQtdGhyZWFkcycuIikpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlv bigiLS1leHBlcmltZW50YWwtZnVsbHktcGFyYWxsZWwiLAogICAgICAgICAgICAgYWN0aW9uPSJz dG9yZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgICAgIGhlbHA9InJ1biBhbGwgdGVz dHMgaW4gcGFyYWxsZWwiKSwKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0 LnB5CmluZGV4IDgxMGY3ODdkNmY2YmZjYWZjNzc3Njk0MTcyZjE1OGI0MjBhNzBkZjYuLjYzMTEx MzgxYjk0ZWExY2UzMDMzODkwODE4MGUxMjRkNTA5NzQ1M2EgMTAwNjQ0Ci0tLSBhL1dlYktpdFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRl c3QucHkKKysrIGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0c191bml0dGVzdC5weQpAQCAtNzYsNyArNzYsNyBAQCBkZWYgcGFyc2VfYXJn cyhleHRyYV9hcmdzPU5vbmUsIHJlY29yZF9yZXN1bHRzPUZhbHNlLCB0ZXN0c19pbmNsdWRlZD1G YWxzZSwKICAgICBpZiBub3QgcmVjb3JkX3Jlc3VsdHM6CiAgICAgICAgIGFyZ3MuYXBwZW5kKCct LW5vLXJlY29yZC1yZXN1bHRzJykKICAgICBpZiBub3QgJy0tY2hpbGQtcHJvY2Vzc2VzJyBpbiBl eHRyYV9hcmdzOgotICAgICAgICBhcmdzLmV4dGVuZChbJy0td29ya2VyLW1vZGVsJywgJ2lubGlu ZSddKQorICAgICAgICBhcmdzLmV4dGVuZChbJy0td29ya2VyLW1vZGVsJywgJ29sZC1pbmxpbmUn XSkKICAgICBhcmdzLmV4dGVuZChleHRyYV9hcmdzKQogICAgIGlmIG5vdCB0ZXN0c19pbmNsdWRl ZDoKICAgICAgICAgIyBXZSB1c2UgdGhlIGdsb2IgdG8gdGVzdCB0aGF0IGdsb2JiaW5nIHdvcmtz LgpAQCAtMzkwLDE0ICszOTAsMTAgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKE5vbmUsIHRlc3RfcG9ydC50b2xlcmFuY2VfdXNl ZF9mb3JfZGlmZl9pbWFnZSkKIAogICAgIGRlZiB0ZXN0X3dvcmtlcl9tb2RlbF9faW5saW5lKHNl bGYpOgotICAgICAgICBzZWxmLmFzc2VydFRydWUocGFzc2luZ19ydW4oWyctLXdvcmtlci1tb2Rl bCcsICdpbmxpbmUnXSkpCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0t d29ya2VyLW1vZGVsJywgJ29sZC1pbmxpbmUnXSkpCiAKICAgICBkZWYgdGVzdF93b3JrZXJfbW9k ZWxfX3RocmVhZHMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihb Jy0td29ya2VyLW1vZGVsJywgJ3RocmVhZHMnXSkpCi0KLSAgICBkZWYgdGVzdF93b3JrZXJfbW9k ZWxfX3Byb2Nlc3NlcyhzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJv ciwgbG9nZ2luZ19ydW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgIFsnLS13b3JrZXItbW9k ZWwnLCAncHJvY2Vzc2VzJ10pCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihb Jy0td29ya2VyLW1vZGVsJywgJ29sZC10aHJlYWRzJ10pKQogCiAgICAgZGVmIHRlc3Rfd29ya2Vy X21vZGVsX191bmtub3duKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhWYWx1ZUVy cm9yLCBsb2dnaW5nX3J1biwKQEAgLTQ4NSw3ICs0ODEsNyBAQCBjbGFzcyBUZXN0UnVubmVyVGVz dCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIG1vY2tfcG9ydC5maWxlbmFtZV90b191cmkg PSBsYW1iZGEgbmFtZTogbmFtZQogCiAgICAgICAgIHJ1bm5lciA9IHJ1bl93ZWJraXRfdGVzdHMu VGVzdFJ1bm5lcihwb3J0PW1vY2tfcG9ydCwgb3B0aW9ucz1Nb2NrKCksCi0gICAgICAgICAgICBw cmludGVyPU1vY2soKSwgbWVzc2FnZV9icm9rZXI9TW9jaygpKQorICAgICAgICAgICAgcHJpbnRl cj1Nb2NrKCkpCiAgICAgICAgIGV4cGVjdGVkX2h0bWwgPSB1IiIiPGh0bWw+CiAgIDxoZWFkPgog ICAgIDx0aXRsZT5MYXlvdXQgVGVzdCBSZXN1bHRzICh0aW1lKTwvdGl0bGU+CkBAIC01MDMsNyAr NDk5LDcgQEAgY2xhc3MgVGVzdFJ1bm5lclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAg ICAjIFRlc3QgdGhhdCBfc2hhcmRfdGVzdHMgaW4gcnVuX3dlYmtpdF90ZXN0cy5UZXN0UnVubmVy IHJlYWxseQogICAgICAgICAjIHB1dCB0aGUgaHR0cCB0ZXN0cyBmaXJzdCBpbiB0aGUgcXVldWUu CiAgICAgICAgIHJ1bm5lciA9IFRlc3RSdW5uZXJXcmFwcGVyKHBvcnQ9TW9jaygpLCBvcHRpb25z PU1vY2soKSwKLSAgICAgICAgICAgIHByaW50ZXI9TW9jaygpLCBtZXNzYWdlX2Jyb2tlcj1Nb2Nr KCkpCisgICAgICAgICAgICBwcmludGVyPU1vY2soKSkKIAogICAgICAgICB0ZXN0X2xpc3QgPSBb CiAgICAgICAgICAgIkxheW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy91bmljb2RlLmh0bSIsCg== 77279 2010-12-22 16:54:39 -0800 2010-12-22 23:18:06 -0800 rebase after WebKitTools->Tools rename bug-51081-20101222165438.patch text/plain 12352 dpranke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhZGM3 Y2QxYzk2OTQ4ZTRkYmY0ODJhMGIzNzY5YWQyYWJiYWZkYmU3Li44OThhMzAxZDEwYTUxZDEyMjlj YTg1NTYzNGM3MGFhZTdmZmQzODdkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTAtMTItMjIgIERpcmsgUHJhbmtl ICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgT2phbiBWYWZh aS4KKworICAgICAgICBucnd0IG11bHRpcHJvY2Vzc2luZyAtIHN0YXJ0IG92ZXIsIHByZXBhcmUg dG8gZm9yayB0aGUgY29kZQorIAorICAgICAgICBUaGlzIGNvZGUgY2xlYW5zIHVwIHRoZSBzaWdu YXR1cmVzIGFuZCBpbXBsZW1lbnRhdGlvbiBvZiB0aGUKKyAgICAgICAgVGVzdFJ1bm5lciBjbGFz cyBzbyB3ZSBjYW4gZWFzaWx5IGZvcmsgaXQgdG8gcnVuIGVpdGhlciB0aGUKKyAgICAgICAgc3Rh YmxlIGltcGxlbWVudGF0aW9uIG9yIHRoZSBuZXcsIHVuc3RhYmxlIG1lc3NhZ2UtcGFzc2luZwor ICAgICAgICBpbXBsZW1lbnRhdGlvbi4gVGhlIHR3byB2YXJpYW50cyB3aWxsIGhhdmUgZGlmZmVy ZW50CisgICAgICAgIGltcGxlbWVudGF0aW9ucyBvZiB0aGUgcnVuX3Rlc3RzKCkgbWV0aG9kLiBX ZSB3aWxsIHN3aXRjaAorICAgICAgICBiZXR3ZWVuIHRoZSB0d28gYmFzZWQgb24gdGhlIHNldHRp bmcgZm9yIHRoZSAnLS13b3JrZXItbW9kZWwnCisgICAgICAgIHN3aXRjaC4gV2UgcmVuYW1lIHRo ZSB0d28gY3VycmVudGx5IHZhbGlkIHZhbHVlcyB0byAnb2xkLWlubGluZScKKyAgICAgICAgYW5k ICdvbGQtdGhyZWFkcycuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUxMDgxCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHk6CisKIDIwMTAtMTItMjIgIFZpY3Rv ciBXYW5nICA8dmljdG9yd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvbGF5b3V0X3BhY2thZ2UvbWVzc2FnZV9icm9rZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNzYWdlX2Jyb2tlci5weQppbmRleCBl NTIwYTljYWE2Yjc2ODJlYmZkZDJhOThiYjIxN2ViODVkNzI1MWJjLi5lMGNhOGRiMWQ4YWE1NTA0 YTA2ZTE4NDY1ZTQ1NzJiZjYyZmVlMWQ1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNzYWdlX2Jyb2tlci5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9tZXNzYWdl X2Jyb2tlci5weQpAQCAtNTMsOSArNTMsOSBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19u YW1lX18pCiBkZWYgZ2V0KHBvcnQsIG9wdGlvbnMpOgogICAgICIiIlJldHVybiBhbiBpbnN0YW5j ZSBvZiBhIFdvcmtlck1lc3NhZ2VCcm9rZXIuIiIiCiAgICAgd29ya2VyX21vZGVsID0gb3B0aW9u cy53b3JrZXJfbW9kZWwKLSAgICBpZiB3b3JrZXJfbW9kZWwgPT0gJ2lubGluZSc6CisgICAgaWYg d29ya2VyX21vZGVsID09ICdvbGQtaW5saW5lJzoKICAgICAgICAgcmV0dXJuIElubGluZUJyb2tl cihwb3J0LCBvcHRpb25zKQotICAgIGlmIHdvcmtlcl9tb2RlbCA9PSAndGhyZWFkcyc6CisgICAg aWYgd29ya2VyX21vZGVsID09ICdvbGQtdGhyZWFkcyc6CiAgICAgICAgIHJldHVybiBNdWx0aVRo cmVhZGVkQnJva2VyKHBvcnQsIG9wdGlvbnMpCiAgICAgcmFpc2UgVmFsdWVFcnJvcigndW5zdXBw b3J0ZWQgdmFsdWUgZm9yIC0td29ya2VyLW1vZGVsOiAlcycgJSB3b3JrZXJfbW9kZWwpCiAKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRf dGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0 X3Rlc3RzLnB5CmluZGV4IGViZTY0OTU0MDMwYTQxMDgxYmFjZTE5ZDZhMDc0MjYyMTMwNDJjMjMu LjQyNmQzOWQ5ZjM5MzY0NjViYzE0OWY3MTlhMTYwNTVmMTgxZmE0MjQgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5w eQpAQCAtMTQzLDcgKzE0Myw3IEBAIGNsYXNzIFJlc3VsdFN1bW1hcnkob2JqZWN0KToKICAgICAg ICAgIiIiQWRkIGEgVGVzdFJlc3VsdCBpbnRvIHRoZSBhcHByb3ByaWF0ZSBiaW4uCiAKICAgICAg ICAgQXJnczoKLSAgICAgICAgICByZXN1bHQ6IFRlc3RSZXN1bHQgZnJvbSBkdW1wX3JlbmRlcl90 cmVlX3RocmVhZC4KKyAgICAgICAgICByZXN1bHQ6IFRlc3RSZXN1bHQKICAgICAgICAgICBleHBl Y3RlZDogd2hldGhlciB0aGUgcmVzdWx0IHdhcyB3aGF0IHdlIGV4cGVjdGVkIGl0IHRvIGJlLgog ICAgICAgICAiIiIKIApAQCAtMjUyLDE5ICsyNTIsMTggQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAg ICAjIGluIER1bXBSZW5kZXJUcmVlLgogICAgIERFRkFVTFRfVEVTVF9USU1FT1VUX01TID0gNiAq IDEwMDAKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBvcHRpb25zLCBwcmludGVyLCBt ZXNzYWdlX2Jyb2tlcik6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIG9wdGlvbnMsIHBy aW50ZXIpOgogICAgICAgICAiIiJJbml0aWFsaXplIHRlc3QgcnVubmVyIGRhdGEgc3RydWN0dXJl cy4KIAogICAgICAgICBBcmdzOgogICAgICAgICAgIHBvcnQ6IGFuIG9iamVjdCBpbXBsZW1lbnRp bmcgcG9ydC1zcGVjaWZpYwogICAgICAgICAgIG9wdGlvbnM6IGEgZGljdGlvbmFyeSBvZiBjb21t YW5kIGxpbmUgb3B0aW9ucwogICAgICAgICAgIHByaW50ZXI6IGEgUHJpbnRlciBvYmplY3QgdG8g cmVjb3JkIHVwZGF0ZXMgdG8uCi0gICAgICAgICAgbWVzc2FnZV9icm9rZXI6IG9iamVjdCB1c2Vk IHRvIGNvbW11bmljYXRlIHdpdGggd29ya2Vycy4KICAgICAgICAgIiIiCiAgICAgICAgIHNlbGYu X3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYuX29wdGlvbnMgPSBvcHRpb25zCiAgICAgICAgIHNl bGYuX3ByaW50ZXIgPSBwcmludGVyCi0gICAgICAgIHNlbGYuX21lc3NhZ2VfYnJva2VyID0gbWVz c2FnZV9icm9rZXIKKyAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9rZXIgPSBOb25lCiAKICAgICAg ICAgIyBkaXNhYmxlIHdzcyBzZXJ2ZXIuIG5lZWQgdG8gaW5zdGFsbCBweU9wZW5TU0wgb24gYnVp bGRib3RzLgogICAgICAgICAjIHNlbGYuX3dlYnNvY2tldF9zZWN1cmVfc2VydmVyID0gd2Vic29j a2V0X3NlcnZlci5QeVdlYlNvY2tldCgKQEAgLTUyNSw3ICs1MjQsNyBAQCBjbGFzcyBUZXN0UnVu bmVyOgogICAgICAgICAiIiJHcm91cHMgdGVzdHMgaW50byBiYXRjaGVzLgogICAgICAgICBUaGlz IGhlbHBzIGVuc3VyZSB0aGF0IHRlc3RzIHRoYXQgZGVwZW5kIG9uIGVhY2ggb3RoZXIgKGFrYSBi YWQgdGVzdHMhKQogICAgICAgICBjb250aW51ZSB0byBydW4gdG9nZXRoZXIgYXMgbW9zdCBjcm9z cy10ZXN0cyBkZXBlbmRlbmNpZXMgdGVuZCB0bwotICAgICAgICBvY2N1ciB3aXRoaW4gdGhlIHNh bWUgZGlyZWN0b3J5LiBJZiB1c2VfcmVhbF9zaGFyZHMgaXMgZmFsc2UsIHdlCisgICAgICAgIG9j Y3VyIHdpdGhpbiB0aGUgc2FtZSBkaXJlY3RvcnkuIElmIHVzZV9yZWFsX3NoYXJkcyBpcyBGYWxz ZSwgd2UKICAgICAgICAgcHV0IGVhY2ggKG5vbi1IVFRQL3dlYnNvY2tldCkgdGVzdCBpbnRvIGl0 cyBvd24gc2hhcmQgZm9yIG1heGltdW0KICAgICAgICAgY29uY3VycmVuY3kgaW5zdGVhZCBvZiB0 cnlpbmcgdG8gZG8gYW55IHNvcnQgb2YgcmVhbCBzaGFyZGluZy4KIApAQCAtNjE3LDEyICs2MTYs MTMgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKIAogICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X3Vw ZGF0ZSgnU3RhcnRpbmcgJXMgLi4uJyAlCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGdyYW1tYXIucGx1cmFsaXplKCd3b3JrZXInLCBudW1fd29ya2VycykpCi0gICAgICAgIG1l c3NhZ2VfYnJva2VyID0gc2VsZi5fbWVzc2FnZV9icm9rZXIKKyAgICAgICAgc2VsZi5fbWVzc2Fn ZV9icm9rZXIgPSBtZXNzYWdlX2Jyb2tlci5nZXQoc2VsZi5fcG9ydCwgc2VsZi5fb3B0aW9ucykK KyAgICAgICAgYnJva2VyID0gc2VsZi5fbWVzc2FnZV9icm9rZXIKICAgICAgICAgc2VsZi5fY3Vy cmVudF9maWxlbmFtZV9xdWV1ZSA9IGZpbGVuYW1lX3F1ZXVlCiAgICAgICAgIHNlbGYuX2N1cnJl bnRfcmVzdWx0X3N1bW1hcnkgPSByZXN1bHRfc3VtbWFyeQogCiAgICAgICAgIGlmIG5vdCBzZWxm Ll9vcHRpb25zLmRyeV9ydW46Ci0gICAgICAgICAgICB0aHJlYWRzID0gbWVzc2FnZV9icm9rZXIu c3RhcnRfd29ya2VycyhzZWxmKQorICAgICAgICAgICAgdGhyZWFkcyA9IGJyb2tlci5zdGFydF93 b3JrZXJzKHNlbGYpCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICB0aHJlYWRzID0ge30KIApA QCAtNjMxLDE1ICs2MzEsMTUgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgaW50ZXJydXB0 ZWQgPSBGYWxzZQogICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5kcnlfcnVuOgogICAgICAg ICAgICAgdHJ5OgotICAgICAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLnJ1bl9tZXNzYWdlX2xv b3AoKQorICAgICAgICAgICAgICAgIGJyb2tlci5ydW5fbWVzc2FnZV9sb29wKCkKICAgICAgICAg ICAgIGV4Y2VwdCBLZXlib2FyZEludGVycnVwdDoKICAgICAgICAgICAgICAgICBfbG9nLmluZm8o IkludGVycnVwdGVkLCBleGl0aW5nIikKLSAgICAgICAgICAgICAgICBtZXNzYWdlX2Jyb2tlci5j YW5jZWxfd29ya2VycygpCisgICAgICAgICAgICAgICAgYnJva2VyLmNhbmNlbF93b3JrZXJzKCkK ICAgICAgICAgICAgICAgICBrZXlib2FyZF9pbnRlcnJ1cHRlZCA9IFRydWUKICAgICAgICAgICAg ICAgICBpbnRlcnJ1cHRlZCA9IFRydWUKICAgICAgICAgICAgIGV4Y2VwdCBUZXN0UnVuSW50ZXJy dXB0ZWRFeGNlcHRpb24sIGU6CiAgICAgICAgICAgICAgICAgX2xvZy5pbmZvKGUucmVhc29uKQot ICAgICAgICAgICAgICAgIG1lc3NhZ2VfYnJva2VyLmNhbmNlbF93b3JrZXJzKCkKKyAgICAgICAg ICAgICAgICBicm9rZXIuY2FuY2VsX3dvcmtlcnMoKQogICAgICAgICAgICAgICAgIGludGVycnVw dGVkID0gVHJ1ZQogICAgICAgICAgICAgZXhjZXB0OgogICAgICAgICAgICAgICAgICMgVW5leHBl Y3RlZCBleGNlcHRpb247IGRvbid0IHRyeSB0byBjbGVhbiB1cCB3b3JrZXJzLgpAQCAtNjQ5LDYg KzY0OSw4IEBAIGNsYXNzIFRlc3RSdW5uZXI6CiAgICAgICAgIHRocmVhZF90aW1pbmdzLCB0ZXN0 X3RpbWluZ3MsIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzID0gXAogICAgICAgICAgICAgc2VsZi5f Y29sbGVjdF90aW1pbmdfaW5mbyh0aHJlYWRzKQogCisgICAgICAgIGJyb2tlci5jbGVhbnVwKCkK KyAgICAgICAgc2VsZi5fbWVzc2FnZV9icm9rZXIgPSBOb25lCiAgICAgICAgIHJldHVybiAoaW50 ZXJydXB0ZWQsIGtleWJvYXJkX2ludGVycnVwdGVkLCB0aHJlYWRfdGltaW5ncywgdGVzdF90aW1p bmdzLAogICAgICAgICAgICAgICAgIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzKQogCkBAIC0xMDEx LDggKzEwMTMsNyBAQCBjbGFzcyBUZXN0UnVubmVyOgogICAgIGRlZiBfcHJpbnRfYWdncmVnYXRl X3Rlc3Rfc3RhdGlzdGljcyhzZWxmLCBpbmRpdmlkdWFsX3Rlc3RfdGltaW5ncyk6CiAgICAgICAg ICIiIlByaW50cyBhZ2dyZWdhdGUgc3RhdGlzdGljcyAoZS5nLiBtZWRpYW4sIG1lYW4sIGV0Yy4p IGZvciBhbGwgdGVzdHMuCiAgICAgICAgIEFyZ3M6Ci0gICAgICAgICAgaW5kaXZpZHVhbF90ZXN0 X3RpbWluZ3M6IExpc3Qgb2YgZHVtcF9yZW5kZXJfdHJlZV90aHJlYWQuVGVzdFN0YXRzCi0gICAg ICAgICAgICAgIGZvciBhbGwgdGVzdHMuCisgICAgICAgICAgaW5kaXZpZHVhbF90ZXN0X3RpbWlu Z3M6IExpc3Qgb2YgVGVzdFJlc3VsdHMgZm9yIGFsbCB0ZXN0cy4KICAgICAgICAgIiIiCiAgICAg ICAgIHRlc3RfdHlwZXMgPSBbXSAgIyBVbml0IHRlc3RzIGRvbid0IGFjdHVhbGx5IHByb2R1Y2Ug YW55IHRpbWluZ3MuCiAgICAgICAgIGlmIGluZGl2aWR1YWxfdGVzdF90aW1pbmdzOgpAQCAtMTA0 Nyw4ICsxMDQ4LDcgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByZXN1bHRfc3VtbWFyeSk6CiAgICAgICAgICIiIlByaW50cyB0aGUgcnVuIHRp bWVzIGZvciBzbG93LCB0aW1lb3V0IGFuZCBjcmFzaCB0ZXN0cy4KICAgICAgICAgQXJnczoKLSAg ICAgICAgICBpbmRpdmlkdWFsX3Rlc3RfdGltaW5nczogTGlzdCBvZiBkdW1wX3JlbmRlcl90cmVl X3RocmVhZC5UZXN0U3RhdHMKLSAgICAgICAgICAgICAgZm9yIGFsbCB0ZXN0cy4KKyAgICAgICAg ICBpbmRpdmlkdWFsX3Rlc3RfdGltaW5nczogTGlzdCBvZiBUZXN0U3RhdHMgZm9yIGFsbCB0ZXN0 cy4KICAgICAgICAgICByZXN1bHRfc3VtbWFyeTogc3VtbWFyeSBvYmplY3QgZm9yIHRlc3QgcnVu CiAgICAgICAgICIiIgogICAgICAgICAjIFJldmVyc2Utc29ydCBieSB0aGUgdGltZSBzcGVudCBp biBEdW1wUmVuZGVyVHJlZS4KQEAgLTEzMjEsMTAgKzEzMjEsMTMgQEAgZGVmIHJ1bihwb3J0LCBv cHRpb25zLCBhcmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJyLAogICAgICAgICAgIGVycm9y LgogCiAgICAgIiIiCi0gICAgX3NldF91cF9kZXJpdmVkX29wdGlvbnMocG9ydCwgb3B0aW9ucykK KyAgICB3YXJuaW5ncyA9IF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnQsIG9wdGlvbnMpCiAK ICAgICBwcmludGVyID0gcHJpbnRpbmcuUHJpbnRlcihwb3J0LCBvcHRpb25zLCByZWd1bGFyX291 dHB1dCwgYnVpbGRib3Rfb3V0cHV0LAogICAgICAgICBpbnQob3B0aW9ucy5jaGlsZF9wcm9jZXNz ZXMpLCBvcHRpb25zLmV4cGVyaW1lbnRhbF9mdWxseV9wYXJhbGxlbCkKKyAgICBmb3IgdyBpbiB3 YXJuaW5nczoKKyAgICAgICAgX2xvZy53YXJuaW5nKHcpCisKICAgICBpZiBvcHRpb25zLmhlbHBf cHJpbnRpbmc6CiAgICAgICAgIHByaW50ZXIuaGVscF9wcmludGluZygpCiAgICAgICAgIHByaW50 ZXIuY2xlYW51cCgpCkBAIC0xMzM2LDEzICsxMzM5LDExIEBAIGRlZiBydW4ocG9ydCwgb3B0aW9u cywgYXJncywgcmVndWxhcl9vdXRwdXQ9c3lzLnN0ZGVyciwKICAgICAgICAgcHJpbnRlci5jbGVh bnVwKCkKICAgICAgICAgcmV0dXJuIDAKIAotICAgIGJyb2tlciA9IG1lc3NhZ2VfYnJva2VyLmdl dChwb3J0LCBvcHRpb25zKQotCiAgICAgIyBXZSB3cmFwIGFueSBwYXJ0cyBvZiB0aGUgcnVuIHRo YXQgYXJlIHNsb3cgb3IgbGlrZWx5IHRvIHJhaXNlIGV4Y2VwdGlvbnMKICAgICAjIGluIGEgdHJ5 L2ZpbmFsbHkgdG8gZW5zdXJlIHRoYXQgd2UgY2xlYW4gdXAgdGhlIGxvZ2dpbmcgY29uZmlndXJh dGlvbi4KICAgICBudW1fdW5leHBlY3RlZF9yZXN1bHRzID0gLTEKICAgICB0cnk6Ci0gICAgICAg IHRlc3RfcnVubmVyID0gVGVzdFJ1bm5lcihwb3J0LCBvcHRpb25zLCBwcmludGVyLCBicm9rZXIp CisgICAgICAgIHRlc3RfcnVubmVyID0gVGVzdFJ1bm5lcihwb3J0LCBvcHRpb25zLCBwcmludGVy KQogICAgICAgICB0ZXN0X3J1bm5lci5fcHJpbnRfY29uZmlnKCkKIAogICAgICAgICBwcmludGVy LnByaW50X3VwZGF0ZSgiQ29sbGVjdGluZyB0ZXN0cyAuLi4iKQpAQCAtMTM3MSw3ICsxMzcyLDYg QEAgZGVmIHJ1bihwb3J0LCBvcHRpb25zLCBhcmdzLCByZWd1bGFyX291dHB1dD1zeXMuc3RkZXJy LAogICAgICAgICAgICAgX2xvZy5kZWJ1ZygiVGVzdGluZyBjb21wbGV0ZWQsIEV4aXQgc3RhdHVz OiAlZCIgJQogICAgICAgICAgICAgICAgICAgICAgICBudW1fdW5leHBlY3RlZF9yZXN1bHRzKQog ICAgIGZpbmFsbHk6Ci0gICAgICAgIGJyb2tlci5jbGVhbnVwKCkKICAgICAgICAgcHJpbnRlci5j bGVhbnVwKCkKIAogICAgIHJldHVybiBudW1fdW5leHBlY3RlZF9yZXN1bHRzCkBAIC0xMzc5LDEw ICsxMzc5LDEyIEBAIGRlZiBydW4ocG9ydCwgb3B0aW9ucywgYXJncywgcmVndWxhcl9vdXRwdXQ9 c3lzLnN0ZGVyciwKIAogZGVmIF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnRfb2JqLCBvcHRp b25zKToKICAgICAiIiJTZXRzIHRoZSBvcHRpb25zIHZhbHVlcyB0aGF0IGRlcGVuZCBvbiBvdGhl ciBvcHRpb25zIHZhbHVlcy4iIiIKKyAgICAjIFdlIHJldHVybiBhIGxpc3Qgb2Ygd2FybmluZ3Mg dG8gcHJpbnQgYWZ0ZXIgdGhlIHByaW50ZXIgaXMgaW5pdGlhbGl6ZWQuCisgICAgd2FybmluZ3Mg PSBbXQogCi0gICAgaWYgb3B0aW9ucy53b3JrZXJfbW9kZWwgPT0gJ2lubGluZSc6CisgICAgaWYg b3B0aW9ucy53b3JrZXJfbW9kZWwgPT0gJ29sZC1pbmxpbmUnOgogICAgICAgICBpZiBvcHRpb25z LmNoaWxkX3Byb2Nlc3NlcyBhbmQgaW50KG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzKSA+IDE6Ci0g ICAgICAgICAgICBfbG9nLndhcm5pbmcoIi0td29ya2VyLW1vZGVsPWlubGluZSBvdmVycmlkZXMg LS1jaGlsZC1wcm9jZXNzZXMiKQorICAgICAgICAgICAgd2FybmluZ3MuYXBwZW5kKCItLXdvcmtl ci1tb2RlbD1vbGQtaW5saW5lIG92ZXJyaWRlcyAtLWNoaWxkLXByb2Nlc3NlcyIpCiAgICAgICAg IG9wdGlvbnMuY2hpbGRfcHJvY2Vzc2VzID0gIjEiCiAgICAgaWYgbm90IG9wdGlvbnMuY2hpbGRf cHJvY2Vzc2VzOgogICAgICAgICBvcHRpb25zLmNoaWxkX3Byb2Nlc3NlcyA9IG9zLmVudmlyb24u Z2V0KCJXRUJLSVRfVEVTVF9DSElMRF9QUk9DRVNTRVMiLApAQCAtMTQxMCw2ICsxNDEyLDcgQEAg ZGVmIF9zZXRfdXBfZGVyaXZlZF9vcHRpb25zKHBvcnRfb2JqLCBvcHRpb25zKToKICAgICAgICAg ICAgIG9wdGlvbnMudGltZV9vdXRfbXMgPSBzdHIoVGVzdFJ1bm5lci5ERUZBVUxUX1RFU1RfVElN RU9VVF9NUykKIAogICAgIG9wdGlvbnMuc2xvd190aW1lX291dF9tcyA9IHN0cig1ICogaW50KG9w dGlvbnMudGltZV9vdXRfbXMpKQorICAgIHJldHVybiB3YXJuaW5ncwogCiAKIGRlZiBfZ2F0aGVy X3VuZXhwZWN0ZWRfcmVzdWx0cyhvcHRpb25zKToKQEAgLTE2MDgsOCArMTYxMSw4IEBAIGRlZiBw YXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgICAgICAgICBoZWxwPSJOdW1iZXIgb2YgRHVtcFJl bmRlclRyZWVzIHRvIHJ1biBpbiBwYXJhbGxlbC4iKSwKICAgICAgICAgIyBGSVhNRTogRGlzcGxh eSBkZWZhdWx0IG51bWJlciBvZiBjaGlsZCBwcm9jZXNzZXMgdGhhdCB3aWxsIHJ1bi4KICAgICAg ICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0td29ya2VyLW1vZGVsIiwgYWN0aW9uPSJzdG9yZSIs Ci0gICAgICAgICAgICBkZWZhdWx0PSJ0aHJlYWRzIiwgaGVscD0oImNvbnRyb2xzIHdvcmtlciBt b2RlbC4gVmFsaWQgdmFsdWVzIGFyZSAiCi0gICAgICAgICAgICAiJ2lubGluZScgYW5kICd0aHJl YWRzJyAoZGVmYXVsdCkuIikpLAorICAgICAgICAgICAgZGVmYXVsdD0ib2xkLXRocmVhZHMiLCBo ZWxwPSgiY29udHJvbHMgd29ya2VyIG1vZGVsLiBWYWxpZCB2YWx1ZXMgIgorICAgICAgICAgICAg ImFyZSAnb2xkLWlubGluZScsICdvbGQtdGhyZWFkcycuIikpLAogICAgICAgICBvcHRwYXJzZS5t YWtlX29wdGlvbigiLS1leHBlcmltZW50YWwtZnVsbHktcGFyYWxsZWwiLAogICAgICAgICAgICAg YWN0aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwKICAgICAgICAgICAgIGhlbHA9InJ1 biBhbGwgdGVzdHMgaW4gcGFyYWxsZWwiKSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkgYi9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5 CmluZGV4IGZlMzA0MDM0MDJkMjE5MGU5MWYyZmQ5MDMzZGFiZjdmMTAxY2RkODAuLmQwN2U5Mjg3 YmEzOTIzMjk1YjhiODI4NDRmMjVlY2IwNGRmYjBjNzEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191 bml0dGVzdC5weQpAQCAtNzYsNyArNzYsNyBAQCBkZWYgcGFyc2VfYXJncyhleHRyYV9hcmdzPU5v bmUsIHJlY29yZF9yZXN1bHRzPUZhbHNlLCB0ZXN0c19pbmNsdWRlZD1GYWxzZSwKICAgICBpZiBu b3QgcmVjb3JkX3Jlc3VsdHM6CiAgICAgICAgIGFyZ3MuYXBwZW5kKCctLW5vLXJlY29yZC1yZXN1 bHRzJykKICAgICBpZiBub3QgJy0tY2hpbGQtcHJvY2Vzc2VzJyBpbiBleHRyYV9hcmdzOgotICAg ICAgICBhcmdzLmV4dGVuZChbJy0td29ya2VyLW1vZGVsJywgJ2lubGluZSddKQorICAgICAgICBh cmdzLmV4dGVuZChbJy0td29ya2VyLW1vZGVsJywgJ29sZC1pbmxpbmUnXSkKICAgICBhcmdzLmV4 dGVuZChleHRyYV9hcmdzKQogICAgIGlmIG5vdCB0ZXN0c19pbmNsdWRlZDoKICAgICAgICAgIyBX ZSB1c2UgdGhlIGdsb2IgdG8gdGVzdCB0aGF0IGdsb2JiaW5nIHdvcmtzLgpAQCAtNDQyLDE0ICs0 NDIsMTAgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKE5vbmUsIHRlc3RfcG9ydC50b2xlcmFuY2VfdXNlZF9mb3JfZGlmZl9pbWFn ZSkKIAogICAgIGRlZiB0ZXN0X3dvcmtlcl9tb2RlbF9faW5saW5lKHNlbGYpOgotICAgICAgICBz ZWxmLmFzc2VydFRydWUocGFzc2luZ19ydW4oWyctLXdvcmtlci1tb2RlbCcsICdpbmxpbmUnXSkp CisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0td29ya2VyLW1vZGVsJywg J29sZC1pbmxpbmUnXSkpCiAKICAgICBkZWYgdGVzdF93b3JrZXJfbW9kZWxfX3RocmVhZHMoc2Vs Zik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0td29ya2VyLW1vZGVs JywgJ3RocmVhZHMnXSkpCi0KLSAgICBkZWYgdGVzdF93b3JrZXJfbW9kZWxfX3Byb2Nlc3Nlcyhz ZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoVmFsdWVFcnJvciwgbG9nZ2luZ19ydW4s Ci0gICAgICAgICAgICAgICAgICAgICAgICAgIFsnLS13b3JrZXItbW9kZWwnLCAncHJvY2Vzc2Vz J10pCisgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShwYXNzaW5nX3J1bihbJy0td29ya2VyLW1vZGVs JywgJ29sZC10aHJlYWRzJ10pKQogCiAgICAgZGVmIHRlc3Rfd29ya2VyX21vZGVsX191bmtub3du KHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhWYWx1ZUVycm9yLCBsb2dnaW5nX3J1 biwKQEAgLTUzNyw3ICs1MzMsNyBAQCBjbGFzcyBUZXN0UnVubmVyVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgICAgIG1vY2tfcG9ydC5maWxlbmFtZV90b191cmkgPSBsYW1iZGEgbmFtZTog bmFtZQogCiAgICAgICAgIHJ1bm5lciA9IHJ1bl93ZWJraXRfdGVzdHMuVGVzdFJ1bm5lcihwb3J0 PW1vY2tfcG9ydCwgb3B0aW9ucz1Nb2NrKCksCi0gICAgICAgICAgICBwcmludGVyPU1vY2soKSwg bWVzc2FnZV9icm9rZXI9TW9jaygpKQorICAgICAgICAgICAgcHJpbnRlcj1Nb2NrKCkpCiAgICAg ICAgIGV4cGVjdGVkX2h0bWwgPSB1IiIiPGh0bWw+CiAgIDxoZWFkPgogICAgIDx0aXRsZT5MYXlv dXQgVGVzdCBSZXN1bHRzICh0aW1lKTwvdGl0bGU+CkBAIC01NTUsNyArNTUxLDcgQEAgY2xhc3Mg VGVzdFJ1bm5lclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAjIFRlc3QgdGhhdCBf c2hhcmRfdGVzdHMgaW4gcnVuX3dlYmtpdF90ZXN0cy5UZXN0UnVubmVyIHJlYWxseQogICAgICAg ICAjIHB1dCB0aGUgaHR0cCB0ZXN0cyBmaXJzdCBpbiB0aGUgcXVldWUuCiAgICAgICAgIHJ1bm5l ciA9IFRlc3RSdW5uZXJXcmFwcGVyKHBvcnQ9TW9jaygpLCBvcHRpb25zPU1vY2soKSwKLSAgICAg ICAgICAgIHByaW50ZXI9TW9jaygpLCBtZXNzYWdlX2Jyb2tlcj1Nb2NrKCkpCisgICAgICAgICAg ICBwcmludGVyPU1vY2soKSkKIAogICAgICAgICB0ZXN0X2xpc3QgPSBbCiAgICAgICAgICAgIkxh eW91dFRlc3RzL3dlYnNvY2tldC90ZXN0cy91bmljb2RlLmh0bSIsCg==