104064 2012-12-04 17:05:42 -0800 nrwt: only summarize the results one way 2012-12-05 15:15:36 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 103824 104072 1 dpranke dpranke abarth eric ojan rniwa webkit.review.bot oldest_to_newest 783127 0 dpranke 2012-12-04 17:05:42 -0800 nrwt: only summarize the results one way 783129 1 177610 dpranke 2012-12-04 17:06:53 -0800 Created attachment 177610 Patch 784095 2 177610 ojan 2012-12-05 14:03:56 -0800 Comment on attachment 177610 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=177610&action=review > Tools/Scripts/webkitpy/layout_tests/views/printing.py:440 > + # Don't print anything for tests that ran as expected. > + return indentation is off. 784121 3 dpranke 2012-12-05 14:31:24 -0800 (In reply to comment #2) > (From update of attachment 177610 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=177610&action=review > > > Tools/Scripts/webkitpy/layout_tests/views/printing.py:440 > > + # Don't print anything for tests that ran as expected. > > + return > > indentation is off. Yeah, I actually just fixed this prior to your review but uploaded the patch to the wrong bug :). 784123 4 177831 dpranke 2012-12-05 14:32:26 -0800 Created attachment 177831 fix handling of mapping of TEXT and IMAGE+TEXT onto FAIL/Failure 784174 5 dpranke 2012-12-05 15:15:36 -0800 Committed r136767: <http://trac.webkit.org/changeset/136767> 177610 2012-12-04 17:06:53 -0800 2012-12-05 14:32:24 -0800 Patch bug-104064-20121204170418.patch text/plain 14820 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NTg1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNThkZmU5Y2NmNDgzMTJiZTg1MGI0YjQ5NjY3N2Q4ZTdk NDFkZWY0NC4uM2Q4ZmJjNTQ0N2YyNDQxNDlkY2MzNzA5Y2Q1OGMyNzIxZTAyNzJjYyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0 IEBACiAyMDEyLTEyLTA0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG9ubHkgc3VtbWFyaXplIHRoZSByZXN1bHRzIG9uZSB3YXkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDA2NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBtYW5hZ2VyLnN1 bW1hcml6ZV9yZXN1bHRzIHNvIHRoYXQgd2UgYWx3YXlzIChhbmQgb25seSkKKyAgICAgICAgaW5j bHVkZSBib3RoIGV4cGVjdGVkIGFuZCB1bmV4cGVjdGVkIHJlc3VsdHMuIFByZXZpb3VzbHkgd2UK KyAgICAgICAgd291bGQgc3VtbWFyaXplIHRoZSByZXN1bHRzIHR3aWNlLCBvbmNlIHdpdGggZXhw ZWN0ZWQgcmVzdWx0cworICAgICAgICBhbmQgb25jZSB3aXRob3V0LiBUaGlzIG1hZGUgdGhlIGNv ZGUgbXVjaCBtb3JlIGNvbmZ1c2luZyB0aGFuCisgICAgICAgIGl0IG5lZWRlZCB0byBiZS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXIucHk6CisgICAgICAgIChzdW1tYXJpemVfcmVzdWx0cyk6CisgICAgICAgIChNYW5hZ2VyLnJ1 bik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlcl91bml0dGVzdC5weToKKyAgICAgICAgKFJlc3VsdFN1bW1hcnlUZXN0LnN1bW1hcml6 ZWRfcmVzdWx0cyk6CisgICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X25vX3N2bl9yZXZp c2lvbik6CisgICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X3N2bl9yZXZpc2lvbik6Cisg ICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X3N1bW1hcml6ZWRfcmVzdWx0c193b250Zml4 KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGlu Zy5weToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfcmVzdWx0cyk6CisgICAgICAgIChQcmludGVy Ll9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfdW5l eHBlY3RlZF9yZXN1bHRzLmFkZF9yZXN1bHQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdHBy aW50ZXIudGVzdF9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMuZ2V0X3VuZXhwZWN0ZWRfcmVzdWx0 cyk6CisgICAgICAgIChUZXN0cHJpbnRlcik6CisKKzIwMTItMTItMDQgIERpcmsgUHJhbmtlICA8 ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgbnJ3dDogcmVtb3ZlIHR3byB1bnVzZWQg cGFyYW1ldGVycyBmcm9tIGEgZnVuY3Rpb24KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEwNDA1OQogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQppbmRleCBiZGJj YTBjNjQ1NzA5NDUyMWUwMjBiMTdiMjkyZjMxZGNmMTA0MGU3Li4yNzdmMzBiMWMwZjFiOTEzODg5 ZGFkYzI1NTY5NGNhMGE1OTAyYTU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKQEAgLTk2LDIwICs5 Niw4IEBAIGRlZiB1c2VfdHJhY19saW5rc19pbl9yZXN1bHRzX2h0bWwocG9ydF9vYmopOgogIyBv ciBzcGxpdCBvZmYgZnJvbSBNYW5hZ2VyIG9udG8gYW5vdGhlciBoZWxwZXIgY2xhc3MsIGJ1dCBz aG91bGQgbm90IGJlIGEgZnJlZSBmdW5jdGlvbi4KICMgTW9zdCBsaWtlbHkgdGhpcyBzaG91bGQg YmUgbWFkZSBpbnRvIGl0cyBvd24gY2xhc3MsIGFuZCB0aGlzIHN1cGVyLWxvbmcgZnVuY3Rpb24K ICMgc3BsaXQgaW50byBtYW55IGhlbHBlciBmdW5jdGlvbnMuCi1kZWYgc3VtbWFyaXplX3Jlc3Vs dHMocG9ydF9vYmosIGV4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHJldHJ5X3N1bW1hcnks IG9ubHlfdW5leHBlY3RlZCk6Ci0gICAgIiIiU3VtbWFyaXplIGZhaWxpbmcgcmVzdWx0cyBhcyBh IGRpY3QuCi0KLSAgICBGSVhNRTogc3BsaXQgdGhpcyBkYXRhIHN0cnVjdHVyZSBpbnRvIGEgc2Vw YXJhdGUgY2xhc3M/Ci0KLSAgICBBcmdzOgotICAgICAgICBwb3J0X29iajogaW50ZXJmYWNlIHRv IHBvcnQtc3BlY2lmaWMgaG9va3MKLSAgICAgICAgZXhwZWN0YXRpb25zOiB0ZXN0X2V4cGVjdGF0 aW9ucy5UZXN0RXhwZWN0YXRpb25zIG9iamVjdAotICAgICAgICByZXN1bHRfc3VtbWFyeTogc3Vt bWFyeSBvYmplY3QgZnJvbSBpbml0aWFsIHRlc3QgcnVucwotICAgICAgICByZXRyeV9zdW1tYXJ5 OiBzdW1tYXJ5IG9iamVjdCBmcm9tIGZpbmFsIHRlc3QgcnVuIG9mIHJldHJpZWQgdGVzdHMgKGlm IGFueSkKLSAgICAgICAgb25seV91bmV4cGVjdGVkOiB3aGV0aGVyIHRvIHJldHVybiBhIHN1bW1h cnkgb25seSBmb3IgdGhlIHVuZXhwZWN0ZWQgcmVzdWx0cwotICAgIFJldHVybnM6Ci0gICAgICAg IEEgZGljdGlvbmFyeSBjb250YWluaW5nIGEgc3VtbWFyeSBvZiB0aGUgdW5leHBlY3RlZCByZXN1 bHRzIGZyb20gdGhlCi0gICAgICAgIHJ1biwgd2l0aCB0aGUgZm9sbG93aW5nIGZpZWxkczoKK2Rl ZiBzdW1tYXJpemVfcmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFy eSwgcmV0cnlfc3VtbWFyeSk6CisgICAgIiIiUmV0dXJucyBhIGRpY3Rpb25hcnkgY29udGFpbmlu ZyBhIHN1bW1hcnkgb2YgdGhlIHRlc3QgcnVucywgd2l0aCB0aGUgZm9sbG93aW5nIGZpZWxkczoK ICAgICAgICAgJ3ZlcnNpb24nOiBhIHZlcnNpb24gaW5kaWNhdG9yCiAgICAgICAgICdmaXhhYmxl JzogVGhlIG51bWJlciBvZiBmaXhhYmxlIHRlc3RzIChOT1cgLSBQQVNTKQogICAgICAgICAnc2tp cHBlZCc6IFRoZSBudW1iZXIgb2Ygc2tpcHBlZCB0ZXN0cyAoTk9XICYgU0tJUFBFRCkKQEAgLTEz OSw5ICsxMjcsOCBAQCBkZWYgc3VtbWFyaXplX3Jlc3VsdHMocG9ydF9vYmosIGV4cGVjdGF0aW9u cywgcmVzdWx0X3N1bW1hcnksIHJldHJ5X3N1bW1hcnksIG9ubAogICAgICAgICBrZXl3b3Jkc1tt b2RpZmllcl9lbnVtXSA9IG1vZGlmaWVyX3N0cmluZy51cHBlcigpCiAKICAgICB0ZXN0cyA9IHt9 Ci0gICAgb3JpZ2luYWxfcmVzdWx0cyA9IHJlc3VsdF9zdW1tYXJ5LnVuZXhwZWN0ZWRfcmVzdWx0 cyBpZiBvbmx5X3VuZXhwZWN0ZWQgZWxzZSByZXN1bHRfc3VtbWFyeS5yZXN1bHRzCiAKLSAgICBm b3IgdGVzdF9uYW1lLCByZXN1bHQgaW4gb3JpZ2luYWxfcmVzdWx0cy5pdGVyaXRlbXMoKToKKyAg ICBmb3IgdGVzdF9uYW1lLCByZXN1bHQgaW4gcmVzdWx0X3N1bW1hcnkucmVzdWx0cy5pdGVyaXRl bXMoKToKICAgICAgICAgIyBOb3RlIHRoYXQgaWYgYSB0ZXN0IGNyYXNoZWQgaW4gdGhlIG9yaWdp bmFsIHJ1biwgd2UgaWdub3JlCiAgICAgICAgICMgd2hldGhlciBvciBub3QgaXQgY3Jhc2hlZCB3 aGVuIHdlIHJldHJpZWQgaXQgKGlmIHdlIHJldHJpZWQgaXQpLAogICAgICAgICAjIGFuZCBhbHdh eXMgY29uc2lkZXIgdGhlIHJlc3VsdCBub3QgZmxha3kuCkBAIC0xNjgsNyArMTU1LDggQEAgZGVm IHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3RhdGlvbnMsIHJlc3VsdF9zdW1tYXJ5 LCByZXRyeV9zdW1tYXJ5LCBvbmwKICAgICAgICAgICAgIGlmIGV4cGVjdGVkID09ICdQQVNTJzoK ICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICBlbGlmIHJlc3VsdF90eXBlID09IHRl c3RfZXhwZWN0YXRpb25zLkNSQVNIOgotICAgICAgICAgICAgbnVtX3JlZ3Jlc3Npb25zICs9IDEK KyAgICAgICAgICAgIGlmIHRlc3RfbmFtZSBpbiByZXN1bHRfc3VtbWFyeS51bmV4cGVjdGVkX3Jl c3VsdHM6CisgICAgICAgICAgICAgICAgbnVtX3JlZ3Jlc3Npb25zICs9IDEKICAgICAgICAgZWxp ZiByZXN1bHRfdHlwZSA9PSB0ZXN0X2V4cGVjdGF0aW9ucy5NSVNTSU5HOgogICAgICAgICAgICAg aWYgdGVzdF9uYW1lIGluIHJlc3VsdF9zdW1tYXJ5LnVuZXhwZWN0ZWRfcmVzdWx0czoKICAgICAg ICAgICAgICAgICBudW1fbWlzc2luZyArPSAxCkBAIC00MDQsMTYgKzM5MiwxNCBAQCBjbGFzcyBN YW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIGlmIHJldHJ5X3N1bW1hcnk6CiAgICAgICAgICAgICBz ZWxmLl9sb29rX2Zvcl9uZXdfY3Jhc2hfbG9ncyhyZXRyeV9zdW1tYXJ5LCBzdGFydF90aW1lKQog Ci0gICAgICAgIHVuZXhwZWN0ZWRfcmVzdWx0cyA9IHN1bW1hcml6ZV9yZXN1bHRzKHNlbGYuX3Bv cnQsIHNlbGYuX2V4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHJldHJ5X3N1bW1hcnksIG9u bHlfdW5leHBlY3RlZD1UcnVlKQotCi0gICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfcmVzdWx0 cyhlbmRfdGltZSAtIHN0YXJ0X3RpbWUsIHJlc3VsdF9zdW1tYXJ5LCB1bmV4cGVjdGVkX3Jlc3Vs dHMpCisgICAgICAgIHN1bW1hcml6ZWRfcmVzdWx0cyA9IHN1bW1hcml6ZV9yZXN1bHRzKHNlbGYu X3BvcnQsIHNlbGYuX2V4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHJldHJ5X3N1bW1hcnkp CisgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfcmVzdWx0cyhlbmRfdGltZSAtIHN0YXJ0X3Rp bWUsIHJlc3VsdF9zdW1tYXJ5LCBzdW1tYXJpemVkX3Jlc3VsdHMpCiAKICAgICAgICAgIyBGSVhN RTogcmVtb3ZlIHJlY29yZF9yZXN1bHRzLiBJdCdzIGp1c3QgdXNlZCBmb3IgdGVzdGluZy4gVGhl cmUncyBubyBuZWVkCiAgICAgICAgICMgZm9yIGl0IHRvIGJlIGEgY29tbWFuZGxpbmUgYXJndW1l bnQuCiAgICAgICAgIGlmIHNlbGYuX29wdGlvbnMucmVjb3JkX3Jlc3VsdHMgYW5kIG5vdCBzZWxm Ll9vcHRpb25zLmRyeV9ydW46CiAgICAgICAgICAgICBzZWxmLl9wb3J0LnByaW50X2xlYWtzX3N1 bW1hcnkoKQogICAgICAgICAgICAgIyBXcml0ZSB0aGUgc2FtZSBkYXRhIHRvIGxvZyBmaWxlcyBh bmQgdXBsb2FkIGdlbmVyYXRlZCBKU09OIGZpbGVzIHRvIGFwcGVuZ2luZSBzZXJ2ZXIuCi0gICAg ICAgICAgICBzdW1tYXJpemVkX3Jlc3VsdHMgPSBzdW1tYXJpemVfcmVzdWx0cyhzZWxmLl9wb3J0 LCBzZWxmLl9leHBlY3RhdGlvbnMsIHJlc3VsdF9zdW1tYXJ5LCByZXRyeV9zdW1tYXJ5LCBvbmx5 X3VuZXhwZWN0ZWQ9RmFsc2UpCiAgICAgICAgICAgICBzZWxmLl91cGxvYWRfanNvbl9maWxlcyhz dW1tYXJpemVkX3Jlc3VsdHMsIHJlc3VsdF9zdW1tYXJ5KQogCiAgICAgICAgICMgV3JpdGUgdGhl IHN1bW1hcnkgdG8gZGlzayAocmVzdWx0cy5odG1sKSBhbmQgZGlzcGxheSBpdCBpZiByZXF1ZXN0 ZWQuCkBAIC00MjMsNyArNDA5LDcgQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICAg ICAgaWYgc2VsZi5fb3B0aW9ucy5zaG93X3Jlc3VsdHMgYW5kIHJlc3VsdF9zdW1tYXJ5LnVuZXhw ZWN0ZWRfcmVzdWx0cyBvciAoc2VsZi5fb3B0aW9ucy5mdWxsX3Jlc3VsdHNfaHRtbCBhbmQgcmVz dWx0X3N1bW1hcnkudG90YWxfZmFpbHVyZXMpOgogICAgICAgICAgICAgICAgIHNlbGYuX3BvcnQu c2hvd19yZXN1bHRzX2h0bWxfZmlsZShyZXN1bHRzX3BhdGgpCiAKLSAgICAgICAgcmV0dXJuIHNl bGYuX3BvcnQuZXhpdF9jb2RlX2Zyb21fc3VtbWFyaXplZF9yZXN1bHRzKHVuZXhwZWN0ZWRfcmVz dWx0cykKKyAgICAgICAgcmV0dXJuIHNlbGYuX3BvcnQuZXhpdF9jb2RlX2Zyb21fc3VtbWFyaXpl ZF9yZXN1bHRzKHN1bW1hcml6ZWRfcmVzdWx0cykKIAogICAgIGRlZiBfcnVuX3Rlc3RzKHNlbGYs IHRlc3RzX3RvX3J1biwgdGVzdHNfdG9fc2tpcCwgcmVwZWF0X2VhY2gsIGl0ZXJhdGlvbnMsIG51 bV93b3JrZXJzLCByZXRyeWluZyk6CiAgICAgICAgIG5lZWRzX2h0dHAgPSBzZWxmLl9wb3J0LnJl cXVpcmVzX2h0dHBfc2VydmVyKCkgb3IgYW55KHNlbGYuX2lzX2h0dHBfdGVzdCh0ZXN0KSBmb3Ig dGVzdCBpbiB0ZXN0c190b19ydW4pCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5w eQppbmRleCAyZTVhYjg5MTlhMjE2ODZmODI4NTdmOWMzYjc5NDRlNDRkZGJhNDRmLi5hOWJlYjVk NDhhYTIxODc4YjJmMDhlNmM1MGVmNTRhOGQzNDZmOTRkIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21h bmFnZXJfdW5pdHRlc3QucHkKQEAgLTE2MSwzMyArMTYxLDMzIEBAIGNsYXNzIFJlc3VsdFN1bW1h cnlUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgZm9yIHRlc3QgaW4gZXh0cmFfdGVz dHM6CiAgICAgICAgICAgICBycy5hZGQoc2VsZi5nZXRfcmVzdWx0KHRlc3QsIHRlc3RfZXhwZWN0 YXRpb25zLkNSQVNIKSwgZXhwZWN0ZWQsIHRlc3RfaXNfc2xvdykKIAotICAgICAgICByZXRyeSA9 IHJzCiAgICAgICAgIGlmIGZsYWt5OgogICAgICAgICAgICAgcGF0aHMsIHJldHJ5LCBleHAgPSBz ZWxmLmdldF9yZXN1bHRfc3VtbWFyeShwb3J0LCB0ZXN0cywgZXhwZWN0YXRpb25zKQogICAgICAg ICAgICAgcmV0cnkuYWRkKHNlbGYuZ2V0X3Jlc3VsdCgncGFzc2VzL3RleHQuaHRtbCcpLCBUcnVl LCB0ZXN0X2lzX3Nsb3cpCiAgICAgICAgICAgICByZXRyeS5hZGQoc2VsZi5nZXRfcmVzdWx0KCdm YWlsdXJlcy9leHBlY3RlZC90aW1lb3V0Lmh0bWwnKSwgVHJ1ZSwgdGVzdF9pc19zbG93KQogICAg ICAgICAgICAgcmV0cnkuYWRkKHNlbGYuZ2V0X3Jlc3VsdCgnZmFpbHVyZXMvZXhwZWN0ZWQvY3Jh c2guaHRtbCcpLCBUcnVlLCB0ZXN0X2lzX3Nsb3cpCi0gICAgICAgIHVuZXhwZWN0ZWRfcmVzdWx0 cyA9IHN1bW1hcml6ZV9yZXN1bHRzKHBvcnQsIGV4cCwgcnMsIHJldHJ5LCBvbmx5X3VuZXhwZWN0 ZWQ9VHJ1ZSkKLSAgICAgICAgZXhwZWN0ZWRfcmVzdWx0cyA9IHN1bW1hcml6ZV9yZXN1bHRzKHBv cnQsIGV4cCwgcnMsIHJldHJ5LCBvbmx5X3VuZXhwZWN0ZWQ9RmFsc2UpCi0gICAgICAgIHJldHVy biBleHBlY3RlZF9yZXN1bHRzLCB1bmV4cGVjdGVkX3Jlc3VsdHMKKyAgICAgICAgZWxzZToKKyAg ICAgICAgICAgIHJldHJ5ID0gTm9uZQorCisgICAgICAgIHJldHVybiBzdW1tYXJpemVfcmVzdWx0 cyhwb3J0LCBleHAsIHJzLCByZXRyeSkKIAogICAgIGRlZiB0ZXN0X25vX3N2bl9yZXZpc2lvbihz ZWxmKToKICAgICAgICAgaG9zdCA9IE1vY2tIb3N0KGluaXRpYWxpemVfc2NtX2J5X2RlZmF1bHQ9 RmFsc2UpCiAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQoJ3Rlc3QnKQotICAg ICAgICBleHBlY3RlZF9yZXN1bHRzLCB1bmV4cGVjdGVkX3Jlc3VsdHMgPSBzZWxmLnN1bW1hcml6 ZWRfcmVzdWx0cyhwb3J0LCBleHBlY3RlZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFs c2UpCi0gICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZSgncmV2aXNpb24nIG5vdCBpbiB1bmV4cGVjdGVk X3Jlc3VsdHMpCisgICAgICAgIHN1bW1hcml6ZWRfcmVzdWx0cyA9IHNlbGYuc3VtbWFyaXplZF9y ZXN1bHRzKHBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBmbGFreT1GYWxzZSkK KyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdyZXZpc2lvbicgbm90IGluIHN1bW1hcml6ZWRfcmVz dWx0cykKIAogICAgIGRlZiB0ZXN0X3N2bl9yZXZpc2lvbihzZWxmKToKICAgICAgICAgaG9zdCA9 IE1vY2tIb3N0KGluaXRpYWxpemVfc2NtX2J5X2RlZmF1bHQ9RmFsc2UpCiAgICAgICAgIHBvcnQg PSBob3N0LnBvcnRfZmFjdG9yeS5nZXQoJ3Rlc3QnKQogICAgICAgICBwb3J0Ll9vcHRpb25zLmJ1 aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVyJwotICAgICAgICBleHBlY3RlZF9yZXN1bHRzLCB1 bmV4cGVjdGVkX3Jlc3VsdHMgPSBzZWxmLnN1bW1hcml6ZWRfcmVzdWx0cyhwb3J0LCBleHBlY3Rl ZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UpCi0gICAgICAgIHNlbGYuYXNzZXJ0 Tm90RXF1YWxzKHVuZXhwZWN0ZWRfcmVzdWx0c1sncmV2aXNpb24nXSwgJycpCisgICAgICAgIHN1 bW1hcml6ZWRfcmVzdWx0cyA9IHNlbGYuc3VtbWFyaXplZF9yZXN1bHRzKHBvcnQsIGV4cGVjdGVk PUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBmbGFreT1GYWxzZSkKKyAgICAgICAgc2VsZi5hc3NlcnRO b3RFcXVhbHMoc3VtbWFyaXplZF9yZXN1bHRzWydyZXZpc2lvbiddLCAnJykKIAogICAgIGRlZiB0 ZXN0X3N1bW1hcml6ZWRfcmVzdWx0c193b250Zml4KHNlbGYpOgogICAgICAgICBob3N0ID0gTW9j a0hvc3QoKQogICAgICAgICBwb3J0ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0JykKICAg ICAgICAgcG9ydC5fb3B0aW9ucy5idWlsZGVyX25hbWUgPSAnZHVtbXkgYnVpbGRlcicKICAgICAg ICAgcG9ydC5fZmlsZXN5c3RlbS53cml0ZV90ZXh0X2ZpbGUocG9ydC5fZmlsZXN5c3RlbS5qb2lu KHBvcnQubGF5b3V0X3Rlc3RzX2RpcigpLCAiZmFpbHVyZXMvZXhwZWN0ZWQvd29udGZpeC5odG1s IiksICJEdW1teSB0ZXN0IGNvbnRlbnRzIikKLSAgICAgICAgZXhwZWN0ZWRfcmVzdWx0cywgdW5l eHBlY3RlZF9yZXN1bHRzID0gc2VsZi5zdW1tYXJpemVkX3Jlc3VsdHMocG9ydCwgZXhwZWN0ZWQ9 RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5PUZhbHNlLCBleHRyYV90ZXN0cz1bJ2ZhaWx1cmVz L2V4cGVjdGVkL3dvbnRmaXguaHRtbCddLCBleHRyYV9leHBlY3RhdGlvbnM9J0J1Zyh4KSBmYWls dXJlcy9leHBlY3RlZC93b250Zml4Lmh0bWwgWyBXb250Rml4IF1cbicpCi0gICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShleHBlY3RlZF9yZXN1bHRzWyd0ZXN0cyddWydmYWlsdXJlcyddWydleHBlY3Rl ZCddWyd3b250Zml4Lmh0bWwnXVsnd29udGZpeCddKQorICAgICAgICBzdW1tYXJpemVkX3Jlc3Vs dHMgPSBzZWxmLnN1bW1hcml6ZWRfcmVzdWx0cyhwb3J0LCBleHBlY3RlZD1GYWxzZSwgcGFzc2lu Zz1GYWxzZSwgZmxha3k9RmFsc2UsIGV4dHJhX3Rlc3RzPVsnZmFpbHVyZXMvZXhwZWN0ZWQvd29u dGZpeC5odG1sJ10sIGV4dHJhX2V4cGVjdGF0aW9ucz0nQnVnKHgpIGZhaWx1cmVzL2V4cGVjdGVk L3dvbnRmaXguaHRtbCBbIFdvbnRGaXggXVxuJykKKyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHN1 bW1hcml6ZWRfcmVzdWx0c1sndGVzdHMnXVsnZmFpbHVyZXMnXVsnZXhwZWN0ZWQnXVsnd29udGZp eC5odG1sJ11bJ3dvbnRmaXgnXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkKaW5kZXggN2Y0NDlmNzY4MDAzZGJiNjljOTAy MGFjNzkxNDAwMDViOWI5NzY3Yi4uMTQ5MjEzMDcxNjAwMjc2ZDcwNzBiM2JkNTA5MGY2Y2FiNWEz YjFmYSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmll d3MvcHJpbnRpbmcucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv dmlld3MvcHJpbnRpbmcucHkKQEAgLTE0OCwxMyArMTQ4LDEzIEBAIGNsYXNzIFByaW50ZXIob2Jq ZWN0KToKICAgICAgICAgICAgIG5kaWdpdHMgPSBpbnQobWF0aC5sb2cxMChsZW4obnVtKSkpICsg MQogICAgICAgICByZXR1cm4gbmRpZ2l0cwogCi0gICAgZGVmIHByaW50X3Jlc3VsdHMoc2VsZiwg cnVuX3RpbWUsIHJlc3VsdF9zdW1tYXJ5LCB1bmV4cGVjdGVkX3Jlc3VsdHMpOgorICAgIGRlZiBw cmludF9yZXN1bHRzKHNlbGYsIHJ1bl90aW1lLCByZXN1bHRfc3VtbWFyeSwgc3VtbWFyaXplZF9y ZXN1bHRzKToKICAgICAgICAgc2VsZi5fcHJpbnRfdGltaW5nX3N0YXRpc3RpY3MocnVuX3RpbWUs IHJlc3VsdF9zdW1tYXJ5KQogICAgICAgICBzZWxmLl9wcmludF9yZXN1bHRfc3VtbWFyeShyZXN1 bHRfc3VtbWFyeSkKICAgICAgICAgc2VsZi5fcHJpbnRfb25lX2xpbmVfc3VtbWFyeShyZXN1bHRf c3VtbWFyeS50b3RhbCAtIHJlc3VsdF9zdW1tYXJ5LmV4cGVjdGVkX3NraXBzLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdF9zdW1tYXJ5LmV4cGVjdGVkIC0gcmVz dWx0X3N1bW1hcnkuZXhwZWN0ZWRfc2tpcHMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZCkKLSAgICAgICAgc2VsZi5fcHJpbnRf dW5leHBlY3RlZF9yZXN1bHRzKHVuZXhwZWN0ZWRfcmVzdWx0cykKKyAgICAgICAgc2VsZi5fcHJp bnRfdW5leHBlY3RlZF9yZXN1bHRzKHN1bW1hcml6ZWRfcmVzdWx0cykKIAogICAgIGRlZiBfcHJp bnRfdGltaW5nX3N0YXRpc3RpY3Moc2VsZiwgdG90YWxfdGltZSwgcmVzdWx0X3N1bW1hcnkpOgog ICAgICAgICBzZWxmLl9wcmludF9kZWJ1ZygiVGVzdCB0aW1pbmc6IikKQEAgLTQyMyw3ICs0MjMs NyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgICAgICByZWxwYXRoID0gJzxub25l PicKICAgICAgICAgc2VsZi5fcHJpbnRfZGVmYXVsdCgnICAlczogJXMnICUgKGV4dGVuc2lvblsx Ol0sIHJlbHBhdGgpKQogCi0gICAgZGVmIF9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMoc2VsZiwg dW5leHBlY3RlZF9yZXN1bHRzKToKKyAgICBkZWYgX3ByaW50X3VuZXhwZWN0ZWRfcmVzdWx0cyhz ZWxmLCBzdW1tYXJpemVkX3Jlc3VsdHMpOgogICAgICAgICAjIFByaW50cyB0byB0aGUgYnVpbGRi b3Qgc3RyZWFtCiAgICAgICAgIHBhc3NlcyA9IHt9CiAgICAgICAgIGZsYWt5ID0ge30KQEAgLTQz NSw2ICs0MzUsMTAgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBkZWYgYWRkX3Jl c3VsdCh0ZXN0LCByZXN1bHRzLCBwYXNzZXM9cGFzc2VzLCBmbGFreT1mbGFreSwgcmVncmVzc2lv bnM9cmVncmVzc2lvbnMpOgogICAgICAgICAgICAgYWN0dWFsID0gcmVzdWx0c1snYWN0dWFsJ10u c3BsaXQoIiAiKQogICAgICAgICAgICAgZXhwZWN0ZWQgPSByZXN1bHRzWydleHBlY3RlZCddLnNw bGl0KCIgIikKKyAgICAgICAgICAgIGlmIGFsbChhY3R1YWxfcmVzdWx0IGluIGV4cGVjdGVkIGZv ciBhY3R1YWxfcmVzdWx0IGluIGFjdHVhbCk6CisgICAgICAgICAgICAgICAgICAgICMgRG9uJ3Qg cHJpbnQgYW55dGhpbmcgZm9yIHRlc3RzIHRoYXQgcmFuIGFzIGV4cGVjdGVkLgorICAgICAgICAg ICAgICAgICAgICByZXR1cm4KKwogICAgICAgICAgICAgaWYgYWN0dWFsID09IFsnUEFTUyddOgog ICAgICAgICAgICAgICAgIGlmICdDUkFTSCcgaW4gZXhwZWN0ZWQ6CiAgICAgICAgICAgICAgICAg ICAgIGFkZF90b19kaWN0X29mX2xpc3RzKHBhc3NlcywgJ0V4cGVjdGVkIHRvIGNyYXNoLCBidXQg cGFzc2VkJywgdGVzdCkKQEAgLTQ0OCw3ICs0NTIsNyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6 CiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIGFkZF90b19kaWN0X29mX2xpc3Rz KHJlZ3Jlc3Npb25zLCByZXN1bHRzWydhY3R1YWwnXSwgdGVzdCkKIAotICAgICAgICByZXN1bHRz anNvbnBhcnNlci5mb3JfZWFjaF90ZXN0KHVuZXhwZWN0ZWRfcmVzdWx0c1sndGVzdHMnXSwgYWRk X3Jlc3VsdCkKKyAgICAgICAgcmVzdWx0c2pzb25wYXJzZXIuZm9yX2VhY2hfdGVzdChzdW1tYXJp emVkX3Jlc3VsdHNbJ3Rlc3RzJ10sIGFkZF9yZXN1bHQpCiAKICAgICAgICAgaWYgbGVuKHBhc3Nl cykgb3IgbGVuKGZsYWt5KSBvciBsZW4ocmVncmVzc2lvbnMpOgogICAgICAgICAgICAgc2VsZi5f cHJpbnRfZm9yX2JvdCgiIikKQEAgLTQ2OSw3ICs0NzMsNyBAQCBjbGFzcyBQcmludGVyKG9iamVj dCk6CiAgICAgICAgICAgICAgICAgdGVzdHMuc29ydCgpCiAKICAgICAgICAgICAgICAgICBmb3Ig dGVzdCBpbiB0ZXN0czoKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gcmVzdWx0c2pzb25w YXJzZXIucmVzdWx0X2Zvcl90ZXN0KHVuZXhwZWN0ZWRfcmVzdWx0c1sndGVzdHMnXSwgdGVzdCkK KyAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gcmVzdWx0c2pzb25wYXJzZXIucmVzdWx0X2Zv cl90ZXN0KHN1bW1hcml6ZWRfcmVzdWx0c1sndGVzdHMnXSwgdGVzdCkKICAgICAgICAgICAgICAg ICAgICAgYWN0dWFsID0gcmVzdWx0WydhY3R1YWwnXS5zcGxpdCgiICIpCiAgICAgICAgICAgICAg ICAgICAgIGV4cGVjdGVkID0gcmVzdWx0WydleHBlY3RlZCddLnNwbGl0KCIgIikKICAgICAgICAg ICAgICAgICAgICAgcmVzdWx0ID0gVGVzdEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElPTlNba2V5Lmxv d2VyKCldCkBAIC00ODksNyArNDkzLDcgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAg ICAgICAgICAgICAgICBzZWxmLl9wcmludF9mb3JfYm90KCIgICVzIFsgJXMgXSIgJSAodGVzdCwg VGVzdEV4cGVjdGF0aW9uUGFyc2VyLl9pbnZlcnRlZF9leHBlY3RhdGlvbl90b2tlbnNba2V5XSkp CiAgICAgICAgICAgICAgICAgc2VsZi5fcHJpbnRfZm9yX2JvdCgiIikKIAotICAgICAgICBpZiBs ZW4odW5leHBlY3RlZF9yZXN1bHRzWyd0ZXN0cyddKSBhbmQgc2VsZi5fb3B0aW9ucy5kZWJ1Z19y d3RfbG9nZ2luZzoKKyAgICAgICAgaWYgbGVuKHN1bW1hcml6ZWRfcmVzdWx0c1sndGVzdHMnXSkg YW5kIHNlbGYuX29wdGlvbnMuZGVidWdfcnd0X2xvZ2dpbmc6CiAgICAgICAgICAgICBzZWxmLl9w cmludF9mb3JfYm90KCIlcyIgJSAoIi0iICogNzgpKQogCiAgICAgZGVmIF9wcmludF9xdWlldChz ZWxmLCBtc2cpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQppbmRleCBiNTcyYjAzZmYyNmUz NzM1Zjk0MzgxNDRhMWRhYjI1ZjBjZThhZjgxLi5hYTc5NTkyYTNjOWU3MzdiODYyZDQyZDA5ZDc5 ZDhiNzNjN2FjZmI2IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQpAQCAtMTkzLDE0ICsx OTMsMTMgQEAgY2xhc3MgIFRlc3RwcmludGVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAg ICAgICAgICBycy5hZGQoc2VsZi5nZXRfcmVzdWx0KCdwYXNzZXMvdGV4dC5odG1sJywgdGVzdF9l eHBlY3RhdGlvbnMuVElNRU9VVCksIGV4cGVjdGVkLCB0ZXN0X2lzX3Nsb3cpCiAgICAgICAgICAg ICAgICAgcnMuYWRkKHNlbGYuZ2V0X3Jlc3VsdCgnZmFpbHVyZXMvZXhwZWN0ZWQvdGltZW91dC5o dG1sJywgdGVzdF9leHBlY3RhdGlvbnMuQ1JBU0gpLCBleHBlY3RlZCwgdGVzdF9pc19zbG93KQog ICAgICAgICAgICAgICAgIHJzLmFkZChzZWxmLmdldF9yZXN1bHQoJ2ZhaWx1cmVzL2V4cGVjdGVk L2NyYXNoLmh0bWwnLCB0ZXN0X2V4cGVjdGF0aW9ucy5USU1FT1VUKSwgZXhwZWN0ZWQsIHRlc3Rf aXNfc2xvdykKLSAgICAgICAgICAgIHJldHJ5ID0gcnMKKyAgICAgICAgICAgIHJldHJ5ID0gTm9u ZQogICAgICAgICAgICAgaWYgZmxha3k6CiAgICAgICAgICAgICAgICAgcGF0aHMsIHJldHJ5LCBl eHAgPSBzZWxmLmdldF9yZXN1bHRfc3VtbWFyeSh0ZXN0cywgZXhwZWN0YXRpb25zKQogICAgICAg ICAgICAgICAgIHJldHJ5LmFkZChzZWxmLmdldF9yZXN1bHQoJ3Bhc3Nlcy90ZXh0Lmh0bWwnKSwg VHJ1ZSwgdGVzdF9pc19zbG93KQogICAgICAgICAgICAgICAgIHJldHJ5LmFkZChzZWxmLmdldF9y ZXN1bHQoJ2ZhaWx1cmVzL2V4cGVjdGVkL3RpbWVvdXQuaHRtbCcpLCBUcnVlLCB0ZXN0X2lzX3Ns b3cpCiAgICAgICAgICAgICAgICAgcmV0cnkuYWRkKHNlbGYuZ2V0X3Jlc3VsdCgnZmFpbHVyZXMv ZXhwZWN0ZWQvY3Jhc2guaHRtbCcpLCBUcnVlLCB0ZXN0X2lzX3Nsb3cpCi0gICAgICAgICAgICB1 bmV4cGVjdGVkX3Jlc3VsdHMgPSBtYW5hZ2VyLnN1bW1hcml6ZV9yZXN1bHRzKHNlbGYuX3BvcnQs IGV4cCwgcnMsIHJldHJ5LCBvbmx5X3VuZXhwZWN0ZWQ9VHJ1ZSkKLSAgICAgICAgICAgIHJldHVy biB1bmV4cGVjdGVkX3Jlc3VsdHMKKyAgICAgICAgICAgIHJldHVybiBtYW5hZ2VyLnN1bW1hcml6 ZV9yZXN1bHRzKHNlbGYuX3BvcnQsIGV4cCwgcnMsIHJldHJ5KQogCiAgICAgICAgIHRlc3RzID0g WydwYXNzZXMvdGV4dC5odG1sJywgJ2ZhaWx1cmVzL2V4cGVjdGVkL3RpbWVvdXQuaHRtbCcsICdm YWlsdXJlcy9leHBlY3RlZC9jcmFzaC5odG1sJ10KICAgICAgICAgZXhwZWN0YXRpb25zID0gJycK 177831 2012-12-05 14:32:26 -0800 2012-12-05 14:32:26 -0800 fix handling of mapping of TEXT and IMAGE+TEXT onto FAIL/Failure bug-104064-20121205142951.patch text/plain 15254 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2NzMzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjhhMjI3MWNhNWYwNzYzMGZhMTdjODc0ZmRkNjRmMmY2 ZmI2OWJmYy4uNTBiYzEyZjUyODkwNzBhNmFjZDE3YTVmM2I1ZDU2NGFhYzNmMjMyZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0 IEBACiAyMDEyLTEyLTA1ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG9ubHkgc3VtbWFyaXplIHRoZSByZXN1bHRzIG9uZSB3YXkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDA2NAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSBtYW5hZ2VyLnN1 bW1hcml6ZV9yZXN1bHRzIHNvIHRoYXQgd2UgYWx3YXlzIChhbmQgb25seSkKKyAgICAgICAgaW5j bHVkZSBib3RoIGV4cGVjdGVkIGFuZCB1bmV4cGVjdGVkIHJlc3VsdHMuIFByZXZpb3VzbHkgd2UK KyAgICAgICAgd291bGQgc3VtbWFyaXplIHRoZSByZXN1bHRzIHR3aWNlLCBvbmNlIHdpdGggZXhw ZWN0ZWQgcmVzdWx0cworICAgICAgICBhbmQgb25jZSB3aXRob3V0LiBUaGlzIG1hZGUgdGhlIGNv ZGUgbXVjaCBtb3JlIGNvbmZ1c2luZyB0aGFuCisgICAgICAgIGl0IG5lZWRlZCB0byBiZS4KKwor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFn ZXIucHk6CisgICAgICAgIChzdW1tYXJpemVfcmVzdWx0cyk6CisgICAgICAgIChNYW5hZ2VyLnJ1 bik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlcl91bml0dGVzdC5weToKKyAgICAgICAgKFJlc3VsdFN1bW1hcnlUZXN0LnN1bW1hcml6 ZWRfcmVzdWx0cyk6CisgICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X25vX3N2bl9yZXZp c2lvbik6CisgICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X3N2bl9yZXZpc2lvbik6Cisg ICAgICAgIChSZXN1bHRTdW1tYXJ5VGVzdC50ZXN0X3N1bW1hcml6ZWRfcmVzdWx0c193b250Zml4 KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGlu Zy5weToKKyAgICAgICAgKFByaW50ZXIucHJpbnRfcmVzdWx0cyk6CisgICAgICAgIChQcmludGVy Ll9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfdW5l eHBlY3RlZF9yZXN1bHRzLmFkZF9yZXN1bHQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdHBy aW50ZXIudGVzdF9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMuZ2V0X3VuZXhwZWN0ZWRfcmVzdWx0 cyk6CisgICAgICAgIChUZXN0cHJpbnRlcik6CisKKzIwMTItMTItMDUgIERpcmsgUHJhbmtlICA8 ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgbnJ3dDogc2ltcGxpZnkgdGhlIGZpbmRp bmcgb2YgdGVzdHMgdG8gcmV0cnkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEwNDA2NwogCkBAIC0xMiw3ICs0MSw3IEBACiAgICAgICAgIChNYW5hZ2Vy LnJ1bik6CiAgICAgICAgIChNYW5hZ2VyLl9mYWlsZWRfdGVzdF9uYW1lcyk6CiAKLTIwMTItMTIt MDUgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisyMDEyLTEyLTA0ICBEaXJr IFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIG5yd3Q6IHJlbW92ZSB0 d28gdW51c2VkIHBhcmFtZXRlcnMgZnJvbSBhIGZ1bmN0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQwNTkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5Cmlu ZGV4IDcyMWIzNDBkNGNhZTI5NDI0MjFlYjgwN2I4MzhjZmE2ZmYyMzQyMDcuLjBmN2RlMzljNmU4 YTE3ZTFiMzI3ZTJiNTZiMjVjOTEyZjFiYTYwNmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpAQCAt ODcsMjAgKzg3LDggQEAgZGVmIHVzZV90cmFjX2xpbmtzX2luX3Jlc3VsdHNfaHRtbChwb3J0X29i aik6CiAjIG9yIHNwbGl0IG9mZiBmcm9tIE1hbmFnZXIgb250byBhbm90aGVyIGhlbHBlciBjbGFz cywgYnV0IHNob3VsZCBub3QgYmUgYSBmcmVlIGZ1bmN0aW9uLgogIyBNb3N0IGxpa2VseSB0aGlz IHNob3VsZCBiZSBtYWRlIGludG8gaXRzIG93biBjbGFzcywgYW5kIHRoaXMgc3VwZXItbG9uZyBm dW5jdGlvbgogIyBzcGxpdCBpbnRvIG1hbnkgaGVscGVyIGZ1bmN0aW9ucy4KLWRlZiBzdW1tYXJp emVfcmVzdWx0cyhwb3J0X29iaiwgZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlf c3VtbWFyeSwgb25seV91bmV4cGVjdGVkKToKLSAgICAiIiJTdW1tYXJpemUgZmFpbGluZyByZXN1 bHRzIGFzIGEgZGljdC4KLQotICAgIEZJWE1FOiBzcGxpdCB0aGlzIGRhdGEgc3RydWN0dXJlIGlu dG8gYSBzZXBhcmF0ZSBjbGFzcz8KLQotICAgIEFyZ3M6Ci0gICAgICAgIHBvcnRfb2JqOiBpbnRl cmZhY2UgdG8gcG9ydC1zcGVjaWZpYyBob29rcwotICAgICAgICBleHBlY3RhdGlvbnM6IHRlc3Rf ZXhwZWN0YXRpb25zLlRlc3RFeHBlY3RhdGlvbnMgb2JqZWN0Ci0gICAgICAgIHJlc3VsdF9zdW1t YXJ5OiBzdW1tYXJ5IG9iamVjdCBmcm9tIGluaXRpYWwgdGVzdCBydW5zCi0gICAgICAgIHJldHJ5 X3N1bW1hcnk6IHN1bW1hcnkgb2JqZWN0IGZyb20gZmluYWwgdGVzdCBydW4gb2YgcmV0cmllZCB0 ZXN0cyAoaWYgYW55KQotICAgICAgICBvbmx5X3VuZXhwZWN0ZWQ6IHdoZXRoZXIgdG8gcmV0dXJu IGEgc3VtbWFyeSBvbmx5IGZvciB0aGUgdW5leHBlY3RlZCByZXN1bHRzCi0gICAgUmV0dXJuczoK LSAgICAgICAgQSBkaWN0aW9uYXJ5IGNvbnRhaW5pbmcgYSBzdW1tYXJ5IG9mIHRoZSB1bmV4cGVj dGVkIHJlc3VsdHMgZnJvbSB0aGUKLSAgICAgICAgcnVuLCB3aXRoIHRoZSBmb2xsb3dpbmcgZmll bGRzOgorZGVmIHN1bW1hcml6ZV9yZXN1bHRzKHBvcnRfb2JqLCBleHBlY3RhdGlvbnMsIHJlc3Vs dF9zdW1tYXJ5LCByZXRyeV9zdW1tYXJ5KToKKyAgICAiIiJSZXR1cm5zIGEgZGljdGlvbmFyeSBj b250YWluaW5nIGEgc3VtbWFyeSBvZiB0aGUgdGVzdCBydW5zLCB3aXRoIHRoZSBmb2xsb3dpbmcg ZmllbGRzOgogICAgICAgICAndmVyc2lvbic6IGEgdmVyc2lvbiBpbmRpY2F0b3IKICAgICAgICAg J2ZpeGFibGUnOiBUaGUgbnVtYmVyIG9mIGZpeGFibGUgdGVzdHMgKE5PVyAtIFBBU1MpCiAgICAg ICAgICdza2lwcGVkJzogVGhlIG51bWJlciBvZiBza2lwcGVkIHRlc3RzIChOT1cgJiBTS0lQUEVE KQpAQCAtMTMwLDkgKzExOCw4IEBAIGRlZiBzdW1tYXJpemVfcmVzdWx0cyhwb3J0X29iaiwgZXhw ZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlfc3VtbWFyeSwgb25sCiAgICAgICAgIGtl eXdvcmRzW21vZGlmaWVyX2VudW1dID0gbW9kaWZpZXJfc3RyaW5nLnVwcGVyKCkKIAogICAgIHRl c3RzID0ge30KLSAgICBvcmlnaW5hbF9yZXN1bHRzID0gcmVzdWx0X3N1bW1hcnkudW5leHBlY3Rl ZF9yZXN1bHRzIGlmIG9ubHlfdW5leHBlY3RlZCBlbHNlIHJlc3VsdF9zdW1tYXJ5LnJlc3VsdHMK IAotICAgIGZvciB0ZXN0X25hbWUsIHJlc3VsdCBpbiBvcmlnaW5hbF9yZXN1bHRzLml0ZXJpdGVt cygpOgorICAgIGZvciB0ZXN0X25hbWUsIHJlc3VsdCBpbiByZXN1bHRfc3VtbWFyeS5yZXN1bHRz Lml0ZXJpdGVtcygpOgogICAgICAgICAjIE5vdGUgdGhhdCBpZiBhIHRlc3QgY3Jhc2hlZCBpbiB0 aGUgb3JpZ2luYWwgcnVuLCB3ZSBpZ25vcmUKICAgICAgICAgIyB3aGV0aGVyIG9yIG5vdCBpdCBj cmFzaGVkIHdoZW4gd2UgcmV0cmllZCBpdCAoaWYgd2UgcmV0cmllZCBpdCksCiAgICAgICAgICMg YW5kIGFsd2F5cyBjb25zaWRlciB0aGUgcmVzdWx0IG5vdCBmbGFreS4KQEAgLTE1OSw3ICsxNDYs OCBAQCBkZWYgc3VtbWFyaXplX3Jlc3VsdHMocG9ydF9vYmosIGV4cGVjdGF0aW9ucywgcmVzdWx0 X3N1bW1hcnksIHJldHJ5X3N1bW1hcnksIG9ubAogICAgICAgICAgICAgaWYgZXhwZWN0ZWQgPT0g J1BBU1MnOgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgIGVsaWYgcmVzdWx0X3R5 cGUgPT0gdGVzdF9leHBlY3RhdGlvbnMuQ1JBU0g6Ci0gICAgICAgICAgICBudW1fcmVncmVzc2lv bnMgKz0gMQorICAgICAgICAgICAgaWYgdGVzdF9uYW1lIGluIHJlc3VsdF9zdW1tYXJ5LnVuZXhw ZWN0ZWRfcmVzdWx0czoKKyAgICAgICAgICAgICAgICBudW1fcmVncmVzc2lvbnMgKz0gMQogICAg ICAgICBlbGlmIHJlc3VsdF90eXBlID09IHRlc3RfZXhwZWN0YXRpb25zLk1JU1NJTkc6CiAgICAg ICAgICAgICBpZiB0ZXN0X25hbWUgaW4gcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZF9yZXN1bHRz OgogICAgICAgICAgICAgICAgIG51bV9taXNzaW5nICs9IDEKQEAgLTM5MiwxNiArMzgwLDE0IEBA IGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgaWYgcmV0cnlfc3VtbWFyeToKICAgICAg ICAgICAgIHNlbGYuX2xvb2tfZm9yX25ld19jcmFzaF9sb2dzKHJldHJ5X3N1bW1hcnksIHN0YXJ0 X3RpbWUpCiAKLSAgICAgICAgdW5leHBlY3RlZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jlc3VsdHMo c2VsZi5fcG9ydCwgc2VsZi5fZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlfc3Vt bWFyeSwgb25seV91bmV4cGVjdGVkPVRydWUpCi0KLSAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF9yZXN1bHRzKGVuZF90aW1lIC0gc3RhcnRfdGltZSwgcmVzdWx0X3N1bW1hcnksIHVuZXhwZWN0 ZWRfcmVzdWx0cykKKyAgICAgICAgc3VtbWFyaXplZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jlc3Vs dHMoc2VsZi5fcG9ydCwgc2VsZi5fZXhwZWN0YXRpb25zLCByZXN1bHRfc3VtbWFyeSwgcmV0cnlf c3VtbWFyeSkKKyAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9yZXN1bHRzKGVuZF90aW1lIC0g c3RhcnRfdGltZSwgcmVzdWx0X3N1bW1hcnksIHN1bW1hcml6ZWRfcmVzdWx0cykKIAogICAgICAg ICAjIEZJWE1FOiByZW1vdmUgcmVjb3JkX3Jlc3VsdHMuIEl0J3MganVzdCB1c2VkIGZvciB0ZXN0 aW5nLiBUaGVyZSdzIG5vIG5lZWQKICAgICAgICAgIyBmb3IgaXQgdG8gYmUgYSBjb21tYW5kbGlu ZSBhcmd1bWVudC4KICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5yZWNvcmRfcmVzdWx0cyBhbmQg bm90IHNlbGYuX29wdGlvbnMuZHJ5X3J1bjoKICAgICAgICAgICAgIHNlbGYuX3BvcnQucHJpbnRf bGVha3Nfc3VtbWFyeSgpCiAgICAgICAgICAgICAjIFdyaXRlIHRoZSBzYW1lIGRhdGEgdG8gbG9n IGZpbGVzIGFuZCB1cGxvYWQgZ2VuZXJhdGVkIEpTT04gZmlsZXMgdG8gYXBwZW5naW5lIHNlcnZl ci4KLSAgICAgICAgICAgIHN1bW1hcml6ZWRfcmVzdWx0cyA9IHN1bW1hcml6ZV9yZXN1bHRzKHNl bGYuX3BvcnQsIHNlbGYuX2V4cGVjdGF0aW9ucywgcmVzdWx0X3N1bW1hcnksIHJldHJ5X3N1bW1h cnksIG9ubHlfdW5leHBlY3RlZD1GYWxzZSkKICAgICAgICAgICAgIHNlbGYuX3VwbG9hZF9qc29u X2ZpbGVzKHN1bW1hcml6ZWRfcmVzdWx0cywgcmVzdWx0X3N1bW1hcnkpCiAKICAgICAgICAgIyBX cml0ZSB0aGUgc3VtbWFyeSB0byBkaXNrIChyZXN1bHRzLmh0bWwpIGFuZCBkaXNwbGF5IGl0IGlm IHJlcXVlc3RlZC4KQEAgLTQxMSw3ICszOTcsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAg ICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNob3dfcmVzdWx0cyBhbmQgcmVzdWx0X3N1bW1h cnkudW5leHBlY3RlZF9yZXN1bHRzIG9yIChzZWxmLl9vcHRpb25zLmZ1bGxfcmVzdWx0c19odG1s IGFuZCByZXN1bHRfc3VtbWFyeS50b3RhbF9mYWlsdXJlcyk6CiAgICAgICAgICAgICAgICAgc2Vs Zi5fcG9ydC5zaG93X3Jlc3VsdHNfaHRtbF9maWxlKHJlc3VsdHNfcGF0aCkKIAotICAgICAgICBy ZXR1cm4gc2VsZi5fcG9ydC5leGl0X2NvZGVfZnJvbV9zdW1tYXJpemVkX3Jlc3VsdHModW5leHBl Y3RlZF9yZXN1bHRzKQorICAgICAgICByZXR1cm4gc2VsZi5fcG9ydC5leGl0X2NvZGVfZnJvbV9z dW1tYXJpemVkX3Jlc3VsdHMoc3VtbWFyaXplZF9yZXN1bHRzKQogCiAgICAgZGVmIF9ydW5fdGVz dHMoc2VsZiwgdGVzdHNfdG9fcnVuLCB0ZXN0c190b19za2lwLCByZXBlYXRfZWFjaCwgaXRlcmF0 aW9ucywgbnVtX3dvcmtlcnMsIHJldHJ5aW5nKToKICAgICAgICAgbmVlZHNfaHR0cCA9IHNlbGYu X3BvcnQucmVxdWlyZXNfaHR0cF9zZXJ2ZXIoKSBvciBhbnkoc2VsZi5faXNfaHR0cF90ZXN0KHRl c3QpIGZvciB0ZXN0IGluIHRlc3RzX3RvX3J1bikKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3Vu aXR0ZXN0LnB5CmluZGV4IDJlNWFiODkxOWEyMTY4NmY4Mjg1N2Y5YzNiNzk0NGU0NGRkYmE0NGYu LmE5YmViNWQ0OGFhMjE4NzhiMmYwOGU2YzUwZWY1NGE4ZDM0NmY5NGQgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5p dHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJv bGxlcnMvbWFuYWdlcl91bml0dGVzdC5weQpAQCAtMTYxLDMzICsxNjEsMzMgQEAgY2xhc3MgUmVz dWx0U3VtbWFyeVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBmb3IgdGVzdCBpbiBl eHRyYV90ZXN0czoKICAgICAgICAgICAgIHJzLmFkZChzZWxmLmdldF9yZXN1bHQodGVzdCwgdGVz dF9leHBlY3RhdGlvbnMuQ1JBU0gpLCBleHBlY3RlZCwgdGVzdF9pc19zbG93KQogCi0gICAgICAg IHJldHJ5ID0gcnMKICAgICAgICAgaWYgZmxha3k6CiAgICAgICAgICAgICBwYXRocywgcmV0cnks IGV4cCA9IHNlbGYuZ2V0X3Jlc3VsdF9zdW1tYXJ5KHBvcnQsIHRlc3RzLCBleHBlY3RhdGlvbnMp CiAgICAgICAgICAgICByZXRyeS5hZGQoc2VsZi5nZXRfcmVzdWx0KCdwYXNzZXMvdGV4dC5odG1s JyksIFRydWUsIHRlc3RfaXNfc2xvdykKICAgICAgICAgICAgIHJldHJ5LmFkZChzZWxmLmdldF9y ZXN1bHQoJ2ZhaWx1cmVzL2V4cGVjdGVkL3RpbWVvdXQuaHRtbCcpLCBUcnVlLCB0ZXN0X2lzX3Ns b3cpCiAgICAgICAgICAgICByZXRyeS5hZGQoc2VsZi5nZXRfcmVzdWx0KCdmYWlsdXJlcy9leHBl Y3RlZC9jcmFzaC5odG1sJyksIFRydWUsIHRlc3RfaXNfc2xvdykKLSAgICAgICAgdW5leHBlY3Rl ZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jlc3VsdHMocG9ydCwgZXhwLCBycywgcmV0cnksIG9ubHlf dW5leHBlY3RlZD1UcnVlKQotICAgICAgICBleHBlY3RlZF9yZXN1bHRzID0gc3VtbWFyaXplX3Jl c3VsdHMocG9ydCwgZXhwLCBycywgcmV0cnksIG9ubHlfdW5leHBlY3RlZD1GYWxzZSkKLSAgICAg ICAgcmV0dXJuIGV4cGVjdGVkX3Jlc3VsdHMsIHVuZXhwZWN0ZWRfcmVzdWx0cworICAgICAgICBl bHNlOgorICAgICAgICAgICAgcmV0cnkgPSBOb25lCisKKyAgICAgICAgcmV0dXJuIHN1bW1hcml6 ZV9yZXN1bHRzKHBvcnQsIGV4cCwgcnMsIHJldHJ5KQogCiAgICAgZGVmIHRlc3Rfbm9fc3ZuX3Jl dmlzaW9uKHNlbGYpOgogICAgICAgICBob3N0ID0gTW9ja0hvc3QoaW5pdGlhbGl6ZV9zY21fYnlf ZGVmYXVsdD1GYWxzZSkKICAgICAgICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVz dCcpCi0gICAgICAgIGV4cGVjdGVkX3Jlc3VsdHMsIHVuZXhwZWN0ZWRfcmVzdWx0cyA9IHNlbGYu c3VtbWFyaXplZF9yZXN1bHRzKHBvcnQsIGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBm bGFreT1GYWxzZSkKLSAgICAgICAgc2VsZi5hc3NlcnRUcnVlKCdyZXZpc2lvbicgbm90IGluIHVu ZXhwZWN0ZWRfcmVzdWx0cykKKyAgICAgICAgc3VtbWFyaXplZF9yZXN1bHRzID0gc2VsZi5zdW1t YXJpemVkX3Jlc3VsdHMocG9ydCwgZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5 PUZhbHNlKQorICAgICAgICBzZWxmLmFzc2VydFRydWUoJ3JldmlzaW9uJyBub3QgaW4gc3VtbWFy aXplZF9yZXN1bHRzKQogCiAgICAgZGVmIHRlc3Rfc3ZuX3JldmlzaW9uKHNlbGYpOgogICAgICAg ICBob3N0ID0gTW9ja0hvc3QoaW5pdGlhbGl6ZV9zY21fYnlfZGVmYXVsdD1GYWxzZSkKICAgICAg ICAgcG9ydCA9IGhvc3QucG9ydF9mYWN0b3J5LmdldCgndGVzdCcpCiAgICAgICAgIHBvcnQuX29w dGlvbnMuYnVpbGRlcl9uYW1lID0gJ2R1bW15IGJ1aWxkZXInCi0gICAgICAgIGV4cGVjdGVkX3Jl c3VsdHMsIHVuZXhwZWN0ZWRfcmVzdWx0cyA9IHNlbGYuc3VtbWFyaXplZF9yZXN1bHRzKHBvcnQs IGV4cGVjdGVkPUZhbHNlLCBwYXNzaW5nPUZhbHNlLCBmbGFreT1GYWxzZSkKLSAgICAgICAgc2Vs Zi5hc3NlcnROb3RFcXVhbHModW5leHBlY3RlZF9yZXN1bHRzWydyZXZpc2lvbiddLCAnJykKKyAg ICAgICAgc3VtbWFyaXplZF9yZXN1bHRzID0gc2VsZi5zdW1tYXJpemVkX3Jlc3VsdHMocG9ydCwg ZXhwZWN0ZWQ9RmFsc2UsIHBhc3Npbmc9RmFsc2UsIGZsYWt5PUZhbHNlKQorICAgICAgICBzZWxm LmFzc2VydE5vdEVxdWFscyhzdW1tYXJpemVkX3Jlc3VsdHNbJ3JldmlzaW9uJ10sICcnKQogCiAg ICAgZGVmIHRlc3Rfc3VtbWFyaXplZF9yZXN1bHRzX3dvbnRmaXgoc2VsZik6CiAgICAgICAgIGhv c3QgPSBNb2NrSG9zdCgpCiAgICAgICAgIHBvcnQgPSBob3N0LnBvcnRfZmFjdG9yeS5nZXQoJ3Rl c3QnKQogICAgICAgICBwb3J0Ll9vcHRpb25zLmJ1aWxkZXJfbmFtZSA9ICdkdW1teSBidWlsZGVy JwogICAgICAgICBwb3J0Ll9maWxlc3lzdGVtLndyaXRlX3RleHRfZmlsZShwb3J0Ll9maWxlc3lz dGVtLmpvaW4ocG9ydC5sYXlvdXRfdGVzdHNfZGlyKCksICJmYWlsdXJlcy9leHBlY3RlZC93b250 Zml4Lmh0bWwiKSwgIkR1bW15IHRlc3QgY29udGVudHMiKQotICAgICAgICBleHBlY3RlZF9yZXN1 bHRzLCB1bmV4cGVjdGVkX3Jlc3VsdHMgPSBzZWxmLnN1bW1hcml6ZWRfcmVzdWx0cyhwb3J0LCBl eHBlY3RlZD1GYWxzZSwgcGFzc2luZz1GYWxzZSwgZmxha3k9RmFsc2UsIGV4dHJhX3Rlc3RzPVsn ZmFpbHVyZXMvZXhwZWN0ZWQvd29udGZpeC5odG1sJ10sIGV4dHJhX2V4cGVjdGF0aW9ucz0nQnVn KHgpIGZhaWx1cmVzL2V4cGVjdGVkL3dvbnRmaXguaHRtbCBbIFdvbnRGaXggXVxuJykKLSAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGV4cGVjdGVkX3Jlc3VsdHNbJ3Rlc3RzJ11bJ2ZhaWx1cmVzJ11b J2V4cGVjdGVkJ11bJ3dvbnRmaXguaHRtbCddWyd3b250Zml4J10pCisgICAgICAgIHN1bW1hcml6 ZWRfcmVzdWx0cyA9IHNlbGYuc3VtbWFyaXplZF9yZXN1bHRzKHBvcnQsIGV4cGVjdGVkPUZhbHNl LCBwYXNzaW5nPUZhbHNlLCBmbGFreT1GYWxzZSwgZXh0cmFfdGVzdHM9WydmYWlsdXJlcy9leHBl Y3RlZC93b250Zml4Lmh0bWwnXSwgZXh0cmFfZXhwZWN0YXRpb25zPSdCdWcoeCkgZmFpbHVyZXMv ZXhwZWN0ZWQvd29udGZpeC5odG1sIFsgV29udEZpeCBdXG4nKQorICAgICAgICBzZWxmLmFzc2Vy dFRydWUoc3VtbWFyaXplZF9yZXN1bHRzWyd0ZXN0cyddWydmYWlsdXJlcyddWydleHBlY3RlZCdd Wyd3b250Zml4Lmh0bWwnXVsnd29udGZpeCddKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQppbmRleCA3ZjQ0OWY3NjgwMDNk YmI2OWM5MDIwYWM3OTE0MDAwNWI5Yjk3NjdiLi5kZTYxNWY5NWU3YzMyZmUwMGI1ZTQ5MTE1OWE3 MWEwNTU5NzEzMjVhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy92aWV3cy9wcmludGluZy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy92aWV3cy9wcmludGluZy5weQpAQCAtMTQ4LDEzICsxNDgsMTMgQEAgY2xhc3MgUHJp bnRlcihvYmplY3QpOgogICAgICAgICAgICAgbmRpZ2l0cyA9IGludChtYXRoLmxvZzEwKGxlbihu dW0pKSkgKyAxCiAgICAgICAgIHJldHVybiBuZGlnaXRzCiAKLSAgICBkZWYgcHJpbnRfcmVzdWx0 cyhzZWxmLCBydW5fdGltZSwgcmVzdWx0X3N1bW1hcnksIHVuZXhwZWN0ZWRfcmVzdWx0cyk6Cisg ICAgZGVmIHByaW50X3Jlc3VsdHMoc2VsZiwgcnVuX3RpbWUsIHJlc3VsdF9zdW1tYXJ5LCBzdW1t YXJpemVkX3Jlc3VsdHMpOgogICAgICAgICBzZWxmLl9wcmludF90aW1pbmdfc3RhdGlzdGljcyhy dW5fdGltZSwgcmVzdWx0X3N1bW1hcnkpCiAgICAgICAgIHNlbGYuX3ByaW50X3Jlc3VsdF9zdW1t YXJ5KHJlc3VsdF9zdW1tYXJ5KQogICAgICAgICBzZWxmLl9wcmludF9vbmVfbGluZV9zdW1tYXJ5 KHJlc3VsdF9zdW1tYXJ5LnRvdGFsIC0gcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWRfc2tpcHMsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkuZXhwZWN0 ZWQgLSByZXN1bHRfc3VtbWFyeS5leHBlY3RlZF9za2lwcywKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZXN1bHRfc3VtbWFyeS51bmV4cGVjdGVkKQotICAgICAgICBzZWxm Ll9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHModW5leHBlY3RlZF9yZXN1bHRzKQorICAgICAgICBz ZWxmLl9wcmludF91bmV4cGVjdGVkX3Jlc3VsdHMoc3VtbWFyaXplZF9yZXN1bHRzKQogCiAgICAg ZGVmIF9wcmludF90aW1pbmdfc3RhdGlzdGljcyhzZWxmLCB0b3RhbF90aW1lLCByZXN1bHRfc3Vt bWFyeSk6CiAgICAgICAgIHNlbGYuX3ByaW50X2RlYnVnKCJUZXN0IHRpbWluZzoiKQpAQCAtNDIz LDcgKzQyMyw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIHJlbHBhdGgg PSAnPG5vbmU+JwogICAgICAgICBzZWxmLl9wcmludF9kZWZhdWx0KCcgICVzOiAlcycgJSAoZXh0 ZW5zaW9uWzE6XSwgcmVscGF0aCkpCiAKLSAgICBkZWYgX3ByaW50X3VuZXhwZWN0ZWRfcmVzdWx0 cyhzZWxmLCB1bmV4cGVjdGVkX3Jlc3VsdHMpOgorICAgIGRlZiBfcHJpbnRfdW5leHBlY3RlZF9y ZXN1bHRzKHNlbGYsIHN1bW1hcml6ZWRfcmVzdWx0cyk6CiAgICAgICAgICMgUHJpbnRzIHRvIHRo ZSBidWlsZGJvdCBzdHJlYW0KICAgICAgICAgcGFzc2VzID0ge30KICAgICAgICAgZmxha3kgPSB7 fQpAQCAtNDM1LDYgKzQzNSwxNCBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgIGRl ZiBhZGRfcmVzdWx0KHRlc3QsIHJlc3VsdHMsIHBhc3Nlcz1wYXNzZXMsIGZsYWt5PWZsYWt5LCBy ZWdyZXNzaW9ucz1yZWdyZXNzaW9ucyk6CiAgICAgICAgICAgICBhY3R1YWwgPSByZXN1bHRzWydh Y3R1YWwnXS5zcGxpdCgiICIpCiAgICAgICAgICAgICBleHBlY3RlZCA9IHJlc3VsdHNbJ2V4cGVj dGVkJ10uc3BsaXQoIiAiKQorCisgICAgICAgICAgICBkZWYgaXNfZXhwZWN0ZWQocmVzdWx0KToK KyAgICAgICAgICAgICAgICByZXR1cm4gKHJlc3VsdCBpbiBleHBlY3RlZCkgb3IgKHJlc3VsdCBp biAoJ1RFWFQnLCAnSU1BR0UrVEVYVCcpIGFuZCAnRkFJTCcgaW4gZXhwZWN0ZWQpCisKKyAgICAg ICAgICAgIGlmIGFsbChpc19leHBlY3RlZChhY3R1YWxfcmVzdWx0KSBmb3IgYWN0dWFsX3Jlc3Vs dCBpbiBhY3R1YWwpOgorICAgICAgICAgICAgICAgICMgRG9uJ3QgcHJpbnQgYW55dGhpbmcgZm9y IHRlc3RzIHRoYXQgcmFuIGFzIGV4cGVjdGVkLgorICAgICAgICAgICAgICAgIHJldHVybgorCiAg ICAgICAgICAgICBpZiBhY3R1YWwgPT0gWydQQVNTJ106CiAgICAgICAgICAgICAgICAgaWYgJ0NS QVNIJyBpbiBleHBlY3RlZDoKICAgICAgICAgICAgICAgICAgICAgYWRkX3RvX2RpY3Rfb2ZfbGlz dHMocGFzc2VzLCAnRXhwZWN0ZWQgdG8gY3Jhc2gsIGJ1dCBwYXNzZWQnLCB0ZXN0KQpAQCAtNDQ4 LDcgKzQ1Niw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIGVsc2U6CiAg ICAgICAgICAgICAgICAgYWRkX3RvX2RpY3Rfb2ZfbGlzdHMocmVncmVzc2lvbnMsIHJlc3VsdHNb J2FjdHVhbCddLCB0ZXN0KQogCi0gICAgICAgIHJlc3VsdHNqc29ucGFyc2VyLmZvcl9lYWNoX3Rl c3QodW5leHBlY3RlZF9yZXN1bHRzWyd0ZXN0cyddLCBhZGRfcmVzdWx0KQorICAgICAgICByZXN1 bHRzanNvbnBhcnNlci5mb3JfZWFjaF90ZXN0KHN1bW1hcml6ZWRfcmVzdWx0c1sndGVzdHMnXSwg YWRkX3Jlc3VsdCkKIAogICAgICAgICBpZiBsZW4ocGFzc2VzKSBvciBsZW4oZmxha3kpIG9yIGxl bihyZWdyZXNzaW9ucyk6CiAgICAgICAgICAgICBzZWxmLl9wcmludF9mb3JfYm90KCIiKQpAQCAt NDY5LDcgKzQ3Nyw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICB0 ZXN0cy5zb3J0KCkKIAogICAgICAgICAgICAgICAgIGZvciB0ZXN0IGluIHRlc3RzOgotICAgICAg ICAgICAgICAgICAgICByZXN1bHQgPSByZXN1bHRzanNvbnBhcnNlci5yZXN1bHRfZm9yX3Rlc3Qo dW5leHBlY3RlZF9yZXN1bHRzWyd0ZXN0cyddLCB0ZXN0KQorICAgICAgICAgICAgICAgICAgICBy ZXN1bHQgPSByZXN1bHRzanNvbnBhcnNlci5yZXN1bHRfZm9yX3Rlc3Qoc3VtbWFyaXplZF9yZXN1 bHRzWyd0ZXN0cyddLCB0ZXN0KQogICAgICAgICAgICAgICAgICAgICBhY3R1YWwgPSByZXN1bHRb J2FjdHVhbCddLnNwbGl0KCIgIikKICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWQgPSByZXN1 bHRbJ2V4cGVjdGVkJ10uc3BsaXQoIiAiKQogICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBU ZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OU1trZXkubG93ZXIoKV0KQEAgLTQ4OSw3ICs0OTcs NyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIHNlbGYuX3By aW50X2Zvcl9ib3QoIiAgJXMgWyAlcyBdIiAlICh0ZXN0LCBUZXN0RXhwZWN0YXRpb25QYXJzZXIu X2ludmVydGVkX2V4cGVjdGF0aW9uX3Rva2Vuc1trZXldKSkKICAgICAgICAgICAgICAgICBzZWxm Ll9wcmludF9mb3JfYm90KCIiKQogCi0gICAgICAgIGlmIGxlbih1bmV4cGVjdGVkX3Jlc3VsdHNb J3Rlc3RzJ10pIGFuZCBzZWxmLl9vcHRpb25zLmRlYnVnX3J3dF9sb2dnaW5nOgorICAgICAgICBp ZiBsZW4oc3VtbWFyaXplZF9yZXN1bHRzWyd0ZXN0cyddKSBhbmQgc2VsZi5fb3B0aW9ucy5kZWJ1 Z19yd3RfbG9nZ2luZzoKICAgICAgICAgICAgIHNlbGYuX3ByaW50X2Zvcl9ib3QoIiVzIiAlICgi LSIgKiA3OCkpCiAKICAgICBkZWYgX3ByaW50X3F1aWV0KHNlbGYsIG1zZyk6CmRpZmYgLS1naXQg YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50 aW5nX3VuaXR0ZXN0LnB5CmluZGV4IGI1NzJiMDNmZjI2ZTM3MzVmOTQzODE0NGExZGFiMjVmMGNl OGFmODEuLmFhNzk1OTJhM2M5ZTczN2I4NjJkNDJkMDlkNzlkOGI3M2M3YWNmYjYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3Vu aXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdz L3ByaW50aW5nX3VuaXR0ZXN0LnB5CkBAIC0xOTMsMTQgKzE5MywxMyBAQCBjbGFzcyAgVGVzdHBy aW50ZXIodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgICAgIHJzLmFkZChzZWxmLmdl dF9yZXN1bHQoJ3Bhc3Nlcy90ZXh0Lmh0bWwnLCB0ZXN0X2V4cGVjdGF0aW9ucy5USU1FT1VUKSwg ZXhwZWN0ZWQsIHRlc3RfaXNfc2xvdykKICAgICAgICAgICAgICAgICBycy5hZGQoc2VsZi5nZXRf cmVzdWx0KCdmYWlsdXJlcy9leHBlY3RlZC90aW1lb3V0Lmh0bWwnLCB0ZXN0X2V4cGVjdGF0aW9u cy5DUkFTSCksIGV4cGVjdGVkLCB0ZXN0X2lzX3Nsb3cpCiAgICAgICAgICAgICAgICAgcnMuYWRk KHNlbGYuZ2V0X3Jlc3VsdCgnZmFpbHVyZXMvZXhwZWN0ZWQvY3Jhc2guaHRtbCcsIHRlc3RfZXhw ZWN0YXRpb25zLlRJTUVPVVQpLCBleHBlY3RlZCwgdGVzdF9pc19zbG93KQotICAgICAgICAgICAg cmV0cnkgPSBycworICAgICAgICAgICAgcmV0cnkgPSBOb25lCiAgICAgICAgICAgICBpZiBmbGFr eToKICAgICAgICAgICAgICAgICBwYXRocywgcmV0cnksIGV4cCA9IHNlbGYuZ2V0X3Jlc3VsdF9z dW1tYXJ5KHRlc3RzLCBleHBlY3RhdGlvbnMpCiAgICAgICAgICAgICAgICAgcmV0cnkuYWRkKHNl bGYuZ2V0X3Jlc3VsdCgncGFzc2VzL3RleHQuaHRtbCcpLCBUcnVlLCB0ZXN0X2lzX3Nsb3cpCiAg ICAgICAgICAgICAgICAgcmV0cnkuYWRkKHNlbGYuZ2V0X3Jlc3VsdCgnZmFpbHVyZXMvZXhwZWN0 ZWQvdGltZW91dC5odG1sJyksIFRydWUsIHRlc3RfaXNfc2xvdykKICAgICAgICAgICAgICAgICBy ZXRyeS5hZGQoc2VsZi5nZXRfcmVzdWx0KCdmYWlsdXJlcy9leHBlY3RlZC9jcmFzaC5odG1sJyks IFRydWUsIHRlc3RfaXNfc2xvdykKLSAgICAgICAgICAgIHVuZXhwZWN0ZWRfcmVzdWx0cyA9IG1h bmFnZXIuc3VtbWFyaXplX3Jlc3VsdHMoc2VsZi5fcG9ydCwgZXhwLCBycywgcmV0cnksIG9ubHlf dW5leHBlY3RlZD1UcnVlKQotICAgICAgICAgICAgcmV0dXJuIHVuZXhwZWN0ZWRfcmVzdWx0cwor ICAgICAgICAgICAgcmV0dXJuIG1hbmFnZXIuc3VtbWFyaXplX3Jlc3VsdHMoc2VsZi5fcG9ydCwg ZXhwLCBycywgcmV0cnkpCiAKICAgICAgICAgdGVzdHMgPSBbJ3Bhc3Nlcy90ZXh0Lmh0bWwnLCAn ZmFpbHVyZXMvZXhwZWN0ZWQvdGltZW91dC5odG1sJywgJ2ZhaWx1cmVzL2V4cGVjdGVkL2NyYXNo Lmh0bWwnXQogICAgICAgICBleHBlY3RhdGlvbnMgPSAnJwo=