92694 2012-07-30 17:16:43 -0700 nrwt: move the code that identifies the chunk of tests to run into finder 2012-07-30 18:40:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92693 89267 1 dpranke dpranke abarth eric ojan rniwa tony oldest_to_newest 682550 0 dpranke 2012-07-30 17:16:43 -0700 nrwt: move the code that identifies the chunk of tests to run into finder 682557 1 155405 dpranke 2012-07-30 17:22:49 -0700 Created attachment 155405 Patch 682590 2 155412 dpranke 2012-07-30 18:14:25 -0700 Created attachment 155412 merge to r124131 682596 3 155412 rniwa 2012-07-30 18:23:59 -0700 Comment on attachment 155412 merge to r124131 View in context: https://bugs.webkit.org/attachment.cgi?id=155412&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:399 > + self._tests = set(self._test_files_list) Why do we need to set this variable? 682598 4 dpranke 2012-07-30 18:26:29 -0700 (In reply to comment #3) > (From update of attachment 155412 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155412&action=review > > > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:399 > > + self._tests = set(self._test_files_list) > > Why do we need to set this variable? the manager code needs the tests both as a set and a list (order preserved), so we have to keep them in sync. This is really confusing; a later patch cleans this up. 682606 5 dpranke 2012-07-30 18:40:44 -0700 Committed r124139: <http://trac.webkit.org/changeset/124139> 155405 2012-07-30 17:22:49 -0700 2012-07-30 18:14:22 -0700 Patch bug-92694-20120730172233.patch text/plain 11267 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTE2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzYzMTQ4ZjE2OTE5MzAwMWM3MTk4ZDIyNTY1OTU2OWJi NThjNjhlYy4uNTVhMTk1YzA0NGEzNGQxMTRkMWU5NzdiZGVlOTBlOTQxYmVjMTBmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5 IEBACiAyMDEyLTA3LTMwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG1vdmUgdGhlIGNvZGUgdGhhdCBpZGVudGlmaWVzIHRoZSBjaHVuayBvZiB0 ZXN0cyB0byBydW4gaW50byBmaW5kZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkyNjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQW5vdGhlciBwYXRjaCB0byBtYWtlIG1hbmFnZXIucHkgc21hbGxlciBh bmQgY2xlYXJlcjsgdGhpcyBwYXRjaCBtb3ZlcworICAgICAgICB0aGUgaGFuZGxpbmcgb2YgYnJl YWtpbmcgdGhlIGxpc3Qgb2YgdGVzdHMgaW50byBjaHVua3MgKC0tcnVuLXBhcnQsCisgICAgICAg IC0tcnVuLWNodW5rKSBmcm9tIG1hbmFnZXIucHkgdG8gZmluZGVyLnB5LgorCisgICAgICAgIFRo ZXJlIGFyZSBubyBmdW5jdGlvbmFsIGNoYW5nZXMgYW5kIHRoaXMgaXMgY292ZXJlZCBieSBleGlz dGluZyB0ZXN0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL2ZpbmRlci5weToKKyAgICAgICAgKEZpbmRlci5fX2luaXRfXyk6CisgICAgICAg IChGaW5kZXIuX3JlYWRfdGVzdF9maWxlcyk6CisgICAgICAgIChGaW5kZXIpOgorICAgICAgICAo RmluZGVyLnNwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeSk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAg KE1hbmFnZXIuX19pbml0X18pOgorICAgICAgICAoTWFuYWdlci5fY29sbGVjdF90ZXN0cyk6Cisg ICAgICAgIChNYW5hZ2VyLl9wYXJzZV9leHBlY3RhdGlvbnMpOgorICAgICAgICAoTWFuYWdlci5w cmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRwdXQpOgorCisyMDEyLTA3LTMwICBEaXJrIFByYW5r ZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIG5yd3Q6IHNwbGl0IHRlc3QtZmlu ZGluZyBjb2RlIG91dCBmcm9tIG1hbmFnZXIucHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNjkzCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2ZpbmRlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2ZpbmRlci5weQppbmRleCA0OTEw MDFlM2M3YWFkMTY2OTBkMzg3N2UzZTUxZmQ5MzYzNjk0NDUyLi5jYmNiNmRlMWFhNTc2N2FkMWVk YjMwMWM2MmJlOGJiNmI4OWNjMDY4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9maW5kZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvZmluZGVyLnB5CkBAIC0zNiw4ICszNiw5 IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBjbGFzcyBGaW5kZXIo b2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCk6CisgICAgZGVmIF9faW5pdF9f KHNlbGYsIHBvcnQsIG9wdGlvbnMpOgogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAorICAgICAg ICBzZWxmLl9vcHRpb25zID0gb3B0aW9ucwogICAgICAgICBzZWxmLl9maWxlc3lzdGVtID0gc2Vs Zi5fcG9ydC5ob3N0LmZpbGVzeXN0ZW0KICAgICAgICAgc2VsZi5MQVlPVVRfVEVTVFNfRElSRUNU T1JZID0gJ0xheW91dFRlc3RzJwogCkBAIC03OSwzICs4MCw2MiBAQCBjbGFzcyBGaW5kZXIob2Jq ZWN0KToKICAgICAgICAgICAgICAgICAgICAgX2xvZy5jcml0aWNhbCgnLS10ZXN0LWxpc3QgZmls ZSAiJXMiIG5vdCBmb3VuZCcgJSBmaWxlKQogICAgICAgICAgICAgICAgIHJhaXNlCiAgICAgICAg IHJldHVybiB0ZXN0cworCisgICAgZGVmIHNwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeShz ZWxmLCB0ZXN0X2ZpbGVzX2xpc3QpOgorICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy5ydW5f Y2h1bmsgYW5kIG5vdCBzZWxmLl9vcHRpb25zLnJ1bl9wYXJ0OgorICAgICAgICAgICAgcmV0dXJu IHRlc3RfZmlsZXNfbGlzdCwgc2V0KCkKKworICAgICAgICAjIElmIHRoZSB1c2VyIHNwZWNpZmll cyB0aGV5IGp1c3Qgd2FudCB0byBydW4gYSBzdWJzZXQgb2YgdGhlIHRlc3RzLAorICAgICAgICAj IGp1c3QgZ3JhYiBhIHN1YnNldCBvZiB0aGUgbm9uLXNraXBwZWQgdGVzdHMuCisgICAgICAgIGNo dW5rX3ZhbHVlID0gc2VsZi5fb3B0aW9ucy5ydW5fY2h1bmsgb3Igc2VsZi5fb3B0aW9ucy5ydW5f cGFydAorICAgICAgICB0cnk6CisgICAgICAgICAgICAoY2h1bmtfbnVtLCBjaHVua19sZW4pID0g Y2h1bmtfdmFsdWUuc3BsaXQoIjoiKQorICAgICAgICAgICAgY2h1bmtfbnVtID0gaW50KGNodW5r X251bSkKKyAgICAgICAgICAgIGFzc2VydChjaHVua19udW0gPj0gMCkKKyAgICAgICAgICAgIHRl c3Rfc2l6ZSA9IGludChjaHVua19sZW4pCisgICAgICAgICAgICBhc3NlcnQodGVzdF9zaXplID4g MCkKKyAgICAgICAgZXhjZXB0IEFzc2VydGlvbkVycm9yOgorICAgICAgICAgICAgX2xvZy5jcml0 aWNhbCgiaW52YWxpZCBjaHVuayAnJXMnIiAlIGNodW5rX3ZhbHVlKQorICAgICAgICAgICAgcmV0 dXJuIE5vbmUKKworICAgICAgICAjIEdldCB0aGUgbnVtYmVyIG9mIHRlc3RzCisgICAgICAgIG51 bV90ZXN0cyA9IGxlbih0ZXN0X2ZpbGVzX2xpc3QpCisKKyAgICAgICAgIyBHZXQgdGhlIHN0YXJ0 IG9mZnNldCBvZiB0aGUgc2xpY2UuCisgICAgICAgIGlmIHNlbGYuX29wdGlvbnMucnVuX2NodW5r OgorICAgICAgICAgICAgY2h1bmtfbGVuID0gdGVzdF9zaXplCisgICAgICAgICAgICAjIEluIHRo aXMgY2FzZSBjaHVua19udW0gY2FuIGJlIHJlYWxseSBsYXJnZS4gV2UgbmVlZAorICAgICAgICAg ICAgIyB0byBtYWtlIHRoZSBzbGF2ZSBmaXQgaW4gdGhlIGN1cnJlbnQgbnVtYmVyIG9mIHRlc3Rz LgorICAgICAgICAgICAgc2xpY2Vfc3RhcnQgPSAoY2h1bmtfbnVtICogY2h1bmtfbGVuKSAlIG51 bV90ZXN0cworICAgICAgICBlbHNlOgorICAgICAgICAgICAgIyBWYWxpZGF0ZSB0aGUgZGF0YS4K KyAgICAgICAgICAgIGFzc2VydCh0ZXN0X3NpemUgPD0gbnVtX3Rlc3RzKQorICAgICAgICAgICAg YXNzZXJ0KGNodW5rX251bSA8PSB0ZXN0X3NpemUpCisKKyAgICAgICAgICAgICMgVG8gY291bnQg dGhlIGNodW5rX2xlbiwgYW5kIG1ha2Ugc3VyZSB3ZSBkb24ndCBza2lwCisgICAgICAgICAgICAj IHNvbWUgdGVzdHMsIHdlIHJvdW5kIHRvIHRoZSBuZXh0IHZhbHVlIHRoYXQgZml0cyBleGFjdGx5 CisgICAgICAgICAgICAjIGFsbCB0aGUgcGFydHMuCisgICAgICAgICAgICByb3VuZGVkX3Rlc3Rz ID0gbnVtX3Rlc3RzCisgICAgICAgICAgICBpZiByb3VuZGVkX3Rlc3RzICUgdGVzdF9zaXplICE9 IDA6CisgICAgICAgICAgICAgICAgcm91bmRlZF90ZXN0cyA9IChudW1fdGVzdHMgKyB0ZXN0X3Np emUgLSAobnVtX3Rlc3RzICUgdGVzdF9zaXplKSkKKworICAgICAgICAgICAgY2h1bmtfbGVuID0g cm91bmRlZF90ZXN0cyAvIHRlc3Rfc2l6ZQorICAgICAgICAgICAgc2xpY2Vfc3RhcnQgPSBjaHVu a19sZW4gKiAoY2h1bmtfbnVtIC0gMSkKKyAgICAgICAgICAgICMgSXQgZG9lcyBub3QgbWluZCBp ZiB3ZSBnbyBvdmVyIHRlc3Rfc2l6ZS4KKworICAgICAgICAjIEdldCB0aGUgZW5kIG9mZnNldCBv ZiB0aGUgc2xpY2UuCisgICAgICAgIHNsaWNlX2VuZCA9IG1pbihudW1fdGVzdHMsIHNsaWNlX3N0 YXJ0ICsgY2h1bmtfbGVuKQorCisgICAgICAgIHRlc3RzX3RvX3J1biA9IHRlc3RfZmlsZXNfbGlz dFtzbGljZV9zdGFydDpzbGljZV9lbmRdCisKKyAgICAgICAgX2xvZy5kZWJ1ZygnY2h1bmsgc2xp Y2UgWyVkOiVkXSBvZiAlZCBpcyAlZCB0ZXN0cycgJSAoc2xpY2Vfc3RhcnQsIHNsaWNlX2VuZCwg bnVtX3Rlc3RzLCAoc2xpY2VfZW5kIC0gc2xpY2Vfc3RhcnQpKSkKKworICAgICAgICAjIElmIHdl IHJlYWNoZWQgdGhlIGVuZCBhbmQgd2UgZG9uJ3QgaGF2ZSBlbm91Z2ggdGVzdHMsIHdlIHJ1biBz b21lCisgICAgICAgICMgZnJvbSB0aGUgYmVnaW5uaW5nLgorICAgICAgICBpZiBzbGljZV9lbmQg LSBzbGljZV9zdGFydCA8IGNodW5rX2xlbjoKKyAgICAgICAgICAgIGV4dHJhID0gY2h1bmtfbGVu IC0gKHNsaWNlX2VuZCAtIHNsaWNlX3N0YXJ0KQorICAgICAgICAgICAgX2xvZy5kZWJ1ZygnICAg bGFzdCBjaHVuayBpcyBwYXJ0aWFsLCBhcHBlbmRpbmcgWzA6JWRdJyAlIGV4dHJhKQorICAgICAg ICAgICAgdGVzdHNfdG9fcnVuLmV4dGVuZCh0ZXN0X2ZpbGVzX2xpc3RbMDpleHRyYV0pCisKKyAg ICAgICAgbW9yZV90ZXN0c190b19za2lwID0gc2V0KHRlc3RfZmlsZXNfbGlzdCkgLSBzZXQodGVz dHNfdG9fcnVuKQorICAgICAgICByZXR1cm4gKHRlc3RzX3RvX3J1biwgbW9yZV90ZXN0c190b19z a2lwKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29u dHJvbGxlcnMvbWFuYWdlci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L2NvbnRyb2xsZXJzL21hbmFnZXIucHkKaW5kZXggZTI1NjM3NzAzYjU5NmEwMzYwYjdjMjk5NGNi ZTgwYzNkMDg4YzFiNS4uZTdkNTlkNWQ3ZGVkNTMxOTZiYWUzOTcwMTBiYTZkYWE0NTRjMjZmYiAx MDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxl cnMvbWFuYWdlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyLnB5CkBAIC0zMjksNiArMzI5LDcgQEAgY2xhc3MgTWFuYWdlcihv YmplY3QpOgogICAgICAgICBzZWxmLl9ncm91cF9zdGF0cyA9IHt9CiAgICAgICAgIHNlbGYuX3dv cmtlcl9zdGF0cyA9IHt9CiAgICAgICAgIHNlbGYuX2N1cnJlbnRfcmVzdWx0X3N1bW1hcnkgPSBO b25lCisgICAgICAgIHNlbGYuX2ZpbmRlciA9IEZpbmRlcihzZWxmLl9wb3J0LCBzZWxmLl9vcHRp b25zKQogCiAgICAgZGVmIF9jb2xsZWN0X3Rlc3RzKHNlbGYsIGFyZ3MpOgogICAgICAgICAiIiJG aW5kIGFsbCB0aGUgZmlsZXMgdG8gdGVzdC4KQEAgLTMzNyw3ICszMzgsNyBAQCBjbGFzcyBNYW5h Z2VyKG9iamVjdCk6CiAgICAgICAgICAgYXJnczogbGlzdCBvZiB0ZXN0IGFyZ3VtZW50cyBmcm9t IHRoZSBjb21tYW5kIGxpbmUKIAogICAgICAgICAiIiIKLSAgICAgICAgc2VsZi5fcGF0aHMsIHNl bGYuX3Rlc3RfZmlsZXMgPSBGaW5kZXIoc2VsZi5fcG9ydCkuZmluZF90ZXN0cyhzZWxmLl9vcHRp b25zLCBhcmdzKQorICAgICAgICBzZWxmLl9wYXRocywgc2VsZi5fdGVzdF9maWxlcyA9IHNlbGYu X2ZpbmRlci5maW5kX3Rlc3RzKHNlbGYuX29wdGlvbnMsIGFyZ3MpCiAKICAgICBkZWYgX2lzX2h0 dHBfdGVzdChzZWxmLCB0ZXN0KToKICAgICAgICAgcmV0dXJuIHNlbGYuSFRUUF9TVUJESVIgaW4g dGVzdCBvciBzZWxmLldFQlNPQ0tFVF9TVUJESVIgaW4gdGVzdApAQCAtMzU0LDcwICszNTUsNiBA QCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgZGVmIF9wYXJzZV9leHBlY3RhdGlvbnMoc2Vs Zik6CiAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RF eHBlY3RhdGlvbnMoc2VsZi5fcG9ydCwgc2VsZi5fdGVzdF9maWxlcykKIAotICAgIGRlZiBfc3Bs aXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KHNlbGYsIHNraXBwZWQpOgotICAgICAgICBpZiBu b3Qgc2VsZi5fb3B0aW9ucy5ydW5fY2h1bmsgYW5kIG5vdCBzZWxmLl9vcHRpb25zLnJ1bl9wYXJ0 OgotICAgICAgICAgICAgcmV0dXJuIHNraXBwZWQKLQotICAgICAgICAjIElmIHRoZSB1c2VyIHNw ZWNpZmllcyB0aGV5IGp1c3Qgd2FudCB0byBydW4gYSBzdWJzZXQgb2YgdGhlIHRlc3RzLAotICAg ICAgICAjIGp1c3QgZ3JhYiBhIHN1YnNldCBvZiB0aGUgbm9uLXNraXBwZWQgdGVzdHMuCi0gICAg ICAgIGNodW5rX3ZhbHVlID0gc2VsZi5fb3B0aW9ucy5ydW5fY2h1bmsgb3Igc2VsZi5fb3B0aW9u cy5ydW5fcGFydAotICAgICAgICB0ZXN0X2ZpbGVzID0gc2VsZi5fdGVzdF9maWxlc19saXN0Ci0g ICAgICAgIHRyeToKLSAgICAgICAgICAgIChjaHVua19udW0sIGNodW5rX2xlbikgPSBjaHVua192 YWx1ZS5zcGxpdCgiOiIpCi0gICAgICAgICAgICBjaHVua19udW0gPSBpbnQoY2h1bmtfbnVtKQot ICAgICAgICAgICAgYXNzZXJ0KGNodW5rX251bSA+PSAwKQotICAgICAgICAgICAgdGVzdF9zaXpl ID0gaW50KGNodW5rX2xlbikKLSAgICAgICAgICAgIGFzc2VydCh0ZXN0X3NpemUgPiAwKQotICAg ICAgICBleGNlcHQgQXNzZXJ0aW9uRXJyb3I6Ci0gICAgICAgICAgICBfbG9nLmNyaXRpY2FsKCJp bnZhbGlkIGNodW5rICclcyciICUgY2h1bmtfdmFsdWUpCi0gICAgICAgICAgICByZXR1cm4gTm9u ZQotCi0gICAgICAgICMgR2V0IHRoZSBudW1iZXIgb2YgdGVzdHMKLSAgICAgICAgbnVtX3Rlc3Rz ID0gbGVuKHRlc3RfZmlsZXMpCi0KLSAgICAgICAgIyBHZXQgdGhlIHN0YXJ0IG9mZnNldCBvZiB0 aGUgc2xpY2UuCi0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMucnVuX2NodW5rOgotICAgICAgICAg ICAgY2h1bmtfbGVuID0gdGVzdF9zaXplCi0gICAgICAgICAgICAjIEluIHRoaXMgY2FzZSBjaHVu a19udW0gY2FuIGJlIHJlYWxseSBsYXJnZS4gV2UgbmVlZAotICAgICAgICAgICAgIyB0byBtYWtl IHRoZSBzbGF2ZSBmaXQgaW4gdGhlIGN1cnJlbnQgbnVtYmVyIG9mIHRlc3RzLgotICAgICAgICAg ICAgc2xpY2Vfc3RhcnQgPSAoY2h1bmtfbnVtICogY2h1bmtfbGVuKSAlIG51bV90ZXN0cwotICAg ICAgICBlbHNlOgotICAgICAgICAgICAgIyBWYWxpZGF0ZSB0aGUgZGF0YS4KLSAgICAgICAgICAg IGFzc2VydCh0ZXN0X3NpemUgPD0gbnVtX3Rlc3RzKQotICAgICAgICAgICAgYXNzZXJ0KGNodW5r X251bSA8PSB0ZXN0X3NpemUpCi0KLSAgICAgICAgICAgICMgVG8gY291bnQgdGhlIGNodW5rX2xl biwgYW5kIG1ha2Ugc3VyZSB3ZSBkb24ndCBza2lwCi0gICAgICAgICAgICAjIHNvbWUgdGVzdHMs IHdlIHJvdW5kIHRvIHRoZSBuZXh0IHZhbHVlIHRoYXQgZml0cyBleGFjdGx5Ci0gICAgICAgICAg ICAjIGFsbCB0aGUgcGFydHMuCi0gICAgICAgICAgICByb3VuZGVkX3Rlc3RzID0gbnVtX3Rlc3Rz Ci0gICAgICAgICAgICBpZiByb3VuZGVkX3Rlc3RzICUgdGVzdF9zaXplICE9IDA6Ci0gICAgICAg ICAgICAgICAgcm91bmRlZF90ZXN0cyA9IChudW1fdGVzdHMgKyB0ZXN0X3NpemUgLSAobnVtX3Rl c3RzICUgdGVzdF9zaXplKSkKLQotICAgICAgICAgICAgY2h1bmtfbGVuID0gcm91bmRlZF90ZXN0 cyAvIHRlc3Rfc2l6ZQotICAgICAgICAgICAgc2xpY2Vfc3RhcnQgPSBjaHVua19sZW4gKiAoY2h1 bmtfbnVtIC0gMSkKLSAgICAgICAgICAgICMgSXQgZG9lcyBub3QgbWluZCBpZiB3ZSBnbyBvdmVy IHRlc3Rfc2l6ZS4KLQotICAgICAgICAjIEdldCB0aGUgZW5kIG9mZnNldCBvZiB0aGUgc2xpY2Uu Ci0gICAgICAgIHNsaWNlX2VuZCA9IG1pbihudW1fdGVzdHMsIHNsaWNlX3N0YXJ0ICsgY2h1bmtf bGVuKQotCi0gICAgICAgIGZpbGVzID0gdGVzdF9maWxlc1tzbGljZV9zdGFydDpzbGljZV9lbmRd Ci0KLSAgICAgICAgX2xvZy5kZWJ1ZygnY2h1bmsgc2xpY2UgWyVkOiVkXSBvZiAlZCBpcyAlZCB0 ZXN0cycgJSAoc2xpY2Vfc3RhcnQsIHNsaWNlX2VuZCwgbnVtX3Rlc3RzLCAoc2xpY2VfZW5kIC0g c2xpY2Vfc3RhcnQpKSkKLQotICAgICAgICAjIElmIHdlIHJlYWNoZWQgdGhlIGVuZCBhbmQgd2Ug ZG9uJ3QgaGF2ZSBlbm91Z2ggdGVzdHMsIHdlIHJ1biBzb21lCi0gICAgICAgICMgZnJvbSB0aGUg YmVnaW5uaW5nLgotICAgICAgICBpZiBzbGljZV9lbmQgLSBzbGljZV9zdGFydCA8IGNodW5rX2xl bjoKLSAgICAgICAgICAgIGV4dHJhID0gY2h1bmtfbGVuIC0gKHNsaWNlX2VuZCAtIHNsaWNlX3N0 YXJ0KQotICAgICAgICAgICAgX2xvZy5kZWJ1ZygnICAgbGFzdCBjaHVuayBpcyBwYXJ0aWFsLCBh cHBlbmRpbmcgWzA6JWRdJyAlIGV4dHJhKQotICAgICAgICAgICAgZmlsZXMuZXh0ZW5kKHRlc3Rf ZmlsZXNbMDpleHRyYV0pCi0KLSAgICAgICAgdGVzdHNfdG9fcnVuID0gc2V0KGZpbGVzKQotICAg ICAgICBtb3JlX3Rlc3RzX3RvX3NraXAgPSBzZWxmLl90ZXN0X2ZpbGVzIC0gdGVzdHNfdG9fcnVu Ci0gICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucy5hZGRfc2tpcHBlZF90ZXN0cyhtb3JlX3Rlc3Rz X3RvX3NraXApCi0gICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSB0ZXN0c190b19ydW4KLSAgICAg ICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0gZmlsZXMKLSAgICAgICAgcmV0dXJuIHNraXBwZWQu dW5pb24obW9yZV90ZXN0c190b19za2lwKQotCiAgICAgIyBGSVhNRTogVGhpcyBtZXRob2QgaXMg d2F5IHRvbyBsb25nIGFuZCBuZWVkcyB0byBiZSBicm9rZW4gaW50byBwaWVjZXMuCiAgICAgZGVm IHByZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1dChzZWxmKToKICAgICAgICAgIiIiQ3JlYXRl IGFwcHJvcHJpYXRlIHN1YnNldHMgb2YgdGVzdCBsaXN0cyBhbmQgcmV0dXJucyBhCkBAIC00Mjks MTYgKzM2NiwxNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIGZvdW5kX3Rlc3Rf ZmlsZXMgPSBzZXQoc2VsZi5fdGVzdF9maWxlcykKICAgICAgICAgbnVtX2FsbF90ZXN0X2ZpbGVz ID0gbGVuKHNlbGYuX3Rlc3RfZmlsZXMpCiAKLSAgICAgICAgc2tpcHBlZCA9IHNlbGYuX2V4cGVj dGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSh0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQ KQorICAgICAgICB0ZXN0c190b19za2lwID0gc2VsZi5fZXhwZWN0YXRpb25zLmdldF90ZXN0c193 aXRoX3Jlc3VsdF90eXBlKHRlc3RfZXhwZWN0YXRpb25zLlNLSVApCiAgICAgICAgIGlmIG5vdCBz ZWxmLl9vcHRpb25zLmh0dHA6Ci0gICAgICAgICAgICBza2lwcGVkLnVwZGF0ZShzZXQoc2VsZi5f aHR0cF90ZXN0cygpKSkKKyAgICAgICAgICAgIHRlc3RzX3RvX3NraXAudXBkYXRlKHNldChzZWxm Ll9odHRwX3Rlc3RzKCkpKQogCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuc2tpcHBlZCA9PSAn b25seSc6Ci0gICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzID0gc2VsZi5fdGVzdF9maWxlcy5p bnRlcnNlY3Rpb24oc2tpcHBlZCkKKyAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZWxm Ll90ZXN0X2ZpbGVzLmludGVyc2VjdGlvbih0ZXN0c190b19za2lwKQorICAgICAgICAgICAgdGVz dHNfdG9fc2tpcCA9IHNldCgpCiAgICAgICAgIGVsaWYgc2VsZi5fb3B0aW9ucy5za2lwcGVkID09 ICdkZWZhdWx0JzoKLSAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgLT0gc2tpcHBlZAorICAg ICAgICAgICAgc2VsZi5fdGVzdF9maWxlcyAtPSB0ZXN0c190b19za2lwCiAgICAgICAgIGVsaWYg c2VsZi5fb3B0aW9ucy5za2lwcGVkID09ICdpZ25vcmUnOgotICAgICAgICAgICAgcGFzcyAgIyBq dXN0IHRvIGJlIGNsZWFyIHRoYXQgd2UncmUgaWdub3JpbmcgdGhlIHNraXAgbGlzdC4KKyAgICAg ICAgICAgIHRlc3RzX3RvX3NraXAgPSBzZXQoKQogCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMu c2tpcF9mYWlsaW5nX3Rlc3RzOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlcyAtPSBzZWxm Ll9leHBlY3RhdGlvbnMuZ2V0X3Rlc3RzX3dpdGhfcmVzdWx0X3R5cGUodGVzdF9leHBlY3RhdGlv bnMuRkFJTCkKQEAgLTQ2Miw3ICs0MDAsOSBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAg ICAgIGVsc2U6CiAgICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzX2xpc3Quc29ydChrZXk9bGFt YmRhIHRlc3Q6IHRlc3Rfa2V5KHNlbGYuX3BvcnQsIHRlc3QpKQogCi0gICAgICAgIGFsbF90ZXN0 c190b19za2lwID0gc2VsZi5fc3BsaXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KHNraXBwZWQp CisgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdCwgdGVzdHNfaW5fb3RoZXJfY2h1bmtzID0g c2VsZi5fZmluZGVyLnNwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeShzZWxmLl90ZXN0X2Zp bGVzX2xpc3QpCisgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9ucy5hZGRfc2tpcHBlZF90ZXN0cyh0 ZXN0c19pbl9vdGhlcl9jaHVua3MpCisgICAgICAgIHNlbGYuX3Rlc3RzID0gc2V0KHNlbGYuX3Rl c3RfZmlsZXNfbGlzdCkKIAogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoOgog ICAgICAgICAgICAgbGlzdF93aXRoX3JlcGV0aXRpb25zID0gW10KQEAgLTQ3NCw3ICs0MTQsNyBA QCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzX2xp c3QgPSBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QgKiBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMKIAog ICAgICAgICBpdGVyYXRpb25zID0gc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCAqIHNlbGYuX29w dGlvbnMuaXRlcmF0aW9ucwotICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnko c2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl90ZXN0X2ZpbGVzLCBpdGVyYXRpb25zLCBhbGxfdGVz dHNfdG9fc2tpcCkKKyAgICAgICAgcmVzdWx0X3N1bW1hcnkgPSBSZXN1bHRTdW1tYXJ5KHNlbGYu X2V4cGVjdGF0aW9ucywgc2VsZi5fdGVzdF9maWxlcywgaXRlcmF0aW9ucywgdGVzdHNfdG9fc2tp cC51bmlvbih0ZXN0c19pbl9vdGhlcl9jaHVua3MpKQogCiAgICAgICAgIHNlbGYuX3ByaW50ZXIu cHJpbnRfZm91bmQobnVtX2FsbF90ZXN0X2ZpbGVzLCBsZW4oc2VsZi5fdGVzdF9maWxlcyksIHNl bGYuX29wdGlvbnMucmVwZWF0X2VhY2gsIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucykKICAgICAg ICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBlY3RlZChyZXN1bHRfc3VtbWFyeSwgc2VsZi5fZXhw ZWN0YXRpb25zLmdldF90ZXN0c193aXRoX3Jlc3VsdF90eXBlKQo= 155412 2012-07-30 18:14:25 -0700 2012-07-30 18:23:58 -0700 merge to r124131 bug-92694-20120730181409.patch text/plain 11091 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTBlN2Q4M2FmODlkOWJmNmEyNGRlNTI4ZDBhMDIxMGQ2 YmQ5NWIxNi4uY2NhM2EwMGI3YTI0YWMyMTBiMzI2Yzg3NjMxMTZkMmQzMjI2MjRhOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5 IEBACiAyMDEyLTA3LTMwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG1vdmUgdGhlIGNvZGUgdGhhdCBpZGVudGlmaWVzIHRoZSBjaHVuayBvZiB0 ZXN0cyB0byBydW4gaW50byBmaW5kZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTkyNjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQW5vdGhlciBwYXRjaCB0byBtYWtlIG1hbmFnZXIucHkgc21hbGxlciBh bmQgY2xlYXJlcjsgdGhpcyBwYXRjaCBtb3ZlcworICAgICAgICB0aGUgaGFuZGxpbmcgb2YgYnJl YWtpbmcgdGhlIGxpc3Qgb2YgdGVzdHMgaW50byBjaHVua3MgKC0tcnVuLXBhcnQsCisgICAgICAg IC0tcnVuLWNodW5rKSBmcm9tIG1hbmFnZXIucHkgdG8gZmluZGVyLnB5LgorCisgICAgICAgIFRo ZXJlIGFyZSBubyBmdW5jdGlvbmFsIGNoYW5nZXMgYW5kIHRoaXMgaXMgY292ZXJlZCBieSBleGlz dGluZyB0ZXN0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2Nv bnRyb2xsZXJzL2ZpbmRlci5weToKKyAgICAgICAgKEZpbmRlci5fX2luaXRfXyk6CisgICAgICAg IChGaW5kZXIuX3JlYWRfdGVzdF9maWxlcyk6CisgICAgICAgIChGaW5kZXIpOgorICAgICAgICAo RmluZGVyLnNwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeSk6CisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAgICAg KE1hbmFnZXIuX19pbml0X18pOgorICAgICAgICAoTWFuYWdlci5fY29sbGVjdF90ZXN0cyk6Cisg ICAgICAgIChNYW5hZ2VyLl9wYXJzZV9leHBlY3RhdGlvbnMpOgorICAgICAgICAoTWFuYWdlci5w cmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRwdXQpOgorCisyMDEyLTA3LTMwICBEaXJrIFByYW5r ZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIG5yd3Q6IHNwbGl0IHRlc3QtZmlu ZGluZyBjb2RlIG91dCBmcm9tIG1hbmFnZXIucHkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNjkzCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2ZpbmRlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL2ZpbmRlci5weQppbmRleCAwMjEw MDBhZWQ5ZTc1NjM5MjYyMzFiNWYxMzNmMjY5YmNlMDg0YzM1Li4xN2I5ZjAwMDBjZDI2ZDViOWY5 ZDAxNzgxZDZiZGYzZmQ0NmE2YTZjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9maW5kZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvZmluZGVyLnB5CkBAIC0zNyw4ICszNyw5 IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKIAogCiBjbGFzcyBMYXlvdXRU ZXN0RmluZGVyKG9iamVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQpOgorICAgIGRl ZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBvcHRpb25zKToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBv cnQKKyAgICAgICAgc2VsZi5fb3B0aW9ucyA9IG9wdGlvbnMKICAgICAgICAgc2VsZi5fZmlsZXN5 c3RlbSA9IHNlbGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtCiAgICAgICAgIHNlbGYuTEFZT1VUX1RF U1RTX0RJUkVDVE9SWSA9ICdMYXlvdXRUZXN0cycKIApAQCAtOTIsMyArOTMsNjIgQEAgY2xhc3Mg TGF5b3V0VGVzdEZpbmRlcihvYmplY3QpOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKICAgICAg ICAgZWxzZToKICAgICAgICAgICAgIHJldHVybiBsaW5lCisKKyAgICBkZWYgc3BsaXRfaW50b19j aHVua3NfaWZfbmVjZXNzYXJ5KHNlbGYsIHRlc3RfZmlsZXNfbGlzdCk6CisgICAgICAgIGlmIG5v dCBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuayBhbmQgbm90IHNlbGYuX29wdGlvbnMucnVuX3BhcnQ6 CisgICAgICAgICAgICByZXR1cm4gdGVzdF9maWxlc19saXN0LCBzZXQoKQorCisgICAgICAgICMg SWYgdGhlIHVzZXIgc3BlY2lmaWVzIHRoZXkganVzdCB3YW50IHRvIHJ1biBhIHN1YnNldCBvZiB0 aGUgdGVzdHMsCisgICAgICAgICMganVzdCBncmFiIGEgc3Vic2V0IG9mIHRoZSBub24tc2tpcHBl ZCB0ZXN0cy4KKyAgICAgICAgY2h1bmtfdmFsdWUgPSBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuayBv ciBzZWxmLl9vcHRpb25zLnJ1bl9wYXJ0CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIChjaHVu a19udW0sIGNodW5rX2xlbikgPSBjaHVua192YWx1ZS5zcGxpdCgiOiIpCisgICAgICAgICAgICBj aHVua19udW0gPSBpbnQoY2h1bmtfbnVtKQorICAgICAgICAgICAgYXNzZXJ0KGNodW5rX251bSA+ PSAwKQorICAgICAgICAgICAgdGVzdF9zaXplID0gaW50KGNodW5rX2xlbikKKyAgICAgICAgICAg IGFzc2VydCh0ZXN0X3NpemUgPiAwKQorICAgICAgICBleGNlcHQgQXNzZXJ0aW9uRXJyb3I6Cisg ICAgICAgICAgICBfbG9nLmNyaXRpY2FsKCJpbnZhbGlkIGNodW5rICclcyciICUgY2h1bmtfdmFs dWUpCisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisgICAgICAgICMgR2V0IHRoZSBudW1iZXIg b2YgdGVzdHMKKyAgICAgICAgbnVtX3Rlc3RzID0gbGVuKHRlc3RfZmlsZXNfbGlzdCkKKworICAg ICAgICAjIEdldCB0aGUgc3RhcnQgb2Zmc2V0IG9mIHRoZSBzbGljZS4KKyAgICAgICAgaWYgc2Vs Zi5fb3B0aW9ucy5ydW5fY2h1bms6CisgICAgICAgICAgICBjaHVua19sZW4gPSB0ZXN0X3NpemUK KyAgICAgICAgICAgICMgSW4gdGhpcyBjYXNlIGNodW5rX251bSBjYW4gYmUgcmVhbGx5IGxhcmdl LiBXZSBuZWVkCisgICAgICAgICAgICAjIHRvIG1ha2UgdGhlIHNsYXZlIGZpdCBpbiB0aGUgY3Vy cmVudCBudW1iZXIgb2YgdGVzdHMuCisgICAgICAgICAgICBzbGljZV9zdGFydCA9IChjaHVua19u dW0gKiBjaHVua19sZW4pICUgbnVtX3Rlc3RzCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICAj IFZhbGlkYXRlIHRoZSBkYXRhLgorICAgICAgICAgICAgYXNzZXJ0KHRlc3Rfc2l6ZSA8PSBudW1f dGVzdHMpCisgICAgICAgICAgICBhc3NlcnQoY2h1bmtfbnVtIDw9IHRlc3Rfc2l6ZSkKKworICAg ICAgICAgICAgIyBUbyBjb3VudCB0aGUgY2h1bmtfbGVuLCBhbmQgbWFrZSBzdXJlIHdlIGRvbid0 IHNraXAKKyAgICAgICAgICAgICMgc29tZSB0ZXN0cywgd2Ugcm91bmQgdG8gdGhlIG5leHQgdmFs dWUgdGhhdCBmaXRzIGV4YWN0bHkKKyAgICAgICAgICAgICMgYWxsIHRoZSBwYXJ0cy4KKyAgICAg ICAgICAgIHJvdW5kZWRfdGVzdHMgPSBudW1fdGVzdHMKKyAgICAgICAgICAgIGlmIHJvdW5kZWRf dGVzdHMgJSB0ZXN0X3NpemUgIT0gMDoKKyAgICAgICAgICAgICAgICByb3VuZGVkX3Rlc3RzID0g KG51bV90ZXN0cyArIHRlc3Rfc2l6ZSAtIChudW1fdGVzdHMgJSB0ZXN0X3NpemUpKQorCisgICAg ICAgICAgICBjaHVua19sZW4gPSByb3VuZGVkX3Rlc3RzIC8gdGVzdF9zaXplCisgICAgICAgICAg ICBzbGljZV9zdGFydCA9IGNodW5rX2xlbiAqIChjaHVua19udW0gLSAxKQorICAgICAgICAgICAg IyBJdCBkb2VzIG5vdCBtaW5kIGlmIHdlIGdvIG92ZXIgdGVzdF9zaXplLgorCisgICAgICAgICMg R2V0IHRoZSBlbmQgb2Zmc2V0IG9mIHRoZSBzbGljZS4KKyAgICAgICAgc2xpY2VfZW5kID0gbWlu KG51bV90ZXN0cywgc2xpY2Vfc3RhcnQgKyBjaHVua19sZW4pCisKKyAgICAgICAgdGVzdHNfdG9f cnVuID0gdGVzdF9maWxlc19saXN0W3NsaWNlX3N0YXJ0OnNsaWNlX2VuZF0KKworICAgICAgICBf bG9nLmRlYnVnKCdjaHVuayBzbGljZSBbJWQ6JWRdIG9mICVkIGlzICVkIHRlc3RzJyAlIChzbGlj ZV9zdGFydCwgc2xpY2VfZW5kLCBudW1fdGVzdHMsIChzbGljZV9lbmQgLSBzbGljZV9zdGFydCkp KQorCisgICAgICAgICMgSWYgd2UgcmVhY2hlZCB0aGUgZW5kIGFuZCB3ZSBkb24ndCBoYXZlIGVu b3VnaCB0ZXN0cywgd2UgcnVuIHNvbWUKKyAgICAgICAgIyBmcm9tIHRoZSBiZWdpbm5pbmcuCisg ICAgICAgIGlmIHNsaWNlX2VuZCAtIHNsaWNlX3N0YXJ0IDwgY2h1bmtfbGVuOgorICAgICAgICAg ICAgZXh0cmEgPSBjaHVua19sZW4gLSAoc2xpY2VfZW5kIC0gc2xpY2Vfc3RhcnQpCisgICAgICAg ICAgICBfbG9nLmRlYnVnKCcgICBsYXN0IGNodW5rIGlzIHBhcnRpYWwsIGFwcGVuZGluZyBbMDol ZF0nICUgZXh0cmEpCisgICAgICAgICAgICB0ZXN0c190b19ydW4uZXh0ZW5kKHRlc3RfZmlsZXNf bGlzdFswOmV4dHJhXSkKKworICAgICAgICBtb3JlX3Rlc3RzX3RvX3NraXAgPSBzZXQodGVzdF9m aWxlc19saXN0KSAtIHNldCh0ZXN0c190b19ydW4pCisgICAgICAgIHJldHVybiAodGVzdHNfdG9f cnVuLCBtb3JlX3Rlc3RzX3RvX3NraXApCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQppbmRleCA2ZWU3NjQx NjFjNTg4YzA3ZGU2MzlmMjg0YzU1NmU3NzY5MTU0MjQ3Li44MjA0NWY0NmVlYTFlYTk1MzU4MTdl NTQ3YmM5OGRjOGU4MDhjMjc3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKQEAgLTMyOSw5ICszMjks MTAgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBzZWxmLl9ncm91cF9zdGF0cyA9 IHt9CiAgICAgICAgIHNlbGYuX3dvcmtlcl9zdGF0cyA9IHt9CiAgICAgICAgIHNlbGYuX2N1cnJl bnRfcmVzdWx0X3N1bW1hcnkgPSBOb25lCisgICAgICAgIHNlbGYuX2ZpbmRlciA9IExheW91dFRl c3RGaW5kZXIoc2VsZi5fcG9ydCwgc2VsZi5fb3B0aW9ucykKIAogICAgIGRlZiBfY29sbGVjdF90 ZXN0cyhzZWxmLCBhcmdzKToKLSAgICAgICAgc2VsZi5fcGF0aHMsIHNlbGYuX3Rlc3RfZmlsZXMg PSBMYXlvdXRUZXN0RmluZGVyKHNlbGYuX3BvcnQpLmZpbmRfdGVzdHMoc2VsZi5fb3B0aW9ucywg YXJncykKKyAgICAgICAgc2VsZi5fcGF0aHMsIHNlbGYuX3Rlc3RfZmlsZXMgPSBzZWxmLl9maW5k ZXIuZmluZF90ZXN0cyhzZWxmLl9vcHRpb25zLCBhcmdzKQogCiAgICAgZGVmIF9pc19odHRwX3Rl c3Qoc2VsZiwgdGVzdCk6CiAgICAgICAgIHJldHVybiBzZWxmLkhUVFBfU1VCRElSIGluIHRlc3Qg b3Igc2VsZi5XRUJTT0NLRVRfU1VCRElSIGluIHRlc3QKQEAgLTM0OCw3MCArMzQ5LDYgQEAgY2xh c3MgTWFuYWdlcihvYmplY3QpOgogICAgIGRlZiBfcGFyc2VfZXhwZWN0YXRpb25zKHNlbGYpOgog ICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0 YXRpb25zKHNlbGYuX3BvcnQsIHNlbGYuX3Rlc3RfZmlsZXMpCiAKLSAgICBkZWYgX3NwbGl0X2lu dG9fY2h1bmtzX2lmX25lY2Vzc2FyeShzZWxmLCBza2lwcGVkKToKLSAgICAgICAgaWYgbm90IHNl bGYuX29wdGlvbnMucnVuX2NodW5rIGFuZCBub3Qgc2VsZi5fb3B0aW9ucy5ydW5fcGFydDoKLSAg ICAgICAgICAgIHJldHVybiBza2lwcGVkCi0KLSAgICAgICAgIyBJZiB0aGUgdXNlciBzcGVjaWZp ZXMgdGhleSBqdXN0IHdhbnQgdG8gcnVuIGEgc3Vic2V0IG9mIHRoZSB0ZXN0cywKLSAgICAgICAg IyBqdXN0IGdyYWIgYSBzdWJzZXQgb2YgdGhlIG5vbi1za2lwcGVkIHRlc3RzLgotICAgICAgICBj aHVua192YWx1ZSA9IHNlbGYuX29wdGlvbnMucnVuX2NodW5rIG9yIHNlbGYuX29wdGlvbnMucnVu X3BhcnQKLSAgICAgICAgdGVzdF9maWxlcyA9IHNlbGYuX3Rlc3RfZmlsZXNfbGlzdAotICAgICAg ICB0cnk6Ci0gICAgICAgICAgICAoY2h1bmtfbnVtLCBjaHVua19sZW4pID0gY2h1bmtfdmFsdWUu c3BsaXQoIjoiKQotICAgICAgICAgICAgY2h1bmtfbnVtID0gaW50KGNodW5rX251bSkKLSAgICAg ICAgICAgIGFzc2VydChjaHVua19udW0gPj0gMCkKLSAgICAgICAgICAgIHRlc3Rfc2l6ZSA9IGlu dChjaHVua19sZW4pCi0gICAgICAgICAgICBhc3NlcnQodGVzdF9zaXplID4gMCkKLSAgICAgICAg ZXhjZXB0IEFzc2VydGlvbkVycm9yOgotICAgICAgICAgICAgX2xvZy5jcml0aWNhbCgiaW52YWxp ZCBjaHVuayAnJXMnIiAlIGNodW5rX3ZhbHVlKQotICAgICAgICAgICAgcmV0dXJuIE5vbmUKLQot ICAgICAgICAjIEdldCB0aGUgbnVtYmVyIG9mIHRlc3RzCi0gICAgICAgIG51bV90ZXN0cyA9IGxl bih0ZXN0X2ZpbGVzKQotCi0gICAgICAgICMgR2V0IHRoZSBzdGFydCBvZmZzZXQgb2YgdGhlIHNs aWNlLgotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJ1bl9jaHVuazoKLSAgICAgICAgICAgIGNo dW5rX2xlbiA9IHRlc3Rfc2l6ZQotICAgICAgICAgICAgIyBJbiB0aGlzIGNhc2UgY2h1bmtfbnVt IGNhbiBiZSByZWFsbHkgbGFyZ2UuIFdlIG5lZWQKLSAgICAgICAgICAgICMgdG8gbWFrZSB0aGUg c2xhdmUgZml0IGluIHRoZSBjdXJyZW50IG51bWJlciBvZiB0ZXN0cy4KLSAgICAgICAgICAgIHNs aWNlX3N0YXJ0ID0gKGNodW5rX251bSAqIGNodW5rX2xlbikgJSBudW1fdGVzdHMKLSAgICAgICAg ZWxzZToKLSAgICAgICAgICAgICMgVmFsaWRhdGUgdGhlIGRhdGEuCi0gICAgICAgICAgICBhc3Nl cnQodGVzdF9zaXplIDw9IG51bV90ZXN0cykKLSAgICAgICAgICAgIGFzc2VydChjaHVua19udW0g PD0gdGVzdF9zaXplKQotCi0gICAgICAgICAgICAjIFRvIGNvdW50IHRoZSBjaHVua19sZW4sIGFu ZCBtYWtlIHN1cmUgd2UgZG9uJ3Qgc2tpcAotICAgICAgICAgICAgIyBzb21lIHRlc3RzLCB3ZSBy b3VuZCB0byB0aGUgbmV4dCB2YWx1ZSB0aGF0IGZpdHMgZXhhY3RseQotICAgICAgICAgICAgIyBh bGwgdGhlIHBhcnRzLgotICAgICAgICAgICAgcm91bmRlZF90ZXN0cyA9IG51bV90ZXN0cwotICAg ICAgICAgICAgaWYgcm91bmRlZF90ZXN0cyAlIHRlc3Rfc2l6ZSAhPSAwOgotICAgICAgICAgICAg ICAgIHJvdW5kZWRfdGVzdHMgPSAobnVtX3Rlc3RzICsgdGVzdF9zaXplIC0gKG51bV90ZXN0cyAl IHRlc3Rfc2l6ZSkpCi0KLSAgICAgICAgICAgIGNodW5rX2xlbiA9IHJvdW5kZWRfdGVzdHMgLyB0 ZXN0X3NpemUKLSAgICAgICAgICAgIHNsaWNlX3N0YXJ0ID0gY2h1bmtfbGVuICogKGNodW5rX251 bSAtIDEpCi0gICAgICAgICAgICAjIEl0IGRvZXMgbm90IG1pbmQgaWYgd2UgZ28gb3ZlciB0ZXN0 X3NpemUuCi0KLSAgICAgICAgIyBHZXQgdGhlIGVuZCBvZmZzZXQgb2YgdGhlIHNsaWNlLgotICAg ICAgICBzbGljZV9lbmQgPSBtaW4obnVtX3Rlc3RzLCBzbGljZV9zdGFydCArIGNodW5rX2xlbikK LQotICAgICAgICBmaWxlcyA9IHRlc3RfZmlsZXNbc2xpY2Vfc3RhcnQ6c2xpY2VfZW5kXQotCi0g ICAgICAgIF9sb2cuZGVidWcoJ2NodW5rIHNsaWNlIFslZDolZF0gb2YgJWQgaXMgJWQgdGVzdHMn ICUgKHNsaWNlX3N0YXJ0LCBzbGljZV9lbmQsIG51bV90ZXN0cywgKHNsaWNlX2VuZCAtIHNsaWNl X3N0YXJ0KSkpCi0KLSAgICAgICAgIyBJZiB3ZSByZWFjaGVkIHRoZSBlbmQgYW5kIHdlIGRvbid0 IGhhdmUgZW5vdWdoIHRlc3RzLCB3ZSBydW4gc29tZQotICAgICAgICAjIGZyb20gdGhlIGJlZ2lu bmluZy4KLSAgICAgICAgaWYgc2xpY2VfZW5kIC0gc2xpY2Vfc3RhcnQgPCBjaHVua19sZW46Ci0g ICAgICAgICAgICBleHRyYSA9IGNodW5rX2xlbiAtIChzbGljZV9lbmQgLSBzbGljZV9zdGFydCkK LSAgICAgICAgICAgIF9sb2cuZGVidWcoJyAgIGxhc3QgY2h1bmsgaXMgcGFydGlhbCwgYXBwZW5k aW5nIFswOiVkXScgJSBleHRyYSkKLSAgICAgICAgICAgIGZpbGVzLmV4dGVuZCh0ZXN0X2ZpbGVz WzA6ZXh0cmFdKQotCi0gICAgICAgIHRlc3RzX3RvX3J1biA9IHNldChmaWxlcykKLSAgICAgICAg bW9yZV90ZXN0c190b19za2lwID0gc2VsZi5fdGVzdF9maWxlcyAtIHRlc3RzX3RvX3J1bgotICAg ICAgICBzZWxmLl9leHBlY3RhdGlvbnMuYWRkX3NraXBwZWRfdGVzdHMobW9yZV90ZXN0c190b19z a2lwKQotICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzID0gdGVzdHNfdG9fcnVuCi0gICAgICAgIHNl bGYuX3Rlc3RfZmlsZXNfbGlzdCA9IGZpbGVzCi0gICAgICAgIHJldHVybiBza2lwcGVkLnVuaW9u KG1vcmVfdGVzdHNfdG9fc2tpcCkKLQogICAgICMgRklYTUU6IFRoaXMgbWV0aG9kIGlzIHdheSB0 b28gbG9uZyBhbmQgbmVlZHMgdG8gYmUgYnJva2VuIGludG8gcGllY2VzLgogICAgIGRlZiBwcmVw YXJlX2xpc3RzX2FuZF9wcmludF9vdXRwdXQoc2VsZik6CiAgICAgICAgICIiIkNyZWF0ZSBhcHBy b3ByaWF0ZSBzdWJzZXRzIG9mIHRlc3QgbGlzdHMgYW5kIHJldHVybnMgYQpAQCAtNDIzLDE2ICsz NjAsMTcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBmb3VuZF90ZXN0X2ZpbGVz ID0gc2V0KHNlbGYuX3Rlc3RfZmlsZXMpCiAgICAgICAgIG51bV9hbGxfdGVzdF9maWxlcyA9IGxl bihzZWxmLl90ZXN0X2ZpbGVzKQogCi0gICAgICAgIHNraXBwZWQgPSBzZWxmLl9leHBlY3RhdGlv bnMuZ2V0X3Rlc3RzX3dpdGhfcmVzdWx0X3R5cGUodGVzdF9leHBlY3RhdGlvbnMuU0tJUCkKKyAg ICAgICAgdGVzdHNfdG9fc2tpcCA9IHNlbGYuX2V4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9y ZXN1bHRfdHlwZSh0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQKQogICAgICAgICBpZiBub3Qgc2VsZi5f b3B0aW9ucy5odHRwOgotICAgICAgICAgICAgc2tpcHBlZC51cGRhdGUoc2V0KHNlbGYuX2h0dHBf dGVzdHMoKSkpCisgICAgICAgICAgICB0ZXN0c190b19za2lwLnVwZGF0ZShzZXQoc2VsZi5faHR0 cF90ZXN0cygpKSkKIAogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNraXBwZWQgPT0gJ29ubHkn OgotICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlcyA9IHNlbGYuX3Rlc3RfZmlsZXMuaW50ZXJz ZWN0aW9uKHNraXBwZWQpCisgICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzID0gc2VsZi5fdGVz dF9maWxlcy5pbnRlcnNlY3Rpb24odGVzdHNfdG9fc2tpcCkKKyAgICAgICAgICAgIHRlc3RzX3Rv X3NraXAgPSBzZXQoKQogICAgICAgICBlbGlmIHNlbGYuX29wdGlvbnMuc2tpcHBlZCA9PSAnZGVm YXVsdCc6Ci0gICAgICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzIC09IHNraXBwZWQKKyAgICAgICAg ICAgIHNlbGYuX3Rlc3RfZmlsZXMgLT0gdGVzdHNfdG9fc2tpcAogICAgICAgICBlbGlmIHNlbGYu X29wdGlvbnMuc2tpcHBlZCA9PSAnaWdub3JlJzoKLSAgICAgICAgICAgIHBhc3MgICMganVzdCB0 byBiZSBjbGVhciB0aGF0IHdlJ3JlIGlnbm9yaW5nIHRoZSBza2lwIGxpc3QuCisgICAgICAgICAg ICB0ZXN0c190b19za2lwID0gc2V0KCkKIAogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNraXBf ZmFpbGluZ190ZXN0czoKICAgICAgICAgICAgIHNlbGYuX3Rlc3RfZmlsZXMgLT0gc2VsZi5fZXhw ZWN0YXRpb25zLmdldF90ZXN0c193aXRoX3Jlc3VsdF90eXBlKHRlc3RfZXhwZWN0YXRpb25zLkZB SUwpCkBAIC00NTYsNyArMzk0LDkgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBl bHNlOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0LnNvcnQoa2V5PWxhbWJkYSB0 ZXN0OiB0ZXN0X2tleShzZWxmLl9wb3J0LCB0ZXN0KSkKIAotICAgICAgICBhbGxfdGVzdHNfdG9f c2tpcCA9IHNlbGYuX3NwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeShza2lwcGVkKQorICAg ICAgICBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QsIHRlc3RzX2luX290aGVyX2NodW5rcyA9IHNlbGYu X2ZpbmRlci5zcGxpdF9pbnRvX2NodW5rc19pZl9uZWNlc3Nhcnkoc2VsZi5fdGVzdF9maWxlc19s aXN0KQorICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMuYWRkX3NraXBwZWRfdGVzdHModGVzdHNf aW5fb3RoZXJfY2h1bmtzKQorICAgICAgICBzZWxmLl90ZXN0cyA9IHNldChzZWxmLl90ZXN0X2Zp bGVzX2xpc3QpCiAKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaDoKICAgICAg ICAgICAgIGxpc3Rfd2l0aF9yZXBldGl0aW9ucyA9IFtdCkBAIC00NjgsNyArNDA4LDcgQEAgY2xh c3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0g c2VsZi5fdGVzdF9maWxlc19saXN0ICogc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zCiAKICAgICAg ICAgaXRlcmF0aW9ucyA9IHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2ggKiBzZWxmLl9vcHRpb25z Lml0ZXJhdGlvbnMKLSAgICAgICAgcmVzdWx0X3N1bW1hcnkgPSBSZXN1bHRTdW1tYXJ5KHNlbGYu X2V4cGVjdGF0aW9ucywgc2VsZi5fdGVzdF9maWxlcywgaXRlcmF0aW9ucywgYWxsX3Rlc3RzX3Rv X3NraXApCisgICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShzZWxmLl9leHBl Y3RhdGlvbnMsIHNlbGYuX3Rlc3RfZmlsZXMsIGl0ZXJhdGlvbnMsIHRlc3RzX3RvX3NraXAudW5p b24odGVzdHNfaW5fb3RoZXJfY2h1bmtzKSkKIAogICAgICAgICBzZWxmLl9wcmludGVyLnByaW50 X2ZvdW5kKG51bV9hbGxfdGVzdF9maWxlcywgbGVuKHNlbGYuX3Rlc3RfZmlsZXMpLCBzZWxmLl9v cHRpb25zLnJlcGVhdF9lYWNoLCBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMpCiAgICAgICAgIHNl bGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQocmVzdWx0X3N1bW1hcnksIHNlbGYuX2V4cGVjdGF0 aW9ucy5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSkK