71629 2011-11-06 12:07:34 -0800 Split chunk handling out of prepare_lists_and_print_output to make it more readable 2011-11-06 12:49:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 eric eric abarth dpranke ojan tony webkit.review.bot oldest_to_newest 496835 0 eric 2011-11-06 12:07:34 -0800 Split chunk handling out of prepare_lists_and_print_output to make it more readable 496836 1 113796 eric 2011-11-06 12:08:18 -0800 Created attachment 113796 Patch 496837 2 eric 2011-11-06 12:08:42 -0800 I've never used --run-chunks, but I'm trusting that it's unittested. 496838 3 eric 2011-11-06 12:10:17 -0800 I believe it is a feature (that at one time, and possibly still?) is used on the Chromium build bots? 496839 4 113797 eric 2011-11-06 12:10:37 -0800 Created attachment 113797 Patch 496850 5 eric 2011-11-06 12:49:52 -0800 Committed r99379: <http://trac.webkit.org/changeset/99379> 113796 2011-11-06 12:08:18 -0800 2011-11-06 12:10:33 -0800 Patch bug-71629-20111106120817.patch text/plain 12207 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTkzNzcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzYzMwMTFkYTU0MGMxOGM3Mzg4NmY0ZGZkYzk0MWQyNjgy ODgxYTQ1Li4zOGM1OTRjZTJkYjRjZWUxYjIzODQ2OWJhMzE2NjRjZTIzZmIxOWVkIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTUg QEAKIDIwMTEtMTEtMDYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAg IFNwbGl0IGNodW5rIGhhbmRsaW5nIG91dCBvZiBwcmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRw dXQgdG8gbWFrZSBpdCBtb3JlIHJlYWRhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MTYyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvbWFuYWdlci5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorCisyMDExLTExLTA2ICBFcmljIFNlaWRlbCAgPGVyaWNA d2Via2l0Lm9yZz4KKwogICAgICAgICBDbGFyaWZ5IGhvdyB0aGUgc3ltYm9sIGFuZCBydW50aW1l LWZlYXR1cmUgYmFzZWQgdGVzdCBleGNsdXNpb24gd29ya3MgYW5kIGNsZWFudXAgdGhlIGNvZGUg YSBiaXQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2 MDc4CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CmluZGV4IGNiMjU1MmNlNWVhMDY2MWI4ZGI1MmEyZDQw YjM2NDk4ZjA2Njg1MjEuLjk1YTJjMTQ3MjA4MGRmZTNlMzNkNjIyZjE1MzhmZjM1ZDc1YTAyYTcg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xs ZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv Y29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAtMzg1LDYgKzM4NSw4OCBAQCBjbGFzcyBNYW5hZ2Vy KG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl9vcHRpb25zLmxpbnRfdGVzdF9maWxlcywKICAg ICAgICAgICAgIHBvcnQudGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJpZGVzKCkpCiAKKyAgICBkZWYg X3NwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeShzZWxmLCBza2lwcGVkKToKKyAgICAgICAg aWYgbm90IHNlbGYuX29wdGlvbnMucnVuX2NodW5rIGFuZCBub3Qgc2VsZi5fb3B0aW9ucy5ydW5f cGFydDoKKyAgICAgICAgICAgIHJldHVybiBza2lwcGVkCisKKyAgICAgICAgIyBJZiB0aGUgdXNl ciBzcGVjaWZpZXMgdGhleSBqdXN0IHdhbnQgdG8gcnVuIGEgc3Vic2V0IG9mIHRoZSB0ZXN0cywK KyAgICAgICAgIyBqdXN0IGdyYWIgYSBzdWJzZXQgb2YgdGhlIG5vbi1za2lwcGVkIHRlc3RzLgor ICAgICAgICBjaHVua192YWx1ZSA9IHNlbGYuX29wdGlvbnMucnVuX2NodW5rIG9yIHNlbGYuX29w dGlvbnMucnVuX3BhcnQKKyAgICAgICAgdGVzdF9maWxlcyA9IHNlbGYuX3Rlc3RfZmlsZXNfbGlz dAorICAgICAgICB0cnk6CisgICAgICAgICAgICAoY2h1bmtfbnVtLCBjaHVua19sZW4pID0gY2h1 bmtfdmFsdWUuc3BsaXQoIjoiKQorICAgICAgICAgICAgY2h1bmtfbnVtID0gaW50KGNodW5rX251 bSkKKyAgICAgICAgICAgIGFzc2VydChjaHVua19udW0gPj0gMCkKKyAgICAgICAgICAgIHRlc3Rf c2l6ZSA9IGludChjaHVua19sZW4pCisgICAgICAgICAgICBhc3NlcnQodGVzdF9zaXplID4gMCkK KyAgICAgICAgZXhjZXB0IEFzc2VydGlvbkVycm9yOgorICAgICAgICAgICAgX2xvZy5jcml0aWNh bCgiaW52YWxpZCBjaHVuayAnJXMnIiAlIGNodW5rX3ZhbHVlKQorICAgICAgICAgICAgcmV0dXJu IE5vbmUKKworICAgICAgICAjIEdldCB0aGUgbnVtYmVyIG9mIHRlc3RzCisgICAgICAgIG51bV90 ZXN0cyA9IGxlbih0ZXN0X2ZpbGVzKQorCisgICAgICAgICMgR2V0IHRoZSBzdGFydCBvZmZzZXQg b2YgdGhlIHNsaWNlLgorICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuazoKKyAgICAg ICAgICAgIGNodW5rX2xlbiA9IHRlc3Rfc2l6ZQorICAgICAgICAgICAgIyBJbiB0aGlzIGNhc2Ug Y2h1bmtfbnVtIGNhbiBiZSByZWFsbHkgbGFyZ2UuIFdlIG5lZWQKKyAgICAgICAgICAgICMgdG8g bWFrZSB0aGUgc2xhdmUgZml0IGluIHRoZSBjdXJyZW50IG51bWJlciBvZiB0ZXN0cy4KKyAgICAg ICAgICAgIHNsaWNlX3N0YXJ0ID0gKGNodW5rX251bSAqIGNodW5rX2xlbikgJSBudW1fdGVzdHMK KyAgICAgICAgZWxzZToKKyAgICAgICAgICAgICMgVmFsaWRhdGUgdGhlIGRhdGEuCisgICAgICAg ICAgICBhc3NlcnQodGVzdF9zaXplIDw9IG51bV90ZXN0cykKKyAgICAgICAgICAgIGFzc2VydChj aHVua19udW0gPD0gdGVzdF9zaXplKQorCisgICAgICAgICAgICAjIFRvIGNvdW50IHRoZSBjaHVu a19sZW4sIGFuZCBtYWtlIHN1cmUgd2UgZG9uJ3Qgc2tpcAorICAgICAgICAgICAgIyBzb21lIHRl c3RzLCB3ZSByb3VuZCB0byB0aGUgbmV4dCB2YWx1ZSB0aGF0IGZpdHMgZXhhY3RseQorICAgICAg ICAgICAgIyBhbGwgdGhlIHBhcnRzLgorICAgICAgICAgICAgcm91bmRlZF90ZXN0cyA9IG51bV90 ZXN0cworICAgICAgICAgICAgaWYgcm91bmRlZF90ZXN0cyAlIHRlc3Rfc2l6ZSAhPSAwOgorICAg ICAgICAgICAgICAgIHJvdW5kZWRfdGVzdHMgPSAobnVtX3Rlc3RzICsgdGVzdF9zaXplIC0gKG51 bV90ZXN0cyAlIHRlc3Rfc2l6ZSkpCisKKyAgICAgICAgICAgIGNodW5rX2xlbiA9IHJvdW5kZWRf dGVzdHMgLyB0ZXN0X3NpemUKKyAgICAgICAgICAgIHNsaWNlX3N0YXJ0ID0gY2h1bmtfbGVuICog KGNodW5rX251bSAtIDEpCisgICAgICAgICAgICAjIEl0IGRvZXMgbm90IG1pbmQgaWYgd2UgZ28g b3ZlciB0ZXN0X3NpemUuCisKKyAgICAgICAgIyBHZXQgdGhlIGVuZCBvZmZzZXQgb2YgdGhlIHNs aWNlLgorICAgICAgICBzbGljZV9lbmQgPSBtaW4obnVtX3Rlc3RzLCBzbGljZV9zdGFydCArIGNo dW5rX2xlbikKKworICAgICAgICBmaWxlcyA9IHRlc3RfZmlsZXNbc2xpY2Vfc3RhcnQ6c2xpY2Vf ZW5kXQorCisgICAgICAgIHRlc3RzX3J1bl9tc2cgPSAnUnVubmluZzogJWQgdGVzdHMgKGNodW5r IHNsaWNlIFslZDolZF0gb2YgJWQpJyAlICgoc2xpY2VfZW5kIC0gc2xpY2Vfc3RhcnQpLCBzbGlj ZV9zdGFydCwgc2xpY2VfZW5kLCBudW1fdGVzdHMpCisgICAgICAgIHNlbGYuX3ByaW50ZXIucHJp bnRfZXhwZWN0ZWQodGVzdHNfcnVuX21zZykKKworICAgICAgICAjIElmIHdlIHJlYWNoZWQgdGhl IGVuZCBhbmQgd2UgZG9uJ3QgaGF2ZSBlbm91Z2ggdGVzdHMsIHdlIHJ1biBzb21lCisgICAgICAg ICMgZnJvbSB0aGUgYmVnaW5uaW5nLgorICAgICAgICBpZiBzbGljZV9lbmQgLSBzbGljZV9zdGFy dCA8IGNodW5rX2xlbjoKKyAgICAgICAgICAgIGV4dHJhID0gY2h1bmtfbGVuIC0gKHNsaWNlX2Vu ZCAtIHNsaWNlX3N0YXJ0KQorICAgICAgICAgICAgZXh0cmFfbXNnID0gKCcgICBsYXN0IGNodW5r IGlzIHBhcnRpYWwsIGFwcGVuZGluZyBbMDolZF0nICUgZXh0cmEpCisgICAgICAgICAgICBzZWxm Ll9wcmludGVyLnByaW50X2V4cGVjdGVkKGV4dHJhX21zZykKKyAgICAgICAgICAgIHRlc3RzX3J1 bl9tc2cgKz0gIlxuIiArIGV4dHJhX21zZworICAgICAgICAgICAgZmlsZXMuZXh0ZW5kKHRlc3Rf ZmlsZXNbMDpleHRyYV0pCisgICAgICAgIHRlc3RzX3J1bl9maWxlbmFtZSA9IHNlbGYuX2ZzLmpv aW4oc2VsZi5fcmVzdWx0c19kaXJlY3RvcnksICJ0ZXN0c19ydW4udHh0IikKKyAgICAgICAgc2Vs Zi5fZnMud3JpdGVfdGV4dF9maWxlKHRlc3RzX3J1bl9maWxlbmFtZSwgdGVzdHNfcnVuX21zZykK KworICAgICAgICBsZW5fc2tpcF9jaHVuayA9IGludChsZW4oZmlsZXMpICogbGVuKHNraXBwZWQp IC8gZmxvYXQobGVuKHNlbGYuX3Rlc3RfZmlsZXMpKSkKKyAgICAgICAgc2tpcF9jaHVua19saXN0 ID0gbGlzdChza2lwcGVkKVswOmxlbl9za2lwX2NodW5rXQorICAgICAgICBza2lwX2NodW5rID0g c2V0KHNraXBfY2h1bmtfbGlzdCkKKworICAgICAgICAjIEZJWE1FOiBUaGlzIGlzIGEgdG90YWwg aGFjay4KKyAgICAgICAgIyBVcGRhdGUgZXhwZWN0YXRpb25zIHNvIHRoYXQgdGhlIHN0YXRzIGFy ZSBjYWxjdWxhdGVkIGNvcnJlY3RseS4KKyAgICAgICAgIyBXZSBuZWVkIHRvIHBhc3MgYSBsaXN0 IHRoYXQgaW5jbHVkZXMgdGhlIHJpZ2h0ICMgb2Ygc2tpcHBlZCBmaWxlcworICAgICAgICAjIHRv IFBhcnNlRXhwZWN0YXRpb25zIHNvIHRoYXQgUmVzdWx0U3VtbWFyeSgpIHdpbGwgZ2V0IHRoZSBj b3JyZWN0CisgICAgICAgICMgc3RhdHMuIFNvLCB3ZSBhZGQgaW4gdGhlIHN1YnNldCBvZiBza2lw cGVkIGZpbGVzLCBhbmQgdGhlbgorICAgICAgICAjIHN1YnRyYWN0IHRoZW0gYmFjayBvdXQuCisg ICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCA9IGZpbGVzICsgc2tpcF9jaHVua19saXN0Cisg ICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZXQoc2VsZi5fdGVzdF9maWxlc19saXN0KQorCisg ICAgICAgIHNlbGYucGFyc2VfZXhwZWN0YXRpb25zKCkKKworICAgICAgICBzZWxmLl90ZXN0X2Zp bGVzID0gc2V0KGZpbGVzKQorICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QgPSBmaWxlcwor CisgICAgICAgIHJldHVybiBza2lwX2NodW5rCisKICAgICAjIEZJWE1FOiBUaGlzIG1ldGhvZCBp cyB3YXkgdG9vIGxvbmcgYW5kIG5lZWRzIHRvIGJlIGJyb2tlbiBpbnRvIHBpZWNlcy4KICAgICBk ZWYgcHJlcGFyZV9saXN0c19hbmRfcHJpbnRfb3V0cHV0KHNlbGYpOgogICAgICAgICAiIiJDcmVh dGUgYXBwcm9wcmlhdGUgc3Vic2V0cyBvZiB0ZXN0IGxpc3RzIGFuZCByZXR1cm5zIGEKQEAgLTM5 NCw4ICs0NzYsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICMgUmVtb3ZlIHNr aXBwZWQgLSBib3RoIGZpeGFibGUgYW5kIGlnbm9yZWQgLSBmaWxlcyBmcm9tIHRoZQogICAgICAg ICAjIHRvcC1sZXZlbCBsaXN0IG9mIGZpbGVzIHRvIHRlc3QuCiAgICAgICAgIG51bV9hbGxfdGVz dF9maWxlcyA9IGxlbihzZWxmLl90ZXN0X2ZpbGVzKQotICAgICAgICBzZWxmLl9wcmludGVyLnBy aW50X2V4cGVjdGVkKCJGb3VuZDogICVkIHRlc3RzIiAlCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKGxlbihzZWxmLl90ZXN0X2ZpbGVzKSkpCisgICAgICAgIHNlbGYuX3By aW50ZXIucHJpbnRfZXhwZWN0ZWQoIkZvdW5kOiAgJWQgdGVzdHMiICUgKGxlbihzZWxmLl90ZXN0 X2ZpbGVzKSkpCiAgICAgICAgIGlmIG5vdCBudW1fYWxsX3Rlc3RfZmlsZXM6CiAgICAgICAgICAg ICBfbG9nLmNyaXRpY2FsKCdObyB0ZXN0cyB0byBydW4uJykKICAgICAgICAgICAgIHJldHVybiBO b25lCkBAIC00MjEsMTAyICs1MDIsMjEgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAg ICBlbHNlOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0LnNvcnQoa2V5PWxhbWJk YSB0ZXN0OiB0ZXN0X2tleShzZWxmLl9wb3J0LCB0ZXN0KSkKIAotICAgICAgICAjIElmIHRoZSB1 c2VyIHNwZWNpZmllcyB0aGV5IGp1c3Qgd2FudCB0byBydW4gYSBzdWJzZXQgb2YgdGhlIHRlc3Rz LAotICAgICAgICAjIGp1c3QgZ3JhYiBhIHN1YnNldCBvZiB0aGUgbm9uLXNraXBwZWQgdGVzdHMu Ci0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMucnVuX2NodW5rIG9yIHNlbGYuX29wdGlvbnMucnVu X3BhcnQ6Ci0gICAgICAgICAgICBjaHVua192YWx1ZSA9IHNlbGYuX29wdGlvbnMucnVuX2NodW5r IG9yIHNlbGYuX29wdGlvbnMucnVuX3BhcnQKLSAgICAgICAgICAgIHRlc3RfZmlsZXMgPSBzZWxm Ll90ZXN0X2ZpbGVzX2xpc3QKLSAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICAoY2h1 bmtfbnVtLCBjaHVua19sZW4pID0gY2h1bmtfdmFsdWUuc3BsaXQoIjoiKQotICAgICAgICAgICAg ICAgIGNodW5rX251bSA9IGludChjaHVua19udW0pCi0gICAgICAgICAgICAgICAgYXNzZXJ0KGNo dW5rX251bSA+PSAwKQotICAgICAgICAgICAgICAgIHRlc3Rfc2l6ZSA9IGludChjaHVua19sZW4p Ci0gICAgICAgICAgICAgICAgYXNzZXJ0KHRlc3Rfc2l6ZSA+IDApCi0gICAgICAgICAgICBleGNl cHQgQXNzZXJ0aW9uRXJyb3I6Ci0gICAgICAgICAgICAgICAgX2xvZy5jcml0aWNhbCgiaW52YWxp ZCBjaHVuayAnJXMnIiAlIGNodW5rX3ZhbHVlKQotICAgICAgICAgICAgICAgIHJldHVybiBOb25l Ci0KLSAgICAgICAgICAgICMgR2V0IHRoZSBudW1iZXIgb2YgdGVzdHMKLSAgICAgICAgICAgIG51 bV90ZXN0cyA9IGxlbih0ZXN0X2ZpbGVzKQotCi0gICAgICAgICAgICAjIEdldCB0aGUgc3RhcnQg b2Zmc2V0IG9mIHRoZSBzbGljZS4KLSAgICAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMucnVuX2No dW5rOgotICAgICAgICAgICAgICAgIGNodW5rX2xlbiA9IHRlc3Rfc2l6ZQotICAgICAgICAgICAg ICAgICMgSW4gdGhpcyBjYXNlIGNodW5rX251bSBjYW4gYmUgcmVhbGx5IGxhcmdlLiBXZSBuZWVk Ci0gICAgICAgICAgICAgICAgIyB0byBtYWtlIHRoZSBzbGF2ZSBmaXQgaW4gdGhlIGN1cnJlbnQg bnVtYmVyIG9mIHRlc3RzLgotICAgICAgICAgICAgICAgIHNsaWNlX3N0YXJ0ID0gKGNodW5rX251 bSAqIGNodW5rX2xlbikgJSBudW1fdGVzdHMKLSAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAg ICAgICAgIyBWYWxpZGF0ZSB0aGUgZGF0YS4KLSAgICAgICAgICAgICAgICBhc3NlcnQodGVzdF9z aXplIDw9IG51bV90ZXN0cykKLSAgICAgICAgICAgICAgICBhc3NlcnQoY2h1bmtfbnVtIDw9IHRl c3Rfc2l6ZSkKLQotICAgICAgICAgICAgICAgICMgVG8gY291bnQgdGhlIGNodW5rX2xlbiwgYW5k IG1ha2Ugc3VyZSB3ZSBkb24ndCBza2lwCi0gICAgICAgICAgICAgICAgIyBzb21lIHRlc3RzLCB3 ZSByb3VuZCB0byB0aGUgbmV4dCB2YWx1ZSB0aGF0IGZpdHMgZXhhY3RseQotICAgICAgICAgICAg ICAgICMgYWxsIHRoZSBwYXJ0cy4KLSAgICAgICAgICAgICAgICByb3VuZGVkX3Rlc3RzID0gbnVt X3Rlc3RzCi0gICAgICAgICAgICAgICAgaWYgcm91bmRlZF90ZXN0cyAlIHRlc3Rfc2l6ZSAhPSAw OgotICAgICAgICAgICAgICAgICAgICByb3VuZGVkX3Rlc3RzID0gKG51bV90ZXN0cyArIHRlc3Rf c2l6ZSAtCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKG51bV90ZXN0cyAl IHRlc3Rfc2l6ZSkpCi0KLSAgICAgICAgICAgICAgICBjaHVua19sZW4gPSByb3VuZGVkX3Rlc3Rz IC8gdGVzdF9zaXplCi0gICAgICAgICAgICAgICAgc2xpY2Vfc3RhcnQgPSBjaHVua19sZW4gKiAo Y2h1bmtfbnVtIC0gMSkKLSAgICAgICAgICAgICAgICAjIEl0IGRvZXMgbm90IG1pbmQgaWYgd2Ug Z28gb3ZlciB0ZXN0X3NpemUuCi0KLSAgICAgICAgICAgICMgR2V0IHRoZSBlbmQgb2Zmc2V0IG9m IHRoZSBzbGljZS4KLSAgICAgICAgICAgIHNsaWNlX2VuZCA9IG1pbihudW1fdGVzdHMsIHNsaWNl X3N0YXJ0ICsgY2h1bmtfbGVuKQotCi0gICAgICAgICAgICBmaWxlcyA9IHRlc3RfZmlsZXNbc2xp Y2Vfc3RhcnQ6c2xpY2VfZW5kXQotCi0gICAgICAgICAgICB0ZXN0c19ydW5fbXNnID0gJ1J1bm5p bmc6ICVkIHRlc3RzIChjaHVuayBzbGljZSBbJWQ6JWRdIG9mICVkKScgJSAoCi0gICAgICAgICAg ICAgICAgKHNsaWNlX2VuZCAtIHNsaWNlX3N0YXJ0KSwgc2xpY2Vfc3RhcnQsIHNsaWNlX2VuZCwg bnVtX3Rlc3RzKQotICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBlY3RlZCh0ZXN0 c19ydW5fbXNnKQotCi0gICAgICAgICAgICAjIElmIHdlIHJlYWNoZWQgdGhlIGVuZCBhbmQgd2Ug ZG9uJ3QgaGF2ZSBlbm91Z2ggdGVzdHMsIHdlIHJ1biBzb21lCi0gICAgICAgICAgICAjIGZyb20g dGhlIGJlZ2lubmluZy4KLSAgICAgICAgICAgIGlmIHNsaWNlX2VuZCAtIHNsaWNlX3N0YXJ0IDwg Y2h1bmtfbGVuOgotICAgICAgICAgICAgICAgIGV4dHJhID0gY2h1bmtfbGVuIC0gKHNsaWNlX2Vu ZCAtIHNsaWNlX3N0YXJ0KQotICAgICAgICAgICAgICAgIGV4dHJhX21zZyA9ICgnICAgbGFzdCBj aHVuayBpcyBwYXJ0aWFsLCBhcHBlbmRpbmcgWzA6JWRdJyAlCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgZXh0cmEpCi0gICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBl Y3RlZChleHRyYV9tc2cpCi0gICAgICAgICAgICAgICAgdGVzdHNfcnVuX21zZyArPSAiXG4iICsg ZXh0cmFfbXNnCi0gICAgICAgICAgICAgICAgZmlsZXMuZXh0ZW5kKHRlc3RfZmlsZXNbMDpleHRy YV0pCi0gICAgICAgICAgICB0ZXN0c19ydW5fZmlsZW5hbWUgPSBzZWxmLl9mcy5qb2luKHNlbGYu X3Jlc3VsdHNfZGlyZWN0b3J5LCAidGVzdHNfcnVuLnR4dCIpCi0gICAgICAgICAgICBzZWxmLl9m cy53cml0ZV90ZXh0X2ZpbGUodGVzdHNfcnVuX2ZpbGVuYW1lLCB0ZXN0c19ydW5fbXNnKQotCi0g ICAgICAgICAgICBsZW5fc2tpcF9jaHVuayA9IGludChsZW4oZmlsZXMpICogbGVuKHNraXBwZWQp IC8KLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZsb2F0KGxlbihzZWxmLl90ZXN0 X2ZpbGVzKSkpCi0gICAgICAgICAgICBza2lwX2NodW5rX2xpc3QgPSBsaXN0KHNraXBwZWQpWzA6 bGVuX3NraXBfY2h1bmtdCi0gICAgICAgICAgICBza2lwX2NodW5rID0gc2V0KHNraXBfY2h1bmtf bGlzdCkKLQotICAgICAgICAgICAgIyBVcGRhdGUgZXhwZWN0YXRpb25zIHNvIHRoYXQgdGhlIHN0 YXRzIGFyZSBjYWxjdWxhdGVkIGNvcnJlY3RseS4KLSAgICAgICAgICAgICMgV2UgbmVlZCB0byBw YXNzIGEgbGlzdCB0aGF0IGluY2x1ZGVzIHRoZSByaWdodCAjIG9mIHNraXBwZWQgZmlsZXMKLSAg ICAgICAgICAgICMgdG8gUGFyc2VFeHBlY3RhdGlvbnMgc28gdGhhdCBSZXN1bHRTdW1tYXJ5KCkg d2lsbCBnZXQgdGhlIGNvcnJlY3QKLSAgICAgICAgICAgICMgc3RhdHMuIFNvLCB3ZSBhZGQgaW4g dGhlIHN1YnNldCBvZiBza2lwcGVkIGZpbGVzLCBhbmQgdGhlbgotICAgICAgICAgICAgIyBzdWJ0 cmFjdCB0aGVtIGJhY2sgb3V0LgotICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0g ZmlsZXMgKyBza2lwX2NodW5rX2xpc3QKLSAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBz ZXQoc2VsZi5fdGVzdF9maWxlc19saXN0KQotCi0gICAgICAgICAgICBzZWxmLnBhcnNlX2V4cGVj dGF0aW9ucygpCi0KLSAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZXQoZmlsZXMpCi0g ICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QgPSBmaWxlcwotICAgICAgICBlbHNlOgot ICAgICAgICAgICAgc2tpcF9jaHVuayA9IHNraXBwZWQKKyAgICAgICAgc2tpcHBlZCA9IHNlbGYu X3NwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeShza2lwcGVkKQogCi0gICAgICAgIHJlc3Vs dF9zdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShzZWxmLl9leHBlY3RhdGlvbnMsIHNlbGYuX3Rlc3Rf ZmlsZXMgfCBza2lwX2NodW5rKQorICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1h cnkoc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl90ZXN0X2ZpbGVzIHwgc2tpcHBlZCkKICAgICAg ICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWRfcmVzdWx0c19vZl90eXBlKHJlc3VsdF9zdW1tYXJ5LCB0 ZXN0X2V4cGVjdGF0aW9ucy5QQVNTLCAicGFzc2VzIikKICAgICAgICAgc2VsZi5fcHJpbnRfZXhw ZWN0ZWRfcmVzdWx0c19vZl90eXBlKHJlc3VsdF9zdW1tYXJ5LCB0ZXN0X2V4cGVjdGF0aW9ucy5G QUlMLCAiZmFpbHVyZXMiKQogICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZF9yZXN1bHRzX29m X3R5cGUocmVzdWx0X3N1bW1hcnksIHRlc3RfZXhwZWN0YXRpb25zLkZMQUtZLCAiZmxha3kiKQog ICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1h cnksIHRlc3RfZXhwZWN0YXRpb25zLlNLSVAsICJza2lwcGVkIikKIAogICAgICAgICBpZiBzZWxm Ll9vcHRpb25zLmZvcmNlOgotICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBlY3Rl ZCgnUnVubmluZyBhbGwgdGVzdHMsIGluY2x1ZGluZyAnCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICdza2lwcyAoLS1mb3JjZSknKQorICAgICAgICAgICAgc2VsZi5f cHJpbnRlci5wcmludF9leHBlY3RlZCgnUnVubmluZyBhbGwgdGVzdHMsIGluY2x1ZGluZyBza2lw cyAoLS1mb3JjZSknKQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgIyBOb3RlIHRoYXQgd2Ug ZG9uJ3QgYWN0dWFsbHkgcnVuIHRoZSBza2lwcGVkIHRlc3RzICh0aGV5IHdlcmUKICAgICAgICAg ICAgICMgc3VidHJhY3RlZCBvdXQgb2Ygc2VsZi5fdGVzdF9maWxlcywgYWJvdmUpLCBidXQgd2Ug c3R1YiBvdXQgdGhlCiAgICAgICAgICAgICAjIHJlc3VsdHMgaGVyZSBzbyB0aGUgc3RhdGlzdGlj cyBjYW4gcmVtYWluIGFjY3VyYXRlLgotICAgICAgICAgICAgZm9yIHRlc3QgaW4gc2tpcF9jaHVu azoKKyAgICAgICAgICAgIGZvciB0ZXN0IGluIHNraXBwZWQ6CiAgICAgICAgICAgICAgICAgcmVz dWx0ID0gdGVzdF9yZXN1bHRzLlRlc3RSZXN1bHQodGVzdCkKICAgICAgICAgICAgICAgICByZXN1 bHQudHlwZSA9IHRlc3RfZXhwZWN0YXRpb25zLlNLSVAKICAgICAgICAgICAgICAgICByZXN1bHRf c3VtbWFyeS5hZGQocmVzdWx0LCBleHBlY3RlZD1UcnVlKQpAQCAtODczLDcgKzg3Myw3IEBAIGNs YXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgUmV0dXJuOgogICAgICAgICAgIFRoZSBudW1i ZXIgb2YgdW5leHBlY3RlZCByZXN1bHRzICgwID09IHN1Y2Nlc3MpCiAgICAgICAgICIiIgotICAg ICAgICAjIGdhdGhlcl90ZXN0X2ZpbGVzKCkgbXVzdCBoYXZlIGJlZW4gY2FsbGVkIGZpcnN0IHRv IGluaXRpYWxpemUgdXMuCisgICAgICAgICMgY29sbGVjdF90ZXN0cygpIG11c3QgaGF2ZSBiZWVu IGNhbGxlZCBmaXJzdCB0byBpbml0aWFsaXplIHVzLgogICAgICAgICAjIElmIHdlIGRpZG4ndCBm aW5kIGFueSBmaWxlcyB0byB0ZXN0LCB3ZSd2ZSBlcnJvcmVkIG91dCBhbHJlYWR5IGluCiAgICAg ICAgICMgcHJlcGFyZV9saXN0c19hbmRfcHJpbnRfb3V0cHV0KCkuCiAgICAgICAgIGFzc2VydChs ZW4oc2VsZi5fdGVzdF9maWxlcykpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQppbmRleCAzMjRmOGYyNTdiMTUwODdj Y2NlYzBiNDQxZmQzOTBhMzllYWY1ZjQ3Li44NGNmNTNmYTQ3YzUyOWVkMTIwZmUzN2FmMzZjNDA3 MmRhN2M3MDU1IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKQEAgLTM4OSw2ICszODksNyBAQCBkZWYgcGFyc2Vf YXJncyhhcmdzPU5vbmUpOgogICAgICAgICAgICAgInJ1bm5pbmcgYWxsIHRlc3RzIiksCiAgICAg ICAgICMgRklYTUU6IGNvbnNpZGVyOiAtLWl0ZXJhdGlvbnMgbgogICAgICAgICAjICAgICAgTnVt YmVyIG9mIHRpbWVzIHRvIHJ1biB0aGUgc2V0IG9mIHRlc3RzIChlLmcuIEFCQ0FCQ0FCQykKKyAg ICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcmVwZWF0LWVhY2giLCB0eXBlPSJpbnQiLCBo ZWxwPSJOdW1iZXIgb2YgdGltZXMgdG8gcnVuIGVhY2ggdGVzdCAoZS5nLiBBQUFCQkJDQ0MpIiks CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLXJldHJ5LWZhaWx1cmVzIiwgYWN0aW9u PSJzdG9yZV90cnVlIiwKICAgICAgICAgICAgIGRlZmF1bHQ9VHJ1ZSwKICAgICAgICAgICAgIGhl bHA9IlJlLXRyeSBhbnkgdGVzdHMgdGhhdCBwcm9kdWNlIHVuZXhwZWN0ZWQgcmVzdWx0cyAoZGVm YXVsdCkiKSwK 113797 2011-11-06 12:10:37 -0800 2011-11-06 12:11:04 -0800 Patch bug-71629-20111106121036.patch text/plain 11303 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTkzNzcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAzYzMwMTFkYTU0MGMxOGM3Mzg4NmY0ZGZkYzk0MWQyNjgy ODgxYTQ1Li45M2M1ZTM2OTlhMmNhMjg3ODM4N2JhZmU4NDJhNjMwMGE0OWI5NGVhIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQg QEAKIDIwMTEtMTEtMDYgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAg IFNwbGl0IGNodW5rIGhhbmRsaW5nIG91dCBvZiBwcmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRw dXQgdG8gbWFrZSBpdCBtb3JlIHJlYWRhYmxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MTYyOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvbWFuYWdlci5weToKKworMjAxMS0xMS0wNiAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtp dC5vcmc+CisKICAgICAgICAgQ2xhcmlmeSBob3cgdGhlIHN5bWJvbCBhbmQgcnVudGltZS1mZWF0 dXJlIGJhc2VkIHRlc3QgZXhjbHVzaW9uIHdvcmtzIGFuZCBjbGVhbnVwIHRoZSBjb2RlIGEgYml0 CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NjA3OAog CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9s bGVycy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbWFuYWdlci5weQppbmRleCBjYjI1NTJjZTVlYTA2NjFiOGRiNTJhMmQ0MGIzNjQ5 OGYwNjY4NTIxLi45NWEyYzE0NzIwODBkZmUzZTMzZDYyMmYxNTM4ZmYzNWQ3NWEwMmE3IDEwMDY0 NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9t YW5hZ2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL21hbmFnZXIucHkKQEAgLTM4NSw2ICszODUsODggQEAgY2xhc3MgTWFuYWdlcihvYmpl Y3QpOgogICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5saW50X3Rlc3RfZmlsZXMsCiAgICAgICAg ICAgICBwb3J0LnRlc3RfZXhwZWN0YXRpb25zX292ZXJyaWRlcygpKQogCisgICAgZGVmIF9zcGxp dF9pbnRvX2NodW5rc19pZl9uZWNlc3Nhcnkoc2VsZiwgc2tpcHBlZCk6CisgICAgICAgIGlmIG5v dCBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuayBhbmQgbm90IHNlbGYuX29wdGlvbnMucnVuX3BhcnQ6 CisgICAgICAgICAgICByZXR1cm4gc2tpcHBlZAorCisgICAgICAgICMgSWYgdGhlIHVzZXIgc3Bl Y2lmaWVzIHRoZXkganVzdCB3YW50IHRvIHJ1biBhIHN1YnNldCBvZiB0aGUgdGVzdHMsCisgICAg ICAgICMganVzdCBncmFiIGEgc3Vic2V0IG9mIHRoZSBub24tc2tpcHBlZCB0ZXN0cy4KKyAgICAg ICAgY2h1bmtfdmFsdWUgPSBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuayBvciBzZWxmLl9vcHRpb25z LnJ1bl9wYXJ0CisgICAgICAgIHRlc3RfZmlsZXMgPSBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QKKyAg ICAgICAgdHJ5OgorICAgICAgICAgICAgKGNodW5rX251bSwgY2h1bmtfbGVuKSA9IGNodW5rX3Zh bHVlLnNwbGl0KCI6IikKKyAgICAgICAgICAgIGNodW5rX251bSA9IGludChjaHVua19udW0pCisg ICAgICAgICAgICBhc3NlcnQoY2h1bmtfbnVtID49IDApCisgICAgICAgICAgICB0ZXN0X3NpemUg PSBpbnQoY2h1bmtfbGVuKQorICAgICAgICAgICAgYXNzZXJ0KHRlc3Rfc2l6ZSA+IDApCisgICAg ICAgIGV4Y2VwdCBBc3NlcnRpb25FcnJvcjoKKyAgICAgICAgICAgIF9sb2cuY3JpdGljYWwoImlu dmFsaWQgY2h1bmsgJyVzJyIgJSBjaHVua192YWx1ZSkKKyAgICAgICAgICAgIHJldHVybiBOb25l CisKKyAgICAgICAgIyBHZXQgdGhlIG51bWJlciBvZiB0ZXN0cworICAgICAgICBudW1fdGVzdHMg PSBsZW4odGVzdF9maWxlcykKKworICAgICAgICAjIEdldCB0aGUgc3RhcnQgb2Zmc2V0IG9mIHRo ZSBzbGljZS4KKyAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5ydW5fY2h1bms6CisgICAgICAgICAg ICBjaHVua19sZW4gPSB0ZXN0X3NpemUKKyAgICAgICAgICAgICMgSW4gdGhpcyBjYXNlIGNodW5r X251bSBjYW4gYmUgcmVhbGx5IGxhcmdlLiBXZSBuZWVkCisgICAgICAgICAgICAjIHRvIG1ha2Ug dGhlIHNsYXZlIGZpdCBpbiB0aGUgY3VycmVudCBudW1iZXIgb2YgdGVzdHMuCisgICAgICAgICAg ICBzbGljZV9zdGFydCA9IChjaHVua19udW0gKiBjaHVua19sZW4pICUgbnVtX3Rlc3RzCisgICAg ICAgIGVsc2U6CisgICAgICAgICAgICAjIFZhbGlkYXRlIHRoZSBkYXRhLgorICAgICAgICAgICAg YXNzZXJ0KHRlc3Rfc2l6ZSA8PSBudW1fdGVzdHMpCisgICAgICAgICAgICBhc3NlcnQoY2h1bmtf bnVtIDw9IHRlc3Rfc2l6ZSkKKworICAgICAgICAgICAgIyBUbyBjb3VudCB0aGUgY2h1bmtfbGVu LCBhbmQgbWFrZSBzdXJlIHdlIGRvbid0IHNraXAKKyAgICAgICAgICAgICMgc29tZSB0ZXN0cywg d2Ugcm91bmQgdG8gdGhlIG5leHQgdmFsdWUgdGhhdCBmaXRzIGV4YWN0bHkKKyAgICAgICAgICAg ICMgYWxsIHRoZSBwYXJ0cy4KKyAgICAgICAgICAgIHJvdW5kZWRfdGVzdHMgPSBudW1fdGVzdHMK KyAgICAgICAgICAgIGlmIHJvdW5kZWRfdGVzdHMgJSB0ZXN0X3NpemUgIT0gMDoKKyAgICAgICAg ICAgICAgICByb3VuZGVkX3Rlc3RzID0gKG51bV90ZXN0cyArIHRlc3Rfc2l6ZSAtIChudW1fdGVz dHMgJSB0ZXN0X3NpemUpKQorCisgICAgICAgICAgICBjaHVua19sZW4gPSByb3VuZGVkX3Rlc3Rz IC8gdGVzdF9zaXplCisgICAgICAgICAgICBzbGljZV9zdGFydCA9IGNodW5rX2xlbiAqIChjaHVu a19udW0gLSAxKQorICAgICAgICAgICAgIyBJdCBkb2VzIG5vdCBtaW5kIGlmIHdlIGdvIG92ZXIg dGVzdF9zaXplLgorCisgICAgICAgICMgR2V0IHRoZSBlbmQgb2Zmc2V0IG9mIHRoZSBzbGljZS4K KyAgICAgICAgc2xpY2VfZW5kID0gbWluKG51bV90ZXN0cywgc2xpY2Vfc3RhcnQgKyBjaHVua19s ZW4pCisKKyAgICAgICAgZmlsZXMgPSB0ZXN0X2ZpbGVzW3NsaWNlX3N0YXJ0OnNsaWNlX2VuZF0K KworICAgICAgICB0ZXN0c19ydW5fbXNnID0gJ1J1bm5pbmc6ICVkIHRlc3RzIChjaHVuayBzbGlj ZSBbJWQ6JWRdIG9mICVkKScgJSAoKHNsaWNlX2VuZCAtIHNsaWNlX3N0YXJ0KSwgc2xpY2Vfc3Rh cnQsIHNsaWNlX2VuZCwgbnVtX3Rlc3RzKQorICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2V4 cGVjdGVkKHRlc3RzX3J1bl9tc2cpCisKKyAgICAgICAgIyBJZiB3ZSByZWFjaGVkIHRoZSBlbmQg YW5kIHdlIGRvbid0IGhhdmUgZW5vdWdoIHRlc3RzLCB3ZSBydW4gc29tZQorICAgICAgICAjIGZy b20gdGhlIGJlZ2lubmluZy4KKyAgICAgICAgaWYgc2xpY2VfZW5kIC0gc2xpY2Vfc3RhcnQgPCBj aHVua19sZW46CisgICAgICAgICAgICBleHRyYSA9IGNodW5rX2xlbiAtIChzbGljZV9lbmQgLSBz bGljZV9zdGFydCkKKyAgICAgICAgICAgIGV4dHJhX21zZyA9ICgnICAgbGFzdCBjaHVuayBpcyBw YXJ0aWFsLCBhcHBlbmRpbmcgWzA6JWRdJyAlIGV4dHJhKQorICAgICAgICAgICAgc2VsZi5fcHJp bnRlci5wcmludF9leHBlY3RlZChleHRyYV9tc2cpCisgICAgICAgICAgICB0ZXN0c19ydW5fbXNn ICs9ICJcbiIgKyBleHRyYV9tc2cKKyAgICAgICAgICAgIGZpbGVzLmV4dGVuZCh0ZXN0X2ZpbGVz WzA6ZXh0cmFdKQorICAgICAgICB0ZXN0c19ydW5fZmlsZW5hbWUgPSBzZWxmLl9mcy5qb2luKHNl bGYuX3Jlc3VsdHNfZGlyZWN0b3J5LCAidGVzdHNfcnVuLnR4dCIpCisgICAgICAgIHNlbGYuX2Zz LndyaXRlX3RleHRfZmlsZSh0ZXN0c19ydW5fZmlsZW5hbWUsIHRlc3RzX3J1bl9tc2cpCisKKyAg ICAgICAgbGVuX3NraXBfY2h1bmsgPSBpbnQobGVuKGZpbGVzKSAqIGxlbihza2lwcGVkKSAvIGZs b2F0KGxlbihzZWxmLl90ZXN0X2ZpbGVzKSkpCisgICAgICAgIHNraXBfY2h1bmtfbGlzdCA9IGxp c3Qoc2tpcHBlZClbMDpsZW5fc2tpcF9jaHVua10KKyAgICAgICAgc2tpcF9jaHVuayA9IHNldChz a2lwX2NodW5rX2xpc3QpCisKKyAgICAgICAgIyBGSVhNRTogVGhpcyBpcyBhIHRvdGFsIGhhY2su CisgICAgICAgICMgVXBkYXRlIGV4cGVjdGF0aW9ucyBzbyB0aGF0IHRoZSBzdGF0cyBhcmUgY2Fs Y3VsYXRlZCBjb3JyZWN0bHkuCisgICAgICAgICMgV2UgbmVlZCB0byBwYXNzIGEgbGlzdCB0aGF0 IGluY2x1ZGVzIHRoZSByaWdodCAjIG9mIHNraXBwZWQgZmlsZXMKKyAgICAgICAgIyB0byBQYXJz ZUV4cGVjdGF0aW9ucyBzbyB0aGF0IFJlc3VsdFN1bW1hcnkoKSB3aWxsIGdldCB0aGUgY29ycmVj dAorICAgICAgICAjIHN0YXRzLiBTbywgd2UgYWRkIGluIHRoZSBzdWJzZXQgb2Ygc2tpcHBlZCBm aWxlcywgYW5kIHRoZW4KKyAgICAgICAgIyBzdWJ0cmFjdCB0aGVtIGJhY2sgb3V0LgorICAgICAg ICBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QgPSBmaWxlcyArIHNraXBfY2h1bmtfbGlzdAorICAgICAg ICBzZWxmLl90ZXN0X2ZpbGVzID0gc2V0KHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCkKKworICAgICAg ICBzZWxmLnBhcnNlX2V4cGVjdGF0aW9ucygpCisKKyAgICAgICAgc2VsZi5fdGVzdF9maWxlcyA9 IHNldChmaWxlcykKKyAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0gZmlsZXMKKworICAg ICAgICByZXR1cm4gc2tpcF9jaHVuaworCiAgICAgIyBGSVhNRTogVGhpcyBtZXRob2QgaXMgd2F5 IHRvbyBsb25nIGFuZCBuZWVkcyB0byBiZSBicm9rZW4gaW50byBwaWVjZXMuCiAgICAgZGVmIHBy ZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1dChzZWxmKToKICAgICAgICAgIiIiQ3JlYXRlIGFw cHJvcHJpYXRlIHN1YnNldHMgb2YgdGVzdCBsaXN0cyBhbmQgcmV0dXJucyBhCkBAIC0zOTQsOCAr NDc2LDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAjIFJlbW92ZSBza2lwcGVk IC0gYm90aCBmaXhhYmxlIGFuZCBpZ25vcmVkIC0gZmlsZXMgZnJvbSB0aGUKICAgICAgICAgIyB0 b3AtbGV2ZWwgbGlzdCBvZiBmaWxlcyB0byB0ZXN0LgogICAgICAgICBudW1fYWxsX3Rlc3RfZmls ZXMgPSBsZW4oc2VsZi5fdGVzdF9maWxlcykKLSAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9l eHBlY3RlZCgiRm91bmQ6ICAlZCB0ZXN0cyIgJQotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIChsZW4oc2VsZi5fdGVzdF9maWxlcykpKQorICAgICAgICBzZWxmLl9wcmludGVy LnByaW50X2V4cGVjdGVkKCJGb3VuZDogICVkIHRlc3RzIiAlIChsZW4oc2VsZi5fdGVzdF9maWxl cykpKQogICAgICAgICBpZiBub3QgbnVtX2FsbF90ZXN0X2ZpbGVzOgogICAgICAgICAgICAgX2xv Zy5jcml0aWNhbCgnTm8gdGVzdHMgdG8gcnVuLicpCiAgICAgICAgICAgICByZXR1cm4gTm9uZQpA QCAtNDIxLDEwMiArNTAyLDIxIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgZWxz ZToKICAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdC5zb3J0KGtleT1sYW1iZGEgdGVz dDogdGVzdF9rZXkoc2VsZi5fcG9ydCwgdGVzdCkpCiAKLSAgICAgICAgIyBJZiB0aGUgdXNlciBz cGVjaWZpZXMgdGhleSBqdXN0IHdhbnQgdG8gcnVuIGEgc3Vic2V0IG9mIHRoZSB0ZXN0cywKLSAg ICAgICAgIyBqdXN0IGdyYWIgYSBzdWJzZXQgb2YgdGhlIG5vbi1za2lwcGVkIHRlc3RzLgotICAg ICAgICBpZiBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuayBvciBzZWxmLl9vcHRpb25zLnJ1bl9wYXJ0 OgotICAgICAgICAgICAgY2h1bmtfdmFsdWUgPSBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuayBvciBz ZWxmLl9vcHRpb25zLnJ1bl9wYXJ0Ci0gICAgICAgICAgICB0ZXN0X2ZpbGVzID0gc2VsZi5fdGVz dF9maWxlc19saXN0Ci0gICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgKGNodW5rX251 bSwgY2h1bmtfbGVuKSA9IGNodW5rX3ZhbHVlLnNwbGl0KCI6IikKLSAgICAgICAgICAgICAgICBj aHVua19udW0gPSBpbnQoY2h1bmtfbnVtKQotICAgICAgICAgICAgICAgIGFzc2VydChjaHVua19u dW0gPj0gMCkKLSAgICAgICAgICAgICAgICB0ZXN0X3NpemUgPSBpbnQoY2h1bmtfbGVuKQotICAg ICAgICAgICAgICAgIGFzc2VydCh0ZXN0X3NpemUgPiAwKQotICAgICAgICAgICAgZXhjZXB0IEFz c2VydGlvbkVycm9yOgotICAgICAgICAgICAgICAgIF9sb2cuY3JpdGljYWwoImludmFsaWQgY2h1 bmsgJyVzJyIgJSBjaHVua192YWx1ZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gTm9uZQotCi0g ICAgICAgICAgICAjIEdldCB0aGUgbnVtYmVyIG9mIHRlc3RzCi0gICAgICAgICAgICBudW1fdGVz dHMgPSBsZW4odGVzdF9maWxlcykKLQotICAgICAgICAgICAgIyBHZXQgdGhlIHN0YXJ0IG9mZnNl dCBvZiB0aGUgc2xpY2UuCi0gICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuazoK LSAgICAgICAgICAgICAgICBjaHVua19sZW4gPSB0ZXN0X3NpemUKLSAgICAgICAgICAgICAgICAj IEluIHRoaXMgY2FzZSBjaHVua19udW0gY2FuIGJlIHJlYWxseSBsYXJnZS4gV2UgbmVlZAotICAg ICAgICAgICAgICAgICMgdG8gbWFrZSB0aGUgc2xhdmUgZml0IGluIHRoZSBjdXJyZW50IG51bWJl ciBvZiB0ZXN0cy4KLSAgICAgICAgICAgICAgICBzbGljZV9zdGFydCA9IChjaHVua19udW0gKiBj aHVua19sZW4pICUgbnVtX3Rlc3RzCi0gICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAg ICMgVmFsaWRhdGUgdGhlIGRhdGEuCi0gICAgICAgICAgICAgICAgYXNzZXJ0KHRlc3Rfc2l6ZSA8 PSBudW1fdGVzdHMpCi0gICAgICAgICAgICAgICAgYXNzZXJ0KGNodW5rX251bSA8PSB0ZXN0X3Np emUpCi0KLSAgICAgICAgICAgICAgICAjIFRvIGNvdW50IHRoZSBjaHVua19sZW4sIGFuZCBtYWtl IHN1cmUgd2UgZG9uJ3Qgc2tpcAotICAgICAgICAgICAgICAgICMgc29tZSB0ZXN0cywgd2Ugcm91 bmQgdG8gdGhlIG5leHQgdmFsdWUgdGhhdCBmaXRzIGV4YWN0bHkKLSAgICAgICAgICAgICAgICAj IGFsbCB0aGUgcGFydHMuCi0gICAgICAgICAgICAgICAgcm91bmRlZF90ZXN0cyA9IG51bV90ZXN0 cwotICAgICAgICAgICAgICAgIGlmIHJvdW5kZWRfdGVzdHMgJSB0ZXN0X3NpemUgIT0gMDoKLSAg ICAgICAgICAgICAgICAgICAgcm91bmRlZF90ZXN0cyA9IChudW1fdGVzdHMgKyB0ZXN0X3NpemUg LQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChudW1fdGVzdHMgJSB0ZXN0 X3NpemUpKQotCi0gICAgICAgICAgICAgICAgY2h1bmtfbGVuID0gcm91bmRlZF90ZXN0cyAvIHRl c3Rfc2l6ZQotICAgICAgICAgICAgICAgIHNsaWNlX3N0YXJ0ID0gY2h1bmtfbGVuICogKGNodW5r X251bSAtIDEpCi0gICAgICAgICAgICAgICAgIyBJdCBkb2VzIG5vdCBtaW5kIGlmIHdlIGdvIG92 ZXIgdGVzdF9zaXplLgotCi0gICAgICAgICAgICAjIEdldCB0aGUgZW5kIG9mZnNldCBvZiB0aGUg c2xpY2UuCi0gICAgICAgICAgICBzbGljZV9lbmQgPSBtaW4obnVtX3Rlc3RzLCBzbGljZV9zdGFy dCArIGNodW5rX2xlbikKLQotICAgICAgICAgICAgZmlsZXMgPSB0ZXN0X2ZpbGVzW3NsaWNlX3N0 YXJ0OnNsaWNlX2VuZF0KLQotICAgICAgICAgICAgdGVzdHNfcnVuX21zZyA9ICdSdW5uaW5nOiAl ZCB0ZXN0cyAoY2h1bmsgc2xpY2UgWyVkOiVkXSBvZiAlZCknICUgKAotICAgICAgICAgICAgICAg IChzbGljZV9lbmQgLSBzbGljZV9zdGFydCksIHNsaWNlX3N0YXJ0LCBzbGljZV9lbmQsIG51bV90 ZXN0cykKLSAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQodGVzdHNfcnVu X21zZykKLQotICAgICAgICAgICAgIyBJZiB3ZSByZWFjaGVkIHRoZSBlbmQgYW5kIHdlIGRvbid0 IGhhdmUgZW5vdWdoIHRlc3RzLCB3ZSBydW4gc29tZQotICAgICAgICAgICAgIyBmcm9tIHRoZSBi ZWdpbm5pbmcuCi0gICAgICAgICAgICBpZiBzbGljZV9lbmQgLSBzbGljZV9zdGFydCA8IGNodW5r X2xlbjoKLSAgICAgICAgICAgICAgICBleHRyYSA9IGNodW5rX2xlbiAtIChzbGljZV9lbmQgLSBz bGljZV9zdGFydCkKLSAgICAgICAgICAgICAgICBleHRyYV9tc2cgPSAoJyAgIGxhc3QgY2h1bmsg aXMgcGFydGlhbCwgYXBwZW5kaW5nIFswOiVkXScgJQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGV4dHJhKQotICAgICAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQo ZXh0cmFfbXNnKQotICAgICAgICAgICAgICAgIHRlc3RzX3J1bl9tc2cgKz0gIlxuIiArIGV4dHJh X21zZwotICAgICAgICAgICAgICAgIGZpbGVzLmV4dGVuZCh0ZXN0X2ZpbGVzWzA6ZXh0cmFdKQot ICAgICAgICAgICAgdGVzdHNfcnVuX2ZpbGVuYW1lID0gc2VsZi5fZnMuam9pbihzZWxmLl9yZXN1 bHRzX2RpcmVjdG9yeSwgInRlc3RzX3J1bi50eHQiKQotICAgICAgICAgICAgc2VsZi5fZnMud3Jp dGVfdGV4dF9maWxlKHRlc3RzX3J1bl9maWxlbmFtZSwgdGVzdHNfcnVuX21zZykKLQotICAgICAg ICAgICAgbGVuX3NraXBfY2h1bmsgPSBpbnQobGVuKGZpbGVzKSAqIGxlbihza2lwcGVkKSAvCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBmbG9hdChsZW4oc2VsZi5fdGVzdF9maWxl cykpKQotICAgICAgICAgICAgc2tpcF9jaHVua19saXN0ID0gbGlzdChza2lwcGVkKVswOmxlbl9z a2lwX2NodW5rXQotICAgICAgICAgICAgc2tpcF9jaHVuayA9IHNldChza2lwX2NodW5rX2xpc3Qp Ci0KLSAgICAgICAgICAgICMgVXBkYXRlIGV4cGVjdGF0aW9ucyBzbyB0aGF0IHRoZSBzdGF0cyBh cmUgY2FsY3VsYXRlZCBjb3JyZWN0bHkuCi0gICAgICAgICAgICAjIFdlIG5lZWQgdG8gcGFzcyBh IGxpc3QgdGhhdCBpbmNsdWRlcyB0aGUgcmlnaHQgIyBvZiBza2lwcGVkIGZpbGVzCi0gICAgICAg ICAgICAjIHRvIFBhcnNlRXhwZWN0YXRpb25zIHNvIHRoYXQgUmVzdWx0U3VtbWFyeSgpIHdpbGwg Z2V0IHRoZSBjb3JyZWN0Ci0gICAgICAgICAgICAjIHN0YXRzLiBTbywgd2UgYWRkIGluIHRoZSBz dWJzZXQgb2Ygc2tpcHBlZCBmaWxlcywgYW5kIHRoZW4KLSAgICAgICAgICAgICMgc3VidHJhY3Qg dGhlbSBiYWNrIG91dC4KLSAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCA9IGZpbGVz ICsgc2tpcF9jaHVua19saXN0Ci0gICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzID0gc2V0KHNl bGYuX3Rlc3RfZmlsZXNfbGlzdCkKLQotICAgICAgICAgICAgc2VsZi5wYXJzZV9leHBlY3RhdGlv bnMoKQotCi0gICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzID0gc2V0KGZpbGVzKQotICAgICAg ICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0gZmlsZXMKLSAgICAgICAgZWxzZToKLSAgICAg ICAgICAgIHNraXBfY2h1bmsgPSBza2lwcGVkCisgICAgICAgIHNraXBwZWQgPSBzZWxmLl9zcGxp dF9pbnRvX2NodW5rc19pZl9uZWNlc3Nhcnkoc2tpcHBlZCkKIAotICAgICAgICByZXN1bHRfc3Vt bWFyeSA9IFJlc3VsdFN1bW1hcnkoc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl90ZXN0X2ZpbGVz IHwgc2tpcF9jaHVuaykKKyAgICAgICAgcmVzdWx0X3N1bW1hcnkgPSBSZXN1bHRTdW1tYXJ5KHNl bGYuX2V4cGVjdGF0aW9ucywgc2VsZi5fdGVzdF9maWxlcyB8IHNraXBwZWQpCiAgICAgICAgIHNl bGYuX3ByaW50X2V4cGVjdGVkX3Jlc3VsdHNfb2ZfdHlwZShyZXN1bHRfc3VtbWFyeSwgdGVzdF9l eHBlY3RhdGlvbnMuUEFTUywgInBhc3NlcyIpCiAgICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVk X3Jlc3VsdHNfb2ZfdHlwZShyZXN1bHRfc3VtbWFyeSwgdGVzdF9leHBlY3RhdGlvbnMuRkFJTCwg ImZhaWx1cmVzIikKICAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWRfcmVzdWx0c19vZl90eXBl KHJlc3VsdF9zdW1tYXJ5LCB0ZXN0X2V4cGVjdGF0aW9ucy5GTEFLWSwgImZsYWt5IikKICAgICAg ICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWRfcmVzdWx0c19vZl90eXBlKHJlc3VsdF9zdW1tYXJ5LCB0 ZXN0X2V4cGVjdGF0aW9ucy5TS0lQLCAic2tpcHBlZCIpCiAKICAgICAgICAgaWYgc2VsZi5fb3B0 aW9ucy5mb3JjZToKLSAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQoJ1J1 bm5pbmcgYWxsIHRlc3RzLCBpbmNsdWRpbmcgJwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnc2tpcHMgKC0tZm9yY2UpJykKKyAgICAgICAgICAgIHNlbGYuX3ByaW50 ZXIucHJpbnRfZXhwZWN0ZWQoJ1J1bm5pbmcgYWxsIHRlc3RzLCBpbmNsdWRpbmcgc2tpcHMgKC0t Zm9yY2UpJykKICAgICAgICAgZWxzZToKICAgICAgICAgICAgICMgTm90ZSB0aGF0IHdlIGRvbid0 IGFjdHVhbGx5IHJ1biB0aGUgc2tpcHBlZCB0ZXN0cyAodGhleSB3ZXJlCiAgICAgICAgICAgICAj IHN1YnRyYWN0ZWQgb3V0IG9mIHNlbGYuX3Rlc3RfZmlsZXMsIGFib3ZlKSwgYnV0IHdlIHN0dWIg b3V0IHRoZQogICAgICAgICAgICAgIyByZXN1bHRzIGhlcmUgc28gdGhlIHN0YXRpc3RpY3MgY2Fu IHJlbWFpbiBhY2N1cmF0ZS4KLSAgICAgICAgICAgIGZvciB0ZXN0IGluIHNraXBfY2h1bms6Cisg ICAgICAgICAgICBmb3IgdGVzdCBpbiBza2lwcGVkOgogICAgICAgICAgICAgICAgIHJlc3VsdCA9 IHRlc3RfcmVzdWx0cy5UZXN0UmVzdWx0KHRlc3QpCiAgICAgICAgICAgICAgICAgcmVzdWx0LnR5 cGUgPSB0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQCiAgICAgICAgICAgICAgICAgcmVzdWx0X3N1bW1h cnkuYWRkKHJlc3VsdCwgZXhwZWN0ZWQ9VHJ1ZSkKQEAgLTg3Myw3ICs4NzMsNyBAQCBjbGFzcyBN YW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIFJldHVybjoKICAgICAgICAgICBUaGUgbnVtYmVyIG9m IHVuZXhwZWN0ZWQgcmVzdWx0cyAoMCA9PSBzdWNjZXNzKQogICAgICAgICAiIiIKLSAgICAgICAg IyBnYXRoZXJfdGVzdF9maWxlcygpIG11c3QgaGF2ZSBiZWVuIGNhbGxlZCBmaXJzdCB0byBpbml0 aWFsaXplIHVzLgorICAgICAgICAjIGNvbGxlY3RfdGVzdHMoKSBtdXN0IGhhdmUgYmVlbiBjYWxs ZWQgZmlyc3QgdG8gaW5pdGlhbGl6ZSB1cy4KICAgICAgICAgIyBJZiB3ZSBkaWRuJ3QgZmluZCBh bnkgZmlsZXMgdG8gdGVzdCwgd2UndmUgZXJyb3JlZCBvdXQgYWxyZWFkeSBpbgogICAgICAgICAj IHByZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1dCgpLgogICAgICAgICBhc3NlcnQobGVuKHNl bGYuX3Rlc3RfZmlsZXMpKQo=