92527 2012-07-27 12:04:30 -0700 nrwt: clean up handling of 'expected' stats in the non-default cases 2012-07-31 03:40:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 92736 89267 1 dpranke dpranke abarth ojan tony oldest_to_newest 680913 0 dpranke 2012-07-27 12:04:30 -0700 nrwt: clean up handling of 'expected' stats and interaction with --run-part and --run-chunk 680940 1 155017 dpranke 2012-07-27 12:18:06 -0700 Created attachment 155017 Patch 680948 2 dpranke 2012-07-27 12:20:33 -0700 the interplay of --iterations, --repeat-each, -run-part, and -run-chunk with the way we logged how many tests to run and what we expected the results to be was confusing and badly layered. This patch attempts to clean that up, and was necessary in order to split the finding, chunking, and sharding of tests out from the running of tests without having all sorts of weird callbacks. Apart from logging slightly different numbers, there should be no functional changes in this patch; in particular; the contents of results.json should be unchanged. 682470 3 155017 tony 2012-07-30 15:33:59 -0700 Comment on attachment 155017 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=155017&action=review > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:887 > + def add_skipped_tests(self, tests_to_skip, wontfix=True): I don't see either of the callers passing in False for wontfix. Can we drop this param? 682519 4 dpranke 2012-07-30 16:40:08 -0700 (In reply to comment #3) > (From update of attachment 155017 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=155017&action=review > > > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:887 > > + def add_skipped_tests(self, tests_to_skip, wontfix=True): > > I don't see either of the callers passing in False for wontfix. Can we drop this param? Good catch. It's not clear when tests skipped via the Skipped file, the command line, or because we're only running parts of the test should be WONTFIX or not, but I'm not sure it matters that much, either. 682530 5 155400 dpranke 2012-07-30 16:51:03 -0700 Created attachment 155400 remove wontfix from add_skipped_tests, expectation_for_skipped_tests 682538 6 dpranke 2012-07-30 17:02:03 -0700 Committed r124116: <http://trac.webkit.org/changeset/124116> 155017 2012-07-27 12:18:06 -0700 2012-07-30 16:51:00 -0700 Patch bug-92527-20120727121753.patch text/plain 22574 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIzODk4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDBhMDU1N2U2MzY2YjhmMmMyODhjNjE0ODgxYzlhMDUz Y2U0YmNmMy4uZWFiYzExYzNiMzllYWYxNGE3YmY5ZTkyM2MyMzIyMjU2ZjgwZmFmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDc0 IEBACiAyMDEyLTA3LTI3ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIGhhbmRsaW5nIG9mICdleHBlY3RlZCcgc3RhdHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNTI3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHRl cnMgdGhlIHdheSB3ZSBjb21wdXRlIGFuZCBsb2cgdGhlICJleHBlY3RlZCIKKyAgICAgICAgcmVz dWx0cyBhbmQgaG93IHdlIHRyZWF0IHNraXBwZWQgdGVzdHM7IHdlIHdpbGwgbm93IGxvZyB0aGUK KyAgICAgICAgbnVtYmVyIG9mIHNraXBwZWQgdGVzdHMgc2VwYXJhdGVseSBmcm9tIHRoZSBjYXRl Z29yaWVzLCBlLmcuOgorCisgICAgICAgIEZvdW5kIDMxNjA3IHRlc3RzOyBydW5uaW5nIDI0NDY0 LgorICAgICAgICBFeHBlY3Q6IDIzNDk2IHBhc3NlcyAgICgyMzQ5NiBub3csICAgIDAgd29udGZp eCkKKyAgICAgICAgRXhwZWN0OiAgIDU0OCBmYWlsdXJlcyAoICA1NDMgbm93LCAgICA1IHdvbnRm aXgpCisgICAgICAgIEV4cGVjdDogICA0MjAgZmxha3kgICAgKCAgMjQ1IG5vdywgIDE3NSB3b250 Zml4KQorCisgICAgICAgIChzbyB0aGF0IHRoZSAiZXhwZWN0IiB0b3RhbHMgYWRkIHVwIHRvIHRo ZSAicnVubmluZyIgdG90YWxzKTsKKyAgICAgICAgaW4gYWRkaXRpb24sIHRoZSB0b3RhbHMgaW4g dGhlIG9uZS1saW5lLXByb2dyZXNzIHJlZmxlY3QgdGhlCisgICAgICAgIG51bWJlciBvZiB0ZXN0 cyB3ZSB3aWxsIGFjdHVhbGx5IHJ1bi4gSWYgLS1pdGVyYXRpb25zIG9yCisgICAgICAgIC0tcmVw ZWF0LWVhY2ggYXJlIHNwZWNpZmllZCwgdGhlIG51bWJlciBvZiB0ZXN0cyB3ZSBydW4gYXJlCisg ICAgICAgIG11bHRpcGxpZWQgYXMgYXBwcm9wcmlhdGUsIGJ1dCB0aGUgImV4cGVjdCIgbnVtYmVy cyBhcmUKKyAgICAgICAgdW5jaGFuZ2VkLCBzaW5jZSB3ZSBkb24ndCBjb3VudCBtdWx0aXBsZSBp bnZvY2F0aW9ucyBvZiB0aGUgc2FtZQorICAgICAgICB0ZXN0IG11bHRpcGxlIHRpbWVzLiBJbiBh ZGRpdGlvbiwgaWYgd2UgYXJlIHVzaW5nIC0tcnVuLXBhcnQgb3IKKyAgICAgICAgLS1ydW4tY2h1 bmssIHRoZSB0ZXN0cyB3ZSBkb24ndCBydW4gYXJlIHRyZWF0ZWQgYXMgc2tpcHBlZAorICAgICAg ICBmb3IgY29uc2lzdGVuY3kuIFdlIHdpbGwgYWxzbyBsb2cgdGhlIHZhbHVlcyBmb3IgLS1pdGVy YXRpb25zCisgICAgICAgIGFuZCAtLXJlcGVhdCBlYWNoIGFzIHBhcnQgb2YgdGhlIGZvdW5kL3J1 bm5pbmcgbGluZS4KKworICAgICAgICBQcmV2aW91c2x5IHRoZSBjb2RlIGhhZCBwYXJzZWQgYW5k IHJlLXBhcnNlZCB0aGUKKyAgICAgICAgVGVzdEV4cGVjdGF0aW9ucyBmaWxlcyBzZXZlcmFsIHRp bWVzIGluIGFuIGF0dGVtcHQgdG8gY29tZSB1cAorICAgICAgICB3aXRoIHNvbWUgc2FuZSBzdGF0 aXN0aWNzLCBidXQgdGhpcyB3YXMgZXhwZW5zaXZlIGFuZCBsZWFkIHRvCisgICAgICAgIGNvbmZ1 c2luZyBsYXllcjsgdHJlYXRpbmcgZmlsZXMgYXMgc2tpcHBlZCBpbiB0aGUgd2F5IGRlc2NyaWJl ZAorICAgICAgICBhYm92ZSBpcyBtb3JlIGNvbnNpc3RlbnQgYW5kIGNsZWFuZXIuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 OgorICAgICAgICAoTWFuYWdlci5fc3BsaXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KToKKyAg ICAgICAgKE1hbmFnZXIucHJlcGFyZV9saXN0c19hbmRfcHJpbnRfb3V0cHV0KToKKyAgICAgICAg KE1hbmFnZXIucnVuKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFuYWdlclRlc3QudGVz dF9pbnRlcnJ1cHRfaWZfYXRfZmFpbHVyZV9saW1pdHMpOgorICAgICAgICAoTWFuYWdlclRlc3Qu dGVzdF91cGRhdGVfc3VtbWFyeV93aXRoX3Jlc3VsdCk6CisgICAgICAgIChNYW5hZ2VyVGVzdC50 ZXN0X2xvb2tfZm9yX25ld19jcmFzaF9sb2dzKToKKyAgICAgICAgKFJlc3VsdFN1bW1hcnlUZXN0 LmdldF9yZXN1bHRfc3VtbWFyeSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Jlc3VsdF9zdW1tYXJ5LnB5OgorICAgICAgICAoUmVzdWx0U3VtbWFyeS5f X2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Rlc3RfZXhwZWN0YXRpb25zLnB5OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uUGFyc2VyLmV4 cGVjdGF0aW9uX2Zvcl9za2lwcGVkX3Rlc3QpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5f X2luaXRfXyk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zLmFkZF9za2lwcGVkX3Rlc3RzKToK KyAgICAgICAgICBIZXJlIHdlIG1ha2UgYWRkX3NraXBwZWRfdGVzdHMoKSBwdWJsaWMsIHNvIHRo YXQgd2UgY2FuIHVwZGF0ZQorICAgICAgICAgIHRoZSBleHBlY3RhdGlvbnMgZm9yIHRlc3RzIHRo YXQgd2UgYXJlIHNraXBwaW5nIGR1ZSB0bworICAgICAgICAgIC0tcnVuLXBhcnQgb3IgLS1ydW4t Y2h1bms7IHdlIHVzZSB0aGUgd29udGZpeCBmbGFnIHNvIHRoYXQKKyAgICAgICAgICB0aGUgdGVz dHMgdGhhdCBhcmUgaW50ZW50aW9uYWxseSBza2lwcGVkIGFyZW4ndCBjb25zaWRlcmVkCisgICAg ICAgICAgImZpeGFibGUiLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weToKKyAgICAgICAgKFNraXBwZWRU ZXN0cy5jaGVjayk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5OgorICAgICAgICAoUHJp bnRlci5wcmludF9mb3VuZCk6CisgICAgICAgIChQcmludGVyKToKKyAgICAgICAgKFByaW50ZXIu cHJpbnRfZXhwZWN0ZWQpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfcmVzdWx0X3N1bW1hcnkp OgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfcmVzdWx0X3N1bW1hcnlfZW50cnkpOgorICAgICAg ICAgIEhlcmUgd2Ugc3BsaXQgb3V0IHByaW50aW5nIHRoZSBudW1iZXIgb2YgdGVzdHMgZm91bmQg YW5kIHJ1bgorICAgICAgICAgIGZyb20gdGhlIGV4cGVjdGVkIHJlc3VsdHMsIHRvIGJlIGNsZWFy ZXIgYW5kIHNvIHRoYXQgd2UgZG9uJ3QKKyAgICAgICAgICBoYXZlIHRvIHJlcGFyc2UgdGhlIGV4 cGVjdGF0aW9ucyB0byB1cGRhdGUgdGhlIHN0YXRzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVz dHByaW50ZXIuZ2V0X3Jlc3VsdF9zdW1tYXJ5KToKKworMjAxMi0wNy0yNyAgRGlyayBQcmFua2Ug IDxkcHJhbmtlQGNocm9taXVtLm9yZz4KKwogICAgICAgICBucnd0OiBtb3ZlIGNvbGxlY3RfdGVz dHMoKSwgcGFyc2VfZXhwZWN0YXRpb25zKCkgaW50byBtYW5hZ2VyCiAgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MjQyMwogCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5w eQppbmRleCAwNTQ0OTE4ZjRkOGQxOTQ1NGRkZDkzZmI4MjM4ZjJjZDhjMjQ4NzQ4Li4yY2MwNDhh YzMzMmM4Zjk5YWQzNDJkNTc5MTUwMGViZmIyNGE5ZDc1IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkK QEAgLTQyNiwyNSArNDI2LDEyIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAg IF9sb2cuZGVidWcoJyAgIGxhc3QgY2h1bmsgaXMgcGFydGlhbCwgYXBwZW5kaW5nIFswOiVkXScg JSBleHRyYSkKICAgICAgICAgICAgIGZpbGVzLmV4dGVuZCh0ZXN0X2ZpbGVzWzA6ZXh0cmFdKQog Ci0gICAgICAgIGxlbl9za2lwX2NodW5rID0gaW50KGxlbihmaWxlcykgKiBsZW4oc2tpcHBlZCkg LyBmbG9hdChsZW4oc2VsZi5fdGVzdF9maWxlcykpKQotICAgICAgICBza2lwX2NodW5rX2xpc3Qg PSBsaXN0KHNraXBwZWQpWzA6bGVuX3NraXBfY2h1bmtdCi0gICAgICAgIHNraXBfY2h1bmsgPSBz ZXQoc2tpcF9jaHVua19saXN0KQotCi0gICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSB0b3RhbCBo YWNrLgotICAgICAgICAjIFVwZGF0ZSBleHBlY3RhdGlvbnMgc28gdGhhdCB0aGUgc3RhdHMgYXJl IGNhbGN1bGF0ZWQgY29ycmVjdGx5LgotICAgICAgICAjIFdlIG5lZWQgdG8gcGFzcyBhIGxpc3Qg dGhhdCBpbmNsdWRlcyB0aGUgcmlnaHQgIyBvZiBza2lwcGVkIGZpbGVzCi0gICAgICAgICMgdG8g UGFyc2VFeHBlY3RhdGlvbnMgc28gdGhhdCBSZXN1bHRTdW1tYXJ5KCkgd2lsbCBnZXQgdGhlIGNv cnJlY3QKLSAgICAgICAgIyBzdGF0cy4gU28sIHdlIGFkZCBpbiB0aGUgc3Vic2V0IG9mIHNraXBw ZWQgZmlsZXMsIGFuZCB0aGVuCi0gICAgICAgICMgc3VidHJhY3QgdGhlbSBiYWNrIG91dC4KLSAg ICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0gZmlsZXMgKyBza2lwX2NodW5rX2xpc3QKLSAg ICAgICAgc2VsZi5fdGVzdF9maWxlcyA9IHNldChzZWxmLl90ZXN0X2ZpbGVzX2xpc3QpCi0KLSAg ICAgICAgc2VsZi5fcGFyc2VfZXhwZWN0YXRpb25zKCkKLQotICAgICAgICBzZWxmLl90ZXN0X2Zp bGVzID0gc2V0KGZpbGVzKQorICAgICAgICB0ZXN0c190b19ydW4gPSBzZXQoZmlsZXMpCisgICAg ICAgIG1vcmVfdGVzdHNfdG9fc2tpcCA9IHNlbGYuX3Rlc3RfZmlsZXMgLSB0ZXN0c190b19ydW4K KyAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zLmFkZF9za2lwcGVkX3Rlc3RzKG1vcmVfdGVzdHNf dG9fc2tpcCkKKyAgICAgICAgc2VsZi5fdGVzdF9maWxlcyA9IHRlc3RzX3RvX3J1bgogICAgICAg ICBzZWxmLl90ZXN0X2ZpbGVzX2xpc3QgPSBmaWxlcwotCi0gICAgICAgIHJldHVybiBza2lwX2No dW5rCisgICAgICAgIHJldHVybiBza2lwcGVkLnVuaW9uKG1vcmVfdGVzdHNfdG9fc2tpcCkKIAog ICAgICMgRklYTUU6IFRoaXMgbWV0aG9kIGlzIHdheSB0b28gbG9uZyBhbmQgbmVlZHMgdG8gYmUg YnJva2VuIGludG8gcGllY2VzLgogICAgIGRlZiBwcmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRw dXQoc2VsZik6CkBAIC00OTAsOSArNDc3LDggQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAg ICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0LnNvcnQoa2V5PWxh bWJkYSB0ZXN0OiB0ZXN0X2tleShzZWxmLl9wb3J0LCB0ZXN0KSkKIAotICAgICAgICBza2lwcGVk ID0gc2VsZi5fc3BsaXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KHNraXBwZWQpCisgICAgICAg IGFsbF90ZXN0c190b19za2lwID0gc2VsZi5fc3BsaXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5 KHNraXBwZWQpCiAKLSAgICAgICAgIyBGSVhNRTogSXQncyB1bmNsZWFyIGhvdyAtLXJlcGVhdC1l YWNoIGFuZCAtLWl0ZXJhdGlvbnMgc2hvdWxkIGludGVyYWN0IHdpdGggY2h1bmtzPwogICAgICAg ICBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoOgogICAgICAgICAgICAgbGlzdF93aXRoX3Jl cGV0aXRpb25zID0gW10KICAgICAgICAgICAgIGZvciB0ZXN0IGluIHNlbGYuX3Rlc3RfZmlsZXNf bGlzdDoKQEAgLTUwMiwyMiArNDg4LDExIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAg ICAgaWYgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9m aWxlc19saXN0ID0gc2VsZi5fdGVzdF9maWxlc19saXN0ICogc2VsZi5fb3B0aW9ucy5pdGVyYXRp b25zCiAKLSAgICAgICAgaXRlcmF0aW9ucyA9ICBcCi0gICAgICAgICAgICAoc2VsZi5fb3B0aW9u cy5yZXBlYXRfZWFjaCBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoIGVsc2UgMSkgKiBcCi0g ICAgICAgICAgICAoc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zIGlmIHNlbGYuX29wdGlvbnMuaXRl cmF0aW9ucyBlbHNlIDEpCi0gICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShz ZWxmLl9leHBlY3RhdGlvbnMsIHNlbGYuX3Rlc3RfZmlsZXMgfCBza2lwcGVkLCBpdGVyYXRpb25z KQotCi0gICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQobnVtX2FsbF90ZXN0X2Zp bGVzLCByZXN1bHRfc3VtbWFyeSwgc2VsZi5fZXhwZWN0YXRpb25zLmdldF90ZXN0c193aXRoX3Jl c3VsdF90eXBlKQorICAgICAgICBpdGVyYXRpb25zID0gc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFj aCAqIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucworICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJl c3VsdFN1bW1hcnkoc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl90ZXN0X2ZpbGVzLCBpdGVyYXRp b25zLCBhbGxfdGVzdHNfdG9fc2tpcCkKIAotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNraXBw ZWQgIT0gJ2lnbm9yZSc6Ci0gICAgICAgICAgICAjIE5vdGUgdGhhdCB3ZSBkb24ndCBhY3R1YWxs eSBydW4gdGhlIHNraXBwZWQgdGVzdHMgKHRoZXkgd2VyZQotICAgICAgICAgICAgIyBzdWJ0cmFj dGVkIG91dCBvZiBzZWxmLl90ZXN0X2ZpbGVzLCBhYm92ZSksIGJ1dCB3ZSBzdHViIG91dCB0aGUK LSAgICAgICAgICAgICMgcmVzdWx0cyBoZXJlIHNvIHRoZSBzdGF0aXN0aWNzIGNhbiByZW1haW4g YWNjdXJhdGUuCi0gICAgICAgICAgICBmb3IgdGVzdCBpbiBza2lwcGVkOgotICAgICAgICAgICAg ICAgIHJlc3VsdCA9IHRlc3RfcmVzdWx0cy5UZXN0UmVzdWx0KHRlc3QpCi0gICAgICAgICAgICAg ICAgcmVzdWx0LnR5cGUgPSB0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQCi0gICAgICAgICAgICAgICAg Zm9yIGl0ZXJhdGlvbiBpbiByYW5nZShpdGVyYXRpb25zKToKLSAgICAgICAgICAgICAgICAgICAg cmVzdWx0X3N1bW1hcnkuYWRkKHJlc3VsdCwgZXhwZWN0ZWQ9VHJ1ZSwgdGVzdF9pc19zbG93PXNl bGYuX3Rlc3RfaXNfc2xvdyh0ZXN0KSkKKyAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9mb3Vu ZChudW1fYWxsX3Rlc3RfZmlsZXMsIGxlbihzZWxmLl90ZXN0X2ZpbGVzKSwgc2VsZi5fb3B0aW9u cy5yZXBlYXRfZWFjaCwgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQorICAgICAgICBzZWxmLl9w cmludGVyLnByaW50X2V4cGVjdGVkKHJlc3VsdF9zdW1tYXJ5LCBzZWxmLl9leHBlY3RhdGlvbnMu Z2V0X3Rlc3RzX3dpdGhfcmVzdWx0X3R5cGUpCiAKICAgICAgICAgcmV0dXJuIHJlc3VsdF9zdW1t YXJ5CiAKQEAgLTg2OSw3ICs4NDQsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAg ICAgICBfbG9nLmluZm8oIlJldHJ5aW5nICVkIHVuZXhwZWN0ZWQgZmFpbHVyZShzKSAuLi4iICUg bGVuKGZhaWx1cmVzKSkKICAgICAgICAgICAgIF9sb2cuaW5mbygnJykKICAgICAgICAgICAgIHNl bGYuX3JldHJ5aW5nID0gVHJ1ZQotICAgICAgICAgICAgcmV0cnlfc3VtbWFyeSA9IFJlc3VsdFN1 bW1hcnkoc2VsZi5fZXhwZWN0YXRpb25zLCBmYWlsdXJlcy5rZXlzKCkpCisgICAgICAgICAgICBy ZXRyeV9zdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShzZWxmLl9leHBlY3RhdGlvbnMsIGZhaWx1cmVz LmtleXMoKSwgMSwgc2V0KCkpCiAgICAgICAgICAgICAjIE5vdGUgdGhhdCB3ZSBpbnRlbnRpb25h bGx5IGlnbm9yZSB0aGUgcmV0dXJuIHZhbHVlIGhlcmUuCiAgICAgICAgICAgICBzZWxmLl9ydW5f dGVzdHMoZmFpbHVyZXMua2V5cygpLCByZXRyeV9zdW1tYXJ5LCBudW1fd29ya2Vycz0xKQogICAg ICAgICAgICAgZmFpbHVyZXMgPSBzZWxmLl9nZXRfZmFpbHVyZXMocmV0cnlfc3VtbWFyeSwgaW5j bHVkZV9jcmFzaGVzPVRydWUsIGluY2x1ZGVfbWlzc2luZz1UcnVlKQpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJz L21hbmFnZXJfdW5pdHRlc3QucHkKaW5kZXggNTc2ZDQyM2FmZjEzODBjYmJjOGY2MmUwNjA4ZTU5 YTBhMjQzYWIzMi4uZDEzYjFiNTlmMGQwZDA3NzU4ZjEwYzg5MWNmZDQyMGIxYWQ4MTFmNiAxMDA2 NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMv bWFuYWdlcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CkBAIC00NSw3ICs0NSw2IEBAIGZy b20gd2Via2l0cHkgaW1wb3J0IGxheW91dF90ZXN0cwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVz dHMgaW1wb3J0IHJ1bl93ZWJraXRfdGVzdHMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmNv bnRyb2xsZXJzIGltcG9ydCBtYW5hZ2VyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250 cm9sbGVycy5tYW5hZ2VyIGltcG9ydCBpbnRlcnByZXRfdGVzdF9mYWlsdXJlcywgIE1hbmFnZXIs IG5hdHVyYWxfc29ydF9rZXksIHRlc3Rfa2V5LCBUZXN0UnVuSW50ZXJydXB0ZWRFeGNlcHRpb24s IFRlc3RTaGFyZAotZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCByZXN1 bHRfc3VtbWFyeQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0 X2V4cGVjdGF0aW9ucwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0 ZXN0X2ZhaWx1cmVzCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRl c3RfcmVzdWx0cwpAQCAtMjg4LDcgKzI4Nyw3IEBAIGNsYXNzIE1hbmFnZXJUZXN0KHVuaXR0ZXN0 LlRlc3RDYXNlKToKICAgICAgICAgbWFuYWdlci5fdGVzdF9maWxlcyA9IFsnZm9vL2Jhci5odG1s JywgJ2Jhei5odG1sJ10KICAgICAgICAgbWFuYWdlci5fdGVzdF9pc19zbG93ID0gbGFtYmRhIHRl c3RfbmFtZTogRmFsc2UKIAotICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnko ZXhwZWN0YXRpb25zPU1vY2soKSwgdGVzdF9maWxlcz1tYW5hZ2VyLl90ZXN0X2ZpbGVzKQorICAg ICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoTW9jaygpLCBtYW5hZ2VyLl90ZXN0 X2ZpbGVzLCAxLCBzZXQoKSkKICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZF9mYWls dXJlcyA9IDEwMAogICAgICAgICByZXN1bHRfc3VtbWFyeS51bmV4cGVjdGVkX2NyYXNoZXMgPSA1 MAogICAgICAgICByZXN1bHRfc3VtbWFyeS51bmV4cGVjdGVkX3RpbWVvdXRzID0gNTAKQEAgLTMy MCw3ICszMTksNyBAQCBjbGFzcyBNYW5hZ2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgICMgUmVmdGVzdHMgZXhwZWN0ZWQgdG8gYmUgaW1hZ2UgbWlzbWF0Y2ggc2hvdWxkIGJlIHJl c3BlY3RlZCB3aGVuIHBpeGVsX3Rlc3RzPUZhbHNlLgogICAgICAgICBtYW5hZ2VyID0gTWFuYWdl cihwb3J0PXBvcnQsIG9wdGlvbnM9TW9ja09wdGlvbnMocGl4ZWxfdGVzdHM9RmFsc2UsIGV4aXRf YWZ0ZXJfbl9mYWlsdXJlcz1Ob25lLCBleGl0X2FmdGVyX25fY3Jhc2hlc19vcl90aW1lb3V0cz1O b25lKSwgcHJpbnRlcj1Nb2NrKCkpCiAgICAgICAgIG1hbmFnZXIuX2V4cGVjdGF0aW9ucyA9IGV4 cGVjdGF0aW9ucwotICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoZXhwZWN0 YXRpb25zPWV4cGVjdGF0aW9ucywgdGVzdF9maWxlcz1bdGVzdF0pCisgICAgICAgIHJlc3VsdF9z dW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShleHBlY3RhdGlvbnMsIFt0ZXN0XSwgMSwgc2V0KCkpCiAg ICAgICAgIHJlc3VsdCA9IFRlc3RSZXN1bHQodGVzdF9uYW1lPXRlc3QsIGZhaWx1cmVzPVt0ZXN0 X2ZhaWx1cmVzLkZhaWx1cmVSZWZ0ZXN0TWlzbWF0Y2hEaWROb3RPY2N1cigpXSkKICAgICAgICAg bWFuYWdlci5fdXBkYXRlX3N1bW1hcnlfd2l0aF9yZXN1bHQocmVzdWx0X3N1bW1hcnksIHJlc3Vs dCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoMSwgcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWQp CkBAIC0zNzMsNyArMzcyLDcgQEAgY2xhc3MgTWFuYWdlclRlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBwb3J0ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0LW1hYy1sZW9wYXJk JykKICAgICAgICAgdGVzdHMgPSBbJ2ZhaWx1cmVzL2V4cGVjdGVkL2NyYXNoLmh0bWwnXQogICAg ICAgICBleHBlY3RhdGlvbnMgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRpb25zKHBv cnQsIHRlc3RzKQotICAgICAgICBycyA9IHJlc3VsdF9zdW1tYXJ5LlJlc3VsdFN1bW1hcnkoZXhw ZWN0YXRpb25zLCB0ZXN0cykKKyAgICAgICAgcnMgPSBSZXN1bHRTdW1tYXJ5KGV4cGVjdGF0aW9u cywgdGVzdHMsIDEsIHNldCgpKQogICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0aF90 ZXN0cyh0ZXN0cykKICAgICAgICAgbWFuYWdlci5fbG9va19mb3JfbmV3X2NyYXNoX2xvZ3MocnMs IHRpbWUudGltZSgpKQogCkBAIC01MDksNyArNTA4LDcgQEAgY2xhc3MgUmVzdWx0U3VtbWFyeVRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBnZXRfcmVzdWx0X3N1bW1hcnkoc2VsZiwg cG9ydCwgdGVzdF9uYW1lcywgZXhwZWN0YXRpb25zX3N0cik6CiAgICAgICAgIHBvcnQuZXhwZWN0 YXRpb25zX2RpY3QgPSBsYW1iZGE6IHsnJzogZXhwZWN0YXRpb25zX3N0cn0KICAgICAgICAgZXhw ZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCB0ZXN0 X25hbWVzKQotICAgICAgICByZXR1cm4gdGVzdF9uYW1lcywgcmVzdWx0X3N1bW1hcnkuUmVzdWx0 U3VtbWFyeShleHBlY3RhdGlvbnMsIHRlc3RfbmFtZXMpLCBleHBlY3RhdGlvbnMKKyAgICAgICAg cmV0dXJuIHRlc3RfbmFtZXMsIFJlc3VsdFN1bW1hcnkoZXhwZWN0YXRpb25zLCB0ZXN0X25hbWVz LCAxLCBzZXQoKSksIGV4cGVjdGF0aW9ucwogCiAgICAgIyBGSVhNRTogVXNlIHRoaXMgdG8gdGVz dCBtb3JlIG9mIHN1bW1hcml6ZV9yZXN1bHRzLiBUaGlzIHdhcyBtb3ZlZCBmcm9tIHByaW50aW5n X3VuaXR0ZXN0LnB5LgogICAgIGRlZiBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZiwgcG9ydCwgZXhw ZWN0ZWQsIHBhc3NpbmcsIGZsYWt5LCBleHRyYV90ZXN0cz1bXSwgZXh0cmFfZXhwZWN0YXRpb25z PU5vbmUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bW9kZWxzL3Jlc3VsdF9zdW1tYXJ5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Jlc3VsdF9zdW1tYXJ5LnB5CmluZGV4IGIwNTEyMTI3ZmJkNTBiYTUxZDVj YjE1NzFkNmJiMDE5OGZhNjliZGIuLjViYjUwMTA2MTc5NmU1MjdlYzQ0MmI3OTg0ZjJiMzc0YWJi YWI0ZjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21v ZGVscy9yZXN1bHRfc3VtbWFyeS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9tb2RlbHMvcmVzdWx0X3N1bW1hcnkucHkKQEAgLTMxLDcgKzMxLDcgQEAgZnJvbSB3 ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfZXhwZWN0YXRpb25zIGltcG9ydCBUZXN0 RXhwZWN0YXRpb25zLCBTS0kKIAogCiBjbGFzcyBSZXN1bHRTdW1tYXJ5KG9iamVjdCk6Ci0gICAg ZGVmIF9faW5pdF9fKHNlbGYsIGV4cGVjdGF0aW9ucywgdGVzdF9maWxlcywgaXRlcmF0aW9ucz0x KToKKyAgICBkZWYgX19pbml0X18oc2VsZiwgZXhwZWN0YXRpb25zLCB0ZXN0X2ZpbGVzLCBpdGVy YXRpb25zLCBleHBlY3RlZF9za2lwcyk6CiAgICAgICAgIHNlbGYudG90YWwgPSBsZW4odGVzdF9m aWxlcykgKiBpdGVyYXRpb25zCiAgICAgICAgIHNlbGYucmVtYWluaW5nID0gc2VsZi50b3RhbAog ICAgICAgICBzZWxmLmV4cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwpAQCAtNDgsOCArNDgsOCBA QCBjbGFzcyBSZXN1bHRTdW1tYXJ5KG9iamVjdCk6CiAgICAgICAgIHNlbGYuZmFpbHVyZXMgPSB7 fQogICAgICAgICBzZWxmLnRvdGFsX2ZhaWx1cmVzID0gMAogICAgICAgICBzZWxmLmV4cGVjdGVk X3NraXBzID0gMAotICAgICAgICBzZWxmLnRvdGFsX3Rlc3RzX2J5X2V4cGVjdGF0aW9uW1NLSVBd ID0gMAotICAgICAgICBzZWxmLnRlc3RzX2J5X2V4cGVjdGF0aW9uW1NLSVBdID0gc2V0KCkKKyAg ICAgICAgc2VsZi50b3RhbF90ZXN0c19ieV9leHBlY3RhdGlvbltTS0lQXSA9IGxlbihleHBlY3Rl ZF9za2lwcykKKyAgICAgICAgc2VsZi50ZXN0c19ieV9leHBlY3RhdGlvbltTS0lQXSA9IGV4cGVj dGVkX3NraXBzCiAgICAgICAgIGZvciBleHBlY3RhdGlvbiBpbiBUZXN0RXhwZWN0YXRpb25zLkVY UEVDVEFUSU9OUy52YWx1ZXMoKToKICAgICAgICAgICAgIHNlbGYudGVzdHNfYnlfZXhwZWN0YXRp b25bZXhwZWN0YXRpb25dID0gc2V0KCkKICAgICAgICAgICAgIHNlbGYudG90YWxfdGVzdHNfYnlf ZXhwZWN0YXRpb25bZXhwZWN0YXRpb25dID0gMApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5 CmluZGV4IDljNmQ0NzhkNGQ0MTk4ZGQ5NDkxZWFjODVhM2NmNDQyZmYxNWIzZmUuLjdiMzRmMmM5 OWY3ZTc5ZDE4ZmYyNzgxZDY1Y2JlN2FhZGJkYWNkMGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3Rh dGlvbnMucHkKQEAgLTIyOCwxMCArMjI4LDEyIEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNl cihvYmplY3QpOgogICAgICAgICAgICAgc2VsZi5fcGFyc2VfbGluZShleHBlY3RhdGlvbl9saW5l KQogICAgICAgICByZXR1cm4gZXhwZWN0YXRpb25zCiAKLSAgICBkZWYgZXhwZWN0YXRpb25fZm9y X3NraXBwZWRfdGVzdChzZWxmLCB0ZXN0X25hbWUpOgorICAgIGRlZiBleHBlY3RhdGlvbl9mb3Jf c2tpcHBlZF90ZXN0KHNlbGYsIHRlc3RfbmFtZSwgd29udGZpeD1GYWxzZSk6CiAgICAgICAgIGV4 cGVjdGF0aW9uX2xpbmUgPSBUZXN0RXhwZWN0YXRpb25MaW5lKCkKICAgICAgICAgZXhwZWN0YXRp b25fbGluZS5vcmlnaW5hbF9zdHJpbmcgPSB0ZXN0X25hbWUKICAgICAgICAgZXhwZWN0YXRpb25f bGluZS5tb2RpZmllcnMgPSBbVGVzdEV4cGVjdGF0aW9uUGFyc2VyLkRVTU1ZX0JVR19NT0RJRklF UiwgVGVzdEV4cGVjdGF0aW9uUGFyc2VyLlNLSVBfTU9ESUZJRVJdCisgICAgICAgIGlmIHdvbnRm aXg6CisgICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lLm1vZGlmaWVycy5hcHBlbmQoVGVzdEV4 cGVjdGF0aW9uUGFyc2VyLldPTlRGSVhfTU9ESUZJRVIpCiAgICAgICAgIGV4cGVjdGF0aW9uX2xp bmUubmFtZSA9IHRlc3RfbmFtZQogICAgICAgICAjIEZJWE1FOiB3ZSBzaG91bGQgcGFzcyBpbiBh IG1vcmUgZGVzY3JpcHRpdmUgc3RyaW5nIGhlcmUuCiAgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUu ZmlsZW5hbWUgPSAnPFNraXBwZWQgZmlsZT4nCkBAIC03NTksNyArNzYxLDcgQEAgY2xhc3MgVGVz dEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgICAgICAgICAgICAgIHNlbGYuX2V4cGVjdGF0aW9u cyArPSBleHBlY3RhdGlvbnMKIAogICAgICAgICAjIEZJWE1FOiBtb3ZlIGlnbm9yZV90ZXN0cyBp bnRvIHBvcnQuc2tpcHBlZF9sYXlvdXRfdGVzdHMoKQotICAgICAgICBzZWxmLl9hZGRfc2tpcHBl ZF90ZXN0cyhwb3J0LnNraXBwZWRfbGF5b3V0X3Rlc3RzKHRlc3RzKS51bmlvbihzZXQocG9ydC5n ZXRfb3B0aW9uKCdpZ25vcmVfdGVzdHMnLCBbXSkpKSkKKyAgICAgICAgc2VsZi5hZGRfc2tpcHBl ZF90ZXN0cyhwb3J0LnNraXBwZWRfbGF5b3V0X3Rlc3RzKHRlc3RzKS51bmlvbihzZXQocG9ydC5n ZXRfb3B0aW9uKCdpZ25vcmVfdGVzdHMnLCBbXSkpKSkKIAogICAgICAgICBzZWxmLl9oYXNfd2Fy bmluZ3MgPSBGYWxzZQogICAgICAgICBzZWxmLl9yZXBvcnRfd2FybmluZ3MoKQpAQCAtODgyLDcg Kzg4NCw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMob2JqZWN0KToKICAgICAgICAgICAgIGlm IHNlbGYuX2lzX2xpbnRfbW9kZSBvciBzZWxmLl90ZXN0X2NvbmZpZyBpbiBleHBlY3RhdGlvbl9s aW5lLm1hdGNoaW5nX2NvbmZpZ3VyYXRpb25zOgogICAgICAgICAgICAgICAgIHNlbGYuX21vZGVs LmFkZF9leHBlY3RhdGlvbl9saW5lKGV4cGVjdGF0aW9uX2xpbmUpCiAKLSAgICBkZWYgX2FkZF9z a2lwcGVkX3Rlc3RzKHNlbGYsIHRlc3RzX3RvX3NraXApOgorICAgIGRlZiBhZGRfc2tpcHBlZF90 ZXN0cyhzZWxmLCB0ZXN0c190b19za2lwLCB3b250Zml4PVRydWUpOgogICAgICAgICBpZiBub3Qg dGVzdHNfdG9fc2tpcDoKICAgICAgICAgICAgIHJldHVybgogICAgICAgICBmb3IgdGVzdCBpbiBz ZWxmLl9leHBlY3RhdGlvbnM6CkBAIC04OTAsNSArODkyLDUgQEAgY2xhc3MgVGVzdEV4cGVjdGF0 aW9ucyhvYmplY3QpOgogICAgICAgICAgICAgICAgIHRlc3Qud2FybmluZ3MuYXBwZW5kKCclczol ZCAlcyBpcyBhbHNvIGluIGEgU2tpcHBlZCBmaWxlLicgJSAodGVzdC5maWxlbmFtZSwgdGVzdC5s aW5lX251bWJlciwgdGVzdC5uYW1lKSkKIAogICAgICAgICBmb3IgdGVzdF9uYW1lIGluIHRlc3Rz X3RvX3NraXA6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbl9saW5lID0gc2VsZi5fcGFyc2VyLmV4 cGVjdGF0aW9uX2Zvcl9za2lwcGVkX3Rlc3QodGVzdF9uYW1lKQorICAgICAgICAgICAgZXhwZWN0 YXRpb25fbGluZSA9IHNlbGYuX3BhcnNlci5leHBlY3RhdGlvbl9mb3Jfc2tpcHBlZF90ZXN0KHRl c3RfbmFtZSwgd29udGZpeCkKICAgICAgICAgICAgIHNlbGYuX21vZGVsLmFkZF9leHBlY3RhdGlv bl9saW5lKGV4cGVjdGF0aW9uX2xpbmUsIGluX3NraXBwZWQ9VHJ1ZSkKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9u c191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQppbmRleCBjNzgwZGFjMjNkOGI3OTc2YzE3 NTg4YjMyNTBmZjBkNTFjNzI0MTQ0Li4yYjQ4NTNmYTg5ZjM2MDRiODEwMDJhYTkyY2YyODFmN2Vl NmYwMjMyIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9t b2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5 CkBAIC0yODQsNyArMjg0LDcgQEAgY2xhc3MgU2tpcHBlZFRlc3RzKEJhc2UpOgogCiAgICAgICAg ICMgQ2hlY2sgdGhhdCB0aGUgZXhwZWN0YXRpb24gaXMgZm9yIEJVR19EVU1NWSBTS0lQIDogLi4u ID0gUEFTUwogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhleHAuZ2V0X21vZGlmaWVycygnZmFp bHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgIFtU ZXN0RXhwZWN0YXRpb25QYXJzZXIuRFVNTVlfQlVHX01PRElGSUVSLCBUZXN0RXhwZWN0YXRpb25Q YXJzZXIuU0tJUF9NT0RJRklFUl0pCisgICAgICAgICAgICAgICAgICAgICAgICAgIFtUZXN0RXhw ZWN0YXRpb25QYXJzZXIuRFVNTVlfQlVHX01PRElGSUVSLCBUZXN0RXhwZWN0YXRpb25QYXJzZXIu U0tJUF9NT0RJRklFUiwgVGVzdEV4cGVjdGF0aW9uUGFyc2VyLldPTlRGSVhfTU9ESUZJRVJdKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhleHAuZ2V0X2V4cGVjdGF0aW9ucygnZmFpbHVyZXMv ZXhwZWN0ZWQvdGV4dC5odG1sJyksIHNldChbUEFTU10pKQogCiAgICAgZGVmIHRlc3Rfc2tpcHBl ZF90ZXN0c193b3JrKHNlbGYpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKaW5kZXggOTVhMDdmNTllYWVjZmRlY2Yy Y2RlNWYyYjVkYjE1MDc2ODYwYWY4NC4uYzRmNGYyNDA0OTI3ZDA3OGRjYTcwZGE5NzQ1ZWQ1ZmM2 NjVkZDE2NCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cnVuX3dlYmtpdF90ZXN0cy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CkBAIC00MTIsOCArNDEyLDggQEAgZGVmIHBhcnNlX2Fy Z3MoYXJncz1Ob25lKToKICAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tZXhpdC1hZnRl ci1uLWNyYXNoZXMtb3ItdGltZW91dHMiLCB0eXBlPSJpbnQiLAogICAgICAgICAgICAgZGVmYXVs dD1Ob25lLCBoZWxwPSJFeGl0IGFmdGVyIHRoZSBmaXJzdCBOIGNyYXNoZXMgaW5zdGVhZCBvZiAi CiAgICAgICAgICAgICAicnVubmluZyBhbGwgdGVzdHMiKSwKLSAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oIi0taXRlcmF0aW9ucyIsIHR5cGU9ImludCIsIGhlbHA9Ik51bWJlciBvZiB0aW1l cyB0byBydW4gdGhlIHNldCBvZiB0ZXN0cyAoZS5nLiBBQkNBQkNBQkMpIiksCi0gICAgICAgIG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLXJlcGVhdC1lYWNoIiwgdHlwZT0iaW50IiwgaGVscD0iTnVt YmVyIG9mIHRpbWVzIHRvIHJ1biBlYWNoIHRlc3QgKGUuZy4gQUFBQkJCQ0NDKSIpLAorICAgICAg ICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1pdGVyYXRpb25zIiwgdHlwZT0iaW50IiwgZGVmYXVs dD0xLCBoZWxwPSJOdW1iZXIgb2YgdGltZXMgdG8gcnVuIHRoZSBzZXQgb2YgdGVzdHMgKGUuZy4g QUJDQUJDQUJDKSIpLAorICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1yZXBlYXQtZWFj aCIsIHR5cGU9ImludCIsIGRlZmF1bHQ9MSwgaGVscD0iTnVtYmVyIG9mIHRpbWVzIHRvIHJ1biBl YWNoIHRlc3QgKGUuZy4gQUFBQkJCQ0NDKSIpLAogICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlv bigiLS1yZXRyeS1mYWlsdXJlcyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsCiAgICAgICAgICAgICBk ZWZhdWx0PVRydWUsCiAgICAgICAgICAgICBoZWxwPSJSZS10cnkgYW55IHRlc3RzIHRoYXQgcHJv ZHVjZSB1bmV4cGVjdGVkIHJlc3VsdHMgKGRlZmF1bHQpIiksCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CmluZGV4IDFjMmZl Y2Q3YjdmOGI5OWQ5MGI3MWM2ZTY2NGMwZGYwNDU2YzE5NjcuLjYzNzczN2VjZGQ3MTQ3MGU0MDky ZmUzOGRkZmUyNzg2OTJkMDVkNzggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5CkBAIC0yMjAsMjEgKzIyMCwxOCBAQCBj bGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3ByaW50X2NvbmZpZygnQ29tbWFu ZCBsaW5lOiAnICsgJyAnLmpvaW4oc2VsZi5fcG9ydC5kcml2ZXJfY21kX2xpbmUoKSkpCiAgICAg ICAgIHNlbGYuX3ByaW50X2NvbmZpZygnJykKIAotICAgIGRlZiBwcmludF9leHBlY3RlZChzZWxm LCBudW1fYWxsX3Rlc3RfZmlsZXMsIHJlc3VsdF9zdW1tYXJ5LCB0ZXN0c193aXRoX3Jlc3VsdF90 eXBlX2NhbGxiYWNrKToKLSAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWQoJ0ZvdW5kICVzLicg JSBncmFtbWFyLnBsdXJhbGl6ZSgndGVzdCcsIG51bV9hbGxfdGVzdF9maWxlcykpCisgICAgZGVm IHByaW50X2ZvdW5kKHNlbGYsIG51bV9hbGxfdGVzdF9maWxlcywgbnVtX3RvX3J1biwgcmVwZWF0 X2VhY2gsIGl0ZXJhdGlvbnMpOgorICAgICAgICBmb3VuZF9zdHIgPSAnRm91bmQgJXM7IHJ1bm5p bmcgJWQnICUgKGdyYW1tYXIucGx1cmFsaXplKCd0ZXN0JywgbnVtX2FsbF90ZXN0X2ZpbGVzKSwg bnVtX3RvX3J1bikKKyAgICAgICAgaWYgcmVwZWF0X2VhY2ggKiBpdGVyYXRpb25zID4gMToKKyAg ICAgICAgICAgIGZvdW5kX3N0ciArPSAnLCAlZCB0aW1lcyBlYWNoICgtLXJlcGVhdC1lYWNoPSVk LCAtLWl0ZXJhdGlvbnM9JWQpJyAlIChyZXBlYXRfZWFjaCAqIGl0ZXJhdGlvbnMsIHJlcGVhdF9l YWNoLCBpdGVyYXRpb25zKQorICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZChmb3VuZF9zdHIg KyAnLicpCisKKyAgICBkZWYgcHJpbnRfZXhwZWN0ZWQoc2VsZiwgcmVzdWx0X3N1bW1hcnksIHRl c3RzX3dpdGhfcmVzdWx0X3R5cGVfY2FsbGJhY2spOgogICAgICAgICBzZWxmLl9wcmludF9leHBl Y3RlZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1hcnksIHRlc3RfZXhwZWN0YXRpb25zLlBB U1MsICJwYXNzZXMiLCB0ZXN0c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKQogICAgICAgICBz ZWxmLl9wcmludF9leHBlY3RlZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1hcnksIHRlc3Rf ZXhwZWN0YXRpb25zLkZBSUwsICJmYWlsdXJlcyIsIHRlc3RzX3dpdGhfcmVzdWx0X3R5cGVfY2Fs bGJhY2spCiAgICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVkX3Jlc3VsdHNfb2ZfdHlwZShyZXN1 bHRfc3VtbWFyeSwgdGVzdF9leHBlY3RhdGlvbnMuRkxBS1ksICJmbGFreSIsIHRlc3RzX3dpdGhf cmVzdWx0X3R5cGVfY2FsbGJhY2spCi0gICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVkX3Jlc3Vs dHNfb2ZfdHlwZShyZXN1bHRfc3VtbWFyeSwgdGVzdF9leHBlY3RhdGlvbnMuU0tJUCwgInNraXBw ZWQiLCB0ZXN0c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKQogICAgICAgICBzZWxmLl9wcmlu dF9leHBlY3RlZCgnJykKIAotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoID4g MToKLSAgICAgICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVkKCdSdW5uaW5nIGVhY2ggdGVzdCAl ZCB0aW1lcy4nICUgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCkKLSAgICAgICAgaWYgc2VsZi5f b3B0aW9ucy5pdGVyYXRpb25zID4gMToKLSAgICAgICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVk KCdSdW5uaW5nICVkIGl0ZXJhdGlvbnMgb2YgdGhlIHRlc3RzLicgJSBzZWxmLl9vcHRpb25zLml0 ZXJhdGlvbnMpCi0gICAgICAgIGlmIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucyA+IDEgb3Igc2Vs Zi5fb3B0aW9ucy5yZXBlYXRfZWFjaCA+IDE6Ci0gICAgICAgICAgICBzZWxmLl9wcmludF9leHBl Y3RlZCgnJykKLQogICAgIGRlZiBwcmludF93b3JrZXJzX2FuZF9zaGFyZHMoc2VsZiwgbnVtX3dv cmtlcnMsIG51bV9zaGFyZHMsIG51bV9sb2NrZWRfc2hhcmRzKToKICAgICAgICAgZHJpdmVyX25h bWUgPSBzZWxmLl9wb3J0LmRyaXZlcl9uYW1lKCkKICAgICAgICAgaWYgbnVtX3dvcmtlcnMgPT0g MToKQEAgLTQ0Nyw3ICs0NDQsNyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgICIi IgogICAgICAgICBmYWlsZWQgPSByZXN1bHRfc3VtbWFyeS50b3RhbF9mYWlsdXJlcwogICAgICAg ICB0b3RhbCA9IHJlc3VsdF9zdW1tYXJ5LnRvdGFsIC0gcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWRf c2tpcHMKLSAgICAgICAgcGFzc2VkID0gdG90YWwgLSBmYWlsZWQKKyAgICAgICAgcGFzc2VkID0g dG90YWwgLSBmYWlsZWQgLSByZXN1bHRfc3VtbWFyeS5yZW1haW5pbmcKICAgICAgICAgcGN0X3Bh c3NlZCA9IDAuMAogICAgICAgICBpZiB0b3RhbCA+IDA6CiAgICAgICAgICAgICBwY3RfcGFzc2Vk ID0gZmxvYXQocGFzc2VkKSAqIDEwMCAvIHRvdGFsCkBAIC00NjAsNiArNDU3LDcgQEAgY2xhc3Mg UHJpbnRlcihvYmplY3QpOgogICAgICAgICAgICAgdGVzdF9leHBlY3RhdGlvbnMuTk9XLCAiVGVz dHMgdG8gYmUgZml4ZWQiKQogCiAgICAgICAgIHNlbGYucHJpbnRfYWN0dWFsKCIiKQorICAgICAg ICAjIEZJWE1FOiBXZSBzaG91bGQgYmUgc2tpcHBpbmcgYW55dGhpbmcgbWFya2VkIFdPTlRGSVgs IHNvIHdlIHNob3VsZG4ndCBib3RoZXIgbG9nZ2luZyB0aGVzZSBzdGF0cy4KICAgICAgICAgc2Vs Zi5fcHJpbnRfcmVzdWx0X3N1bW1hcnlfZW50cnkocmVzdWx0X3N1bW1hcnksCiAgICAgICAgICAg ICB0ZXN0X2V4cGVjdGF0aW9ucy5XT05URklYLAogICAgICAgICAgICAgIlRlc3RzIHRoYXQgd2ls bCBvbmx5IGJlIGZpeGVkIGlmIHRoZXkgY3Jhc2ggKFdPTlRGSVgpIikKQEAgLTQ3MSw3ICs0Njks NyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAKICAgICAgICAgQXJnczoKICAgICAgICAgICBy ZXN1bHRfc3VtbWFyeTogc3VtbWFyeSB0byBwcmludCByZXN1bHRzIGZvcgotICAgICAgICAgIHRp bWVsaW5lOiB0aGUgdGltZWxpbmUgdG8gcHJpbnQgcmVzdWx0cyBmb3IgKE5PVCwgV09OVEZJWCwg ZXRjLikKKyAgICAgICAgICB0aW1lbGluZTogdGhlIHRpbWVsaW5lIHRvIHByaW50IHJlc3VsdHMg Zm9yIChOT1csIFdPTlRGSVgsIGV0Yy4pCiAgICAgICAgICAgaGVhZGluZzogYSB0ZXh0dWFsIGRl c2NyaXB0aW9uIG9mIHRoZSB0aW1lbGluZQogICAgICAgICAiIiIKICAgICAgICAgdG90YWwgPSBs ZW4ocmVzdWx0X3N1bW1hcnkudGVzdHNfYnlfdGltZWxpbmVbdGltZWxpbmVdKQpAQCAtNDgxLDcg KzQ3OSw3IEBAIGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5wcmludF9hY3R1 YWwoIj0+ICVzICglZCk6IiAlIChoZWFkaW5nLCBub3RfcGFzc2luZykpCiAKICAgICAgICAgZm9y IHJlc3VsdCBpbiBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OX09SREVSOgotICAgICAgICAg ICAgaWYgcmVzdWx0ID09IHRlc3RfZXhwZWN0YXRpb25zLlBBU1M6CisgICAgICAgICAgICBpZiBy ZXN1bHQgaW4gKHRlc3RfZXhwZWN0YXRpb25zLlBBU1MsIHRlc3RfZXhwZWN0YXRpb25zLlNLSVAp OgogICAgICAgICAgICAgICAgIGNvbnRpbnVlCiAgICAgICAgICAgICByZXN1bHRzID0gKHJlc3Vs dF9zdW1tYXJ5LnRlc3RzX2J5X2V4cGVjdGF0aW9uW3Jlc3VsdF0gJgogICAgICAgICAgICAgICAg ICAgICAgICByZXN1bHRfc3VtbWFyeS50ZXN0c19ieV90aW1lbGluZVt0aW1lbGluZV0pCmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGlu Z191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdz L3ByaW50aW5nX3VuaXR0ZXN0LnB5CmluZGV4IGY4ZGQ2MWRiN2NlMDIwMjc3ODYzYTg4ODI1ZGM3 YzBhMzdmNmUyODEuLjc1MDVkNWMwNWEzZjJjZmM2NDk5YWI0MGE4ZGRkODY4YmU3MmI3NTkgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50 aW5nX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5CkBAIC0xMzAsNyArMTMwLDcgQEAgY2xhc3MgIFRl c3RwcmludGVyKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgcG9ydC50ZXN0X2V4cGVjdGF0 aW9uc19vdmVycmlkZXMgPSBsYW1iZGE6IE5vbmUKICAgICAgICAgZXhwZWN0YXRpb25zID0gdGVz dF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhzZWxmLl9wb3J0LCB0ZXN0X25hbWVzKQog Ci0gICAgICAgIHJzID0gcmVzdWx0X3N1bW1hcnkuUmVzdWx0U3VtbWFyeShleHBlY3RhdGlvbnMs IHRlc3RfbmFtZXMpCisgICAgICAgIHJzID0gcmVzdWx0X3N1bW1hcnkuUmVzdWx0U3VtbWFyeShl eHBlY3RhdGlvbnMsIHRlc3RfbmFtZXMsIDEsIHNldCgpKQogICAgICAgICByZXR1cm4gdGVzdF9u YW1lcywgcnMsIGV4cGVjdGF0aW9ucwogCiAgICAgZGVmIHRlc3RfaGVscF9wcmludGVyKHNlbGYp Ogo= 155400 2012-07-30 16:51:03 -0700 2012-07-30 16:54:01 -0700 remove wontfix from add_skipped_tests, expectation_for_skipped_tests bug-92527-20120730165047.patch text/plain 22068 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTE0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWY5MTliMGFjZGZkYjBhMjQwOGIzMGM1NDgzZWY2Mzk5 ZGE5OWJkMS4uN2I1NGE0NjRhN2Y3NjU3YmIyM2ZmNWZjYzNiZWZmMjUwZjU3ZDRmZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDcy IEBACisyMDEyLTA3LTMwICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IGNsZWFuIHVwIGhhbmRsaW5nIG9mICdleHBlY3RlZCcgc3RhdHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyNTI3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHRl cnMgdGhlIHdheSB3ZSBjb21wdXRlIGFuZCBsb2cgdGhlICJleHBlY3RlZCIKKyAgICAgICAgcmVz dWx0cyBhbmQgaG93IHdlIHRyZWF0IHNraXBwZWQgdGVzdHM7IHdlIHdpbGwgbm93IGxvZyB0aGUK KyAgICAgICAgbnVtYmVyIG9mIHNraXBwZWQgdGVzdHMgc2VwYXJhdGVseSBmcm9tIHRoZSBjYXRl Z29yaWVzLCBlLmcuOgorCisgICAgICAgIEZvdW5kIDMxNjA3IHRlc3RzOyBydW5uaW5nIDI0NDY0 LgorICAgICAgICBFeHBlY3Q6IDIzNDk2IHBhc3NlcyAgICgyMzQ5NiBub3csICAgIDAgd29udGZp eCkKKyAgICAgICAgRXhwZWN0OiAgIDU0OCBmYWlsdXJlcyAoICA1NDMgbm93LCAgICA1IHdvbnRm aXgpCisgICAgICAgIEV4cGVjdDogICA0MjAgZmxha3kgICAgKCAgMjQ1IG5vdywgIDE3NSB3b250 Zml4KQorCisgICAgICAgIChzbyB0aGF0IHRoZSAiZXhwZWN0IiB0b3RhbHMgYWRkIHVwIHRvIHRo ZSAicnVubmluZyIgdG90YWxzKTsKKyAgICAgICAgaW4gYWRkaXRpb24sIHRoZSB0b3RhbHMgaW4g dGhlIG9uZS1saW5lLXByb2dyZXNzIHJlZmxlY3QgdGhlCisgICAgICAgIG51bWJlciBvZiB0ZXN0 cyB3ZSB3aWxsIGFjdHVhbGx5IHJ1bi4gSWYgLS1pdGVyYXRpb25zIG9yCisgICAgICAgIC0tcmVw ZWF0LWVhY2ggYXJlIHNwZWNpZmllZCwgdGhlIG51bWJlciBvZiB0ZXN0cyB3ZSBydW4gYXJlCisg ICAgICAgIG11bHRpcGxpZWQgYXMgYXBwcm9wcmlhdGUsIGJ1dCB0aGUgImV4cGVjdCIgbnVtYmVy cyBhcmUKKyAgICAgICAgdW5jaGFuZ2VkLCBzaW5jZSB3ZSBkb24ndCBjb3VudCBtdWx0aXBsZSBp bnZvY2F0aW9ucyBvZiB0aGUgc2FtZQorICAgICAgICB0ZXN0IG11bHRpcGxlIHRpbWVzLiBJbiBh ZGRpdGlvbiwgaWYgd2UgYXJlIHVzaW5nIC0tcnVuLXBhcnQgb3IKKyAgICAgICAgLS1ydW4tY2h1 bmssIHRoZSB0ZXN0cyB3ZSBkb24ndCBydW4gYXJlIHRyZWF0ZWQgYXMgc2tpcHBlZAorICAgICAg ICBmb3IgY29uc2lzdGVuY3kuIFdlIHdpbGwgYWxzbyBsb2cgdGhlIHZhbHVlcyBmb3IgLS1pdGVy YXRpb25zCisgICAgICAgIGFuZCAtLXJlcGVhdCBlYWNoIGFzIHBhcnQgb2YgdGhlIGZvdW5kL3J1 bm5pbmcgbGluZS4KKworICAgICAgICBQcmV2aW91c2x5IHRoZSBjb2RlIGhhZCBwYXJzZWQgYW5k IHJlLXBhcnNlZCB0aGUKKyAgICAgICAgVGVzdEV4cGVjdGF0aW9ucyBmaWxlcyBzZXZlcmFsIHRp bWVzIGluIGFuIGF0dGVtcHQgdG8gY29tZSB1cAorICAgICAgICB3aXRoIHNvbWUgc2FuZSBzdGF0 aXN0aWNzLCBidXQgdGhpcyB3YXMgZXhwZW5zaXZlIGFuZCBsZWFkIHRvCisgICAgICAgIGNvbmZ1 c2luZyBsYXllcjsgdHJlYXRpbmcgZmlsZXMgYXMgc2tpcHBlZCBpbiB0aGUgd2F5IGRlc2NyaWJl ZAorICAgICAgICBhYm92ZSBpcyBtb3JlIGNvbnNpc3RlbnQgYW5kIGNsZWFuZXIuCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5 OgorICAgICAgICAoTWFuYWdlci5fc3BsaXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KToKKyAg ICAgICAgKE1hbmFnZXIucHJlcGFyZV9saXN0c19hbmRfcHJpbnRfb3V0cHV0KToKKyAgICAgICAg KE1hbmFnZXIucnVuKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9tYW5hZ2VyX3VuaXR0ZXN0LnB5OgorICAgICAgICAoTWFuYWdlclRlc3QudGVz dF9pbnRlcnJ1cHRfaWZfYXRfZmFpbHVyZV9saW1pdHMpOgorICAgICAgICAoTWFuYWdlclRlc3Qu dGVzdF91cGRhdGVfc3VtbWFyeV93aXRoX3Jlc3VsdCk6CisgICAgICAgIChNYW5hZ2VyVGVzdC50 ZXN0X2xvb2tfZm9yX25ld19jcmFzaF9sb2dzKToKKyAgICAgICAgKFJlc3VsdFN1bW1hcnlUZXN0 LmdldF9yZXN1bHRfc3VtbWFyeSk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Jlc3VsdF9zdW1tYXJ5LnB5OgorICAgICAgICAoUmVzdWx0U3VtbWFyeS5f X2luaXRfXyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Rlc3RfZXhwZWN0YXRpb25zLnB5OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uUGFyc2VyLmV4 cGVjdGF0aW9uX2Zvcl9za2lwcGVkX3Rlc3QpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5f X2luaXRfXyk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zLmFkZF9za2lwcGVkX3Rlc3RzKToK KyAgICAgICAgICBIZXJlIHdlIG1ha2UgYWRkX3NraXBwZWRfdGVzdHMoKSBwdWJsaWMsIHNvIHRo YXQgd2UgY2FuIHVwZGF0ZQorICAgICAgICAgIHRoZSBleHBlY3RhdGlvbnMgZm9yIHRlc3RzIHRo YXQgd2UgYXJlIHNraXBwaW5nIGR1ZSB0bworICAgICAgICAgIC0tcnVuLXBhcnQgb3IgLS1ydW4t Y2h1bms7IHdlIHVzZSB0aGUgd29udGZpeCBmbGFnIHNvIHRoYXQKKyAgICAgICAgICB0aGUgdGVz dHMgdGhhdCBhcmUgaW50ZW50aW9uYWxseSBza2lwcGVkIGFyZW4ndCBjb25zaWRlcmVkCisgICAg ICAgICAgImZpeGFibGUiLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weToKKyAgICAgICAgKFNraXBwZWRU ZXN0cy5jaGVjayk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVu X3dlYmtpdF90ZXN0cy5weToKKyAgICAgICAgKHBhcnNlX2FyZ3MpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nLnB5OgorICAgICAgICAoUHJp bnRlci5wcmludF9mb3VuZCk6CisgICAgICAgIChQcmludGVyKToKKyAgICAgICAgKFByaW50ZXIu cHJpbnRfZXhwZWN0ZWQpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfcmVzdWx0X3N1bW1hcnkp OgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfcmVzdWx0X3N1bW1hcnlfZW50cnkpOgorICAgICAg ICAgIEhlcmUgd2Ugc3BsaXQgb3V0IHByaW50aW5nIHRoZSBudW1iZXIgb2YgdGVzdHMgZm91bmQg YW5kIHJ1bgorICAgICAgICAgIGZyb20gdGhlIGV4cGVjdGVkIHJlc3VsdHMsIHRvIGJlIGNsZWFy ZXIgYW5kIHNvIHRoYXQgd2UgZG9uJ3QKKyAgICAgICAgICBoYXZlIHRvIHJlcGFyc2UgdGhlIGV4 cGVjdGF0aW9ucyB0byB1cGRhdGUgdGhlIHN0YXRzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVz dHByaW50ZXIuZ2V0X3Jlc3VsdF9zdW1tYXJ5KToKKwogMjAxMi0wNy0zMCAgU2FkcnVsIEhhYmli IENob3dkaHVyeSAgPHNhZHJ1bEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUHJvcGFnYXRlIGdl c3R1cmUgZXZlbnRzIHRvIHBsdWdpbnMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQppbmRleCAwNTQ0OTE4 ZjRkOGQxOTQ1NGRkZDkzZmI4MjM4ZjJjZDhjMjQ4NzQ4Li4yY2MwNDhhYzMzMmM4Zjk5YWQzNDJk NTc5MTUwMGViZmIyNGE5ZDc1IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKQEAgLTQyNiwyNSArNDI2 LDEyIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgICAgIF9sb2cuZGVidWcoJyAg IGxhc3QgY2h1bmsgaXMgcGFydGlhbCwgYXBwZW5kaW5nIFswOiVkXScgJSBleHRyYSkKICAgICAg ICAgICAgIGZpbGVzLmV4dGVuZCh0ZXN0X2ZpbGVzWzA6ZXh0cmFdKQogCi0gICAgICAgIGxlbl9z a2lwX2NodW5rID0gaW50KGxlbihmaWxlcykgKiBsZW4oc2tpcHBlZCkgLyBmbG9hdChsZW4oc2Vs Zi5fdGVzdF9maWxlcykpKQotICAgICAgICBza2lwX2NodW5rX2xpc3QgPSBsaXN0KHNraXBwZWQp WzA6bGVuX3NraXBfY2h1bmtdCi0gICAgICAgIHNraXBfY2h1bmsgPSBzZXQoc2tpcF9jaHVua19s aXN0KQotCi0gICAgICAgICMgRklYTUU6IFRoaXMgaXMgYSB0b3RhbCBoYWNrLgotICAgICAgICAj IFVwZGF0ZSBleHBlY3RhdGlvbnMgc28gdGhhdCB0aGUgc3RhdHMgYXJlIGNhbGN1bGF0ZWQgY29y cmVjdGx5LgotICAgICAgICAjIFdlIG5lZWQgdG8gcGFzcyBhIGxpc3QgdGhhdCBpbmNsdWRlcyB0 aGUgcmlnaHQgIyBvZiBza2lwcGVkIGZpbGVzCi0gICAgICAgICMgdG8gUGFyc2VFeHBlY3RhdGlv bnMgc28gdGhhdCBSZXN1bHRTdW1tYXJ5KCkgd2lsbCBnZXQgdGhlIGNvcnJlY3QKLSAgICAgICAg IyBzdGF0cy4gU28sIHdlIGFkZCBpbiB0aGUgc3Vic2V0IG9mIHNraXBwZWQgZmlsZXMsIGFuZCB0 aGVuCi0gICAgICAgICMgc3VidHJhY3QgdGhlbSBiYWNrIG91dC4KLSAgICAgICAgc2VsZi5fdGVz dF9maWxlc19saXN0ID0gZmlsZXMgKyBza2lwX2NodW5rX2xpc3QKLSAgICAgICAgc2VsZi5fdGVz dF9maWxlcyA9IHNldChzZWxmLl90ZXN0X2ZpbGVzX2xpc3QpCi0KLSAgICAgICAgc2VsZi5fcGFy c2VfZXhwZWN0YXRpb25zKCkKLQotICAgICAgICBzZWxmLl90ZXN0X2ZpbGVzID0gc2V0KGZpbGVz KQorICAgICAgICB0ZXN0c190b19ydW4gPSBzZXQoZmlsZXMpCisgICAgICAgIG1vcmVfdGVzdHNf dG9fc2tpcCA9IHNlbGYuX3Rlc3RfZmlsZXMgLSB0ZXN0c190b19ydW4KKyAgICAgICAgc2VsZi5f ZXhwZWN0YXRpb25zLmFkZF9za2lwcGVkX3Rlc3RzKG1vcmVfdGVzdHNfdG9fc2tpcCkKKyAgICAg ICAgc2VsZi5fdGVzdF9maWxlcyA9IHRlc3RzX3RvX3J1bgogICAgICAgICBzZWxmLl90ZXN0X2Zp bGVzX2xpc3QgPSBmaWxlcwotCi0gICAgICAgIHJldHVybiBza2lwX2NodW5rCisgICAgICAgIHJl dHVybiBza2lwcGVkLnVuaW9uKG1vcmVfdGVzdHNfdG9fc2tpcCkKIAogICAgICMgRklYTUU6IFRo aXMgbWV0aG9kIGlzIHdheSB0b28gbG9uZyBhbmQgbmVlZHMgdG8gYmUgYnJva2VuIGludG8gcGll Y2VzLgogICAgIGRlZiBwcmVwYXJlX2xpc3RzX2FuZF9wcmludF9vdXRwdXQoc2VsZik6CkBAIC00 OTAsOSArNDc3LDggQEAgY2xhc3MgTWFuYWdlcihvYmplY3QpOgogICAgICAgICBlbHNlOgogICAg ICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0LnNvcnQoa2V5PWxhbWJkYSB0ZXN0OiB0ZXN0 X2tleShzZWxmLl9wb3J0LCB0ZXN0KSkKIAotICAgICAgICBza2lwcGVkID0gc2VsZi5fc3BsaXRf aW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KHNraXBwZWQpCisgICAgICAgIGFsbF90ZXN0c190b19z a2lwID0gc2VsZi5fc3BsaXRfaW50b19jaHVua3NfaWZfbmVjZXNzYXJ5KHNraXBwZWQpCiAKLSAg ICAgICAgIyBGSVhNRTogSXQncyB1bmNsZWFyIGhvdyAtLXJlcGVhdC1lYWNoIGFuZCAtLWl0ZXJh dGlvbnMgc2hvdWxkIGludGVyYWN0IHdpdGggY2h1bmtzPwogICAgICAgICBpZiBzZWxmLl9vcHRp b25zLnJlcGVhdF9lYWNoOgogICAgICAgICAgICAgbGlzdF93aXRoX3JlcGV0aXRpb25zID0gW10K ICAgICAgICAgICAgIGZvciB0ZXN0IGluIHNlbGYuX3Rlc3RfZmlsZXNfbGlzdDoKQEAgLTUwMiwy MiArNDg4LDExIEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgaWYgc2VsZi5fb3B0 aW9ucy5pdGVyYXRpb25zOgogICAgICAgICAgICAgc2VsZi5fdGVzdF9maWxlc19saXN0ID0gc2Vs Zi5fdGVzdF9maWxlc19saXN0ICogc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zCiAKLSAgICAgICAg aXRlcmF0aW9ucyA9ICBcCi0gICAgICAgICAgICAoc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCBp ZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoIGVsc2UgMSkgKiBcCi0gICAgICAgICAgICAoc2Vs Zi5fb3B0aW9ucy5pdGVyYXRpb25zIGlmIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucyBlbHNlIDEp Ci0gICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gUmVzdWx0U3VtbWFyeShzZWxmLl9leHBlY3RhdGlv bnMsIHNlbGYuX3Rlc3RfZmlsZXMgfCBza2lwcGVkLCBpdGVyYXRpb25zKQotCi0gICAgICAgIHNl bGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQobnVtX2FsbF90ZXN0X2ZpbGVzLCByZXN1bHRfc3Vt bWFyeSwgc2VsZi5fZXhwZWN0YXRpb25zLmdldF90ZXN0c193aXRoX3Jlc3VsdF90eXBlKQorICAg ICAgICBpdGVyYXRpb25zID0gc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCAqIHNlbGYuX29wdGlv bnMuaXRlcmF0aW9ucworICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoc2Vs Zi5fZXhwZWN0YXRpb25zLCBzZWxmLl90ZXN0X2ZpbGVzLCBpdGVyYXRpb25zLCBhbGxfdGVzdHNf dG9fc2tpcCkKIAotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnNraXBwZWQgIT0gJ2lnbm9yZSc6 Ci0gICAgICAgICAgICAjIE5vdGUgdGhhdCB3ZSBkb24ndCBhY3R1YWxseSBydW4gdGhlIHNraXBw ZWQgdGVzdHMgKHRoZXkgd2VyZQotICAgICAgICAgICAgIyBzdWJ0cmFjdGVkIG91dCBvZiBzZWxm Ll90ZXN0X2ZpbGVzLCBhYm92ZSksIGJ1dCB3ZSBzdHViIG91dCB0aGUKLSAgICAgICAgICAgICMg cmVzdWx0cyBoZXJlIHNvIHRoZSBzdGF0aXN0aWNzIGNhbiByZW1haW4gYWNjdXJhdGUuCi0gICAg ICAgICAgICBmb3IgdGVzdCBpbiBza2lwcGVkOgotICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRl c3RfcmVzdWx0cy5UZXN0UmVzdWx0KHRlc3QpCi0gICAgICAgICAgICAgICAgcmVzdWx0LnR5cGUg PSB0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQCi0gICAgICAgICAgICAgICAgZm9yIGl0ZXJhdGlvbiBp biByYW5nZShpdGVyYXRpb25zKToKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnku YWRkKHJlc3VsdCwgZXhwZWN0ZWQ9VHJ1ZSwgdGVzdF9pc19zbG93PXNlbGYuX3Rlc3RfaXNfc2xv dyh0ZXN0KSkKKyAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9mb3VuZChudW1fYWxsX3Rlc3Rf ZmlsZXMsIGxlbihzZWxmLl90ZXN0X2ZpbGVzKSwgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCwg c2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQorICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2V4 cGVjdGVkKHJlc3VsdF9zdW1tYXJ5LCBzZWxmLl9leHBlY3RhdGlvbnMuZ2V0X3Rlc3RzX3dpdGhf cmVzdWx0X3R5cGUpCiAKICAgICAgICAgcmV0dXJuIHJlc3VsdF9zdW1tYXJ5CiAKQEAgLTg2OSw3 ICs4NDQsNyBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmluZm8o IlJldHJ5aW5nICVkIHVuZXhwZWN0ZWQgZmFpbHVyZShzKSAuLi4iICUgbGVuKGZhaWx1cmVzKSkK ICAgICAgICAgICAgIF9sb2cuaW5mbygnJykKICAgICAgICAgICAgIHNlbGYuX3JldHJ5aW5nID0g VHJ1ZQotICAgICAgICAgICAgcmV0cnlfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoc2VsZi5fZXhw ZWN0YXRpb25zLCBmYWlsdXJlcy5rZXlzKCkpCisgICAgICAgICAgICByZXRyeV9zdW1tYXJ5ID0g UmVzdWx0U3VtbWFyeShzZWxmLl9leHBlY3RhdGlvbnMsIGZhaWx1cmVzLmtleXMoKSwgMSwgc2V0 KCkpCiAgICAgICAgICAgICAjIE5vdGUgdGhhdCB3ZSBpbnRlbnRpb25hbGx5IGlnbm9yZSB0aGUg cmV0dXJuIHZhbHVlIGhlcmUuCiAgICAgICAgICAgICBzZWxmLl9ydW5fdGVzdHMoZmFpbHVyZXMu a2V5cygpLCByZXRyeV9zdW1tYXJ5LCBudW1fd29ya2Vycz0xKQogICAgICAgICAgICAgZmFpbHVy ZXMgPSBzZWxmLl9nZXRfZmFpbHVyZXMocmV0cnlfc3VtbWFyeSwgaW5jbHVkZV9jcmFzaGVzPVRy dWUsIGluY2x1ZGVfbWlzc2luZz1UcnVlKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXJfdW5pdHRl c3QucHkKaW5kZXggNTc2ZDQyM2FmZjEzODBjYmJjOGY2MmUwNjA4ZTU5YTBhMjQzYWIzMi4uZDEz YjFiNTlmMGQwZDA3NzU4ZjEwYzg5MWNmZDQyMGIxYWQ4MTFmNiAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlcl91bml0dGVz dC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy9tYW5hZ2VyX3VuaXR0ZXN0LnB5CkBAIC00NSw3ICs0NSw2IEBAIGZyb20gd2Via2l0cHkgaW1w b3J0IGxheW91dF90ZXN0cwogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMgaW1wb3J0IHJ1bl93 ZWJraXRfdGVzdHMKIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLmNvbnRyb2xsZXJzIGltcG9y dCBtYW5hZ2VyCiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5jb250cm9sbGVycy5tYW5hZ2Vy IGltcG9ydCBpbnRlcnByZXRfdGVzdF9mYWlsdXJlcywgIE1hbmFnZXIsIG5hdHVyYWxfc29ydF9r ZXksIHRlc3Rfa2V5LCBUZXN0UnVuSW50ZXJydXB0ZWRFeGNlcHRpb24sIFRlc3RTaGFyZAotZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCByZXN1bHRfc3VtbWFyeQogZnJv bSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X2V4cGVjdGF0aW9ucwog ZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzIGltcG9ydCB0ZXN0X2ZhaWx1cmVzCiBm cm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5tb2RlbHMgaW1wb3J0IHRlc3RfcmVzdWx0cwpAQCAt Mjg4LDcgKzI4Nyw3IEBAIGNsYXNzIE1hbmFnZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgbWFuYWdlci5fdGVzdF9maWxlcyA9IFsnZm9vL2Jhci5odG1sJywgJ2Jhei5odG1sJ10K ICAgICAgICAgbWFuYWdlci5fdGVzdF9pc19zbG93ID0gbGFtYmRhIHRlc3RfbmFtZTogRmFsc2UK IAotICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoZXhwZWN0YXRpb25zPU1v Y2soKSwgdGVzdF9maWxlcz1tYW5hZ2VyLl90ZXN0X2ZpbGVzKQorICAgICAgICByZXN1bHRfc3Vt bWFyeSA9IFJlc3VsdFN1bW1hcnkoTW9jaygpLCBtYW5hZ2VyLl90ZXN0X2ZpbGVzLCAxLCBzZXQo KSkKICAgICAgICAgcmVzdWx0X3N1bW1hcnkudW5leHBlY3RlZF9mYWlsdXJlcyA9IDEwMAogICAg ICAgICByZXN1bHRfc3VtbWFyeS51bmV4cGVjdGVkX2NyYXNoZXMgPSA1MAogICAgICAgICByZXN1 bHRfc3VtbWFyeS51bmV4cGVjdGVkX3RpbWVvdXRzID0gNTAKQEAgLTMyMCw3ICszMTksNyBAQCBj bGFzcyBNYW5hZ2VyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICMgUmVmdGVzdHMg ZXhwZWN0ZWQgdG8gYmUgaW1hZ2UgbWlzbWF0Y2ggc2hvdWxkIGJlIHJlc3BlY3RlZCB3aGVuIHBp eGVsX3Rlc3RzPUZhbHNlLgogICAgICAgICBtYW5hZ2VyID0gTWFuYWdlcihwb3J0PXBvcnQsIG9w dGlvbnM9TW9ja09wdGlvbnMocGl4ZWxfdGVzdHM9RmFsc2UsIGV4aXRfYWZ0ZXJfbl9mYWlsdXJl cz1Ob25lLCBleGl0X2FmdGVyX25fY3Jhc2hlc19vcl90aW1lb3V0cz1Ob25lKSwgcHJpbnRlcj1N b2NrKCkpCiAgICAgICAgIG1hbmFnZXIuX2V4cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwotICAg ICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3VsdFN1bW1hcnkoZXhwZWN0YXRpb25zPWV4cGVjdGF0 aW9ucywgdGVzdF9maWxlcz1bdGVzdF0pCisgICAgICAgIHJlc3VsdF9zdW1tYXJ5ID0gUmVzdWx0 U3VtbWFyeShleHBlY3RhdGlvbnMsIFt0ZXN0XSwgMSwgc2V0KCkpCiAgICAgICAgIHJlc3VsdCA9 IFRlc3RSZXN1bHQodGVzdF9uYW1lPXRlc3QsIGZhaWx1cmVzPVt0ZXN0X2ZhaWx1cmVzLkZhaWx1 cmVSZWZ0ZXN0TWlzbWF0Y2hEaWROb3RPY2N1cigpXSkKICAgICAgICAgbWFuYWdlci5fdXBkYXRl X3N1bW1hcnlfd2l0aF9yZXN1bHQocmVzdWx0X3N1bW1hcnksIHJlc3VsdCkKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbHMoMSwgcmVzdWx0X3N1bW1hcnkuZXhwZWN0ZWQpCkBAIC0zNzMsNyArMzcy LDcgQEAgY2xhc3MgTWFuYWdlclRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBwb3J0 ID0gaG9zdC5wb3J0X2ZhY3RvcnkuZ2V0KCd0ZXN0LW1hYy1sZW9wYXJkJykKICAgICAgICAgdGVz dHMgPSBbJ2ZhaWx1cmVzL2V4cGVjdGVkL2NyYXNoLmh0bWwnXQogICAgICAgICBleHBlY3RhdGlv bnMgPSB0ZXN0X2V4cGVjdGF0aW9ucy5UZXN0RXhwZWN0YXRpb25zKHBvcnQsIHRlc3RzKQotICAg ICAgICBycyA9IHJlc3VsdF9zdW1tYXJ5LlJlc3VsdFN1bW1hcnkoZXhwZWN0YXRpb25zLCB0ZXN0 cykKKyAgICAgICAgcnMgPSBSZXN1bHRTdW1tYXJ5KGV4cGVjdGF0aW9ucywgdGVzdHMsIDEsIHNl dCgpKQogICAgICAgICBtYW5hZ2VyID0gZ2V0X21hbmFnZXJfd2l0aF90ZXN0cyh0ZXN0cykKICAg ICAgICAgbWFuYWdlci5fbG9va19mb3JfbmV3X2NyYXNoX2xvZ3MocnMsIHRpbWUudGltZSgpKQog CkBAIC01MDksNyArNTA4LDcgQEAgY2xhc3MgUmVzdWx0U3VtbWFyeVRlc3QodW5pdHRlc3QuVGVz dENhc2UpOgogICAgIGRlZiBnZXRfcmVzdWx0X3N1bW1hcnkoc2VsZiwgcG9ydCwgdGVzdF9uYW1l cywgZXhwZWN0YXRpb25zX3N0cik6CiAgICAgICAgIHBvcnQuZXhwZWN0YXRpb25zX2RpY3QgPSBs YW1iZGE6IHsnJzogZXhwZWN0YXRpb25zX3N0cn0KICAgICAgICAgZXhwZWN0YXRpb25zID0gdGVz dF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9ucyhwb3J0LCB0ZXN0X25hbWVzKQotICAgICAg ICByZXR1cm4gdGVzdF9uYW1lcywgcmVzdWx0X3N1bW1hcnkuUmVzdWx0U3VtbWFyeShleHBlY3Rh dGlvbnMsIHRlc3RfbmFtZXMpLCBleHBlY3RhdGlvbnMKKyAgICAgICAgcmV0dXJuIHRlc3RfbmFt ZXMsIFJlc3VsdFN1bW1hcnkoZXhwZWN0YXRpb25zLCB0ZXN0X25hbWVzLCAxLCBzZXQoKSksIGV4 cGVjdGF0aW9ucwogCiAgICAgIyBGSVhNRTogVXNlIHRoaXMgdG8gdGVzdCBtb3JlIG9mIHN1bW1h cml6ZV9yZXN1bHRzLiBUaGlzIHdhcyBtb3ZlZCBmcm9tIHByaW50aW5nX3VuaXR0ZXN0LnB5Lgog ICAgIGRlZiBzdW1tYXJpemVkX3Jlc3VsdHMoc2VsZiwgcG9ydCwgZXhwZWN0ZWQsIHBhc3Npbmcs IGZsYWt5LCBleHRyYV90ZXN0cz1bXSwgZXh0cmFfZXhwZWN0YXRpb25zPU5vbmUpOgpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Jlc3VsdF9z dW1tYXJ5LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Jl c3VsdF9zdW1tYXJ5LnB5CmluZGV4IGIwNTEyMTI3ZmJkNTBiYTUxZDVjYjE1NzFkNmJiMDE5OGZh NjliZGIuLjViYjUwMTA2MTc5NmU1MjdlYzQ0MmI3OTg0ZjJiMzc0YWJiYWI0ZjcgMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy9yZXN1bHRfc3Vt bWFyeS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMv cmVzdWx0X3N1bW1hcnkucHkKQEAgLTMxLDcgKzMxLDcgQEAgZnJvbSB3ZWJraXRweS5sYXlvdXRf dGVzdHMubW9kZWxzLnRlc3RfZXhwZWN0YXRpb25zIGltcG9ydCBUZXN0RXhwZWN0YXRpb25zLCBT S0kKIAogCiBjbGFzcyBSZXN1bHRTdW1tYXJ5KG9iamVjdCk6Ci0gICAgZGVmIF9faW5pdF9fKHNl bGYsIGV4cGVjdGF0aW9ucywgdGVzdF9maWxlcywgaXRlcmF0aW9ucz0xKToKKyAgICBkZWYgX19p bml0X18oc2VsZiwgZXhwZWN0YXRpb25zLCB0ZXN0X2ZpbGVzLCBpdGVyYXRpb25zLCBleHBlY3Rl ZF9za2lwcyk6CiAgICAgICAgIHNlbGYudG90YWwgPSBsZW4odGVzdF9maWxlcykgKiBpdGVyYXRp b25zCiAgICAgICAgIHNlbGYucmVtYWluaW5nID0gc2VsZi50b3RhbAogICAgICAgICBzZWxmLmV4 cGVjdGF0aW9ucyA9IGV4cGVjdGF0aW9ucwpAQCAtNDgsOCArNDgsOCBAQCBjbGFzcyBSZXN1bHRT dW1tYXJ5KG9iamVjdCk6CiAgICAgICAgIHNlbGYuZmFpbHVyZXMgPSB7fQogICAgICAgICBzZWxm LnRvdGFsX2ZhaWx1cmVzID0gMAogICAgICAgICBzZWxmLmV4cGVjdGVkX3NraXBzID0gMAotICAg ICAgICBzZWxmLnRvdGFsX3Rlc3RzX2J5X2V4cGVjdGF0aW9uW1NLSVBdID0gMAotICAgICAgICBz ZWxmLnRlc3RzX2J5X2V4cGVjdGF0aW9uW1NLSVBdID0gc2V0KCkKKyAgICAgICAgc2VsZi50b3Rh bF90ZXN0c19ieV9leHBlY3RhdGlvbltTS0lQXSA9IGxlbihleHBlY3RlZF9za2lwcykKKyAgICAg ICAgc2VsZi50ZXN0c19ieV9leHBlY3RhdGlvbltTS0lQXSA9IGV4cGVjdGVkX3NraXBzCiAgICAg ICAgIGZvciBleHBlY3RhdGlvbiBpbiBUZXN0RXhwZWN0YXRpb25zLkVYUEVDVEFUSU9OUy52YWx1 ZXMoKToKICAgICAgICAgICAgIHNlbGYudGVzdHNfYnlfZXhwZWN0YXRpb25bZXhwZWN0YXRpb25d ID0gc2V0KCkKICAgICAgICAgICAgIHNlbGYudG90YWxfdGVzdHNfYnlfZXhwZWN0YXRpb25bZXhw ZWN0YXRpb25dID0gMApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDljNmQ0Nzhk NGQ0MTk4ZGQ5NDkxZWFjODVhM2NmNDQyZmYxNWIzZmUuLmI5NGI4MzJiNWVmNDg0YTJjNTUzMTIz Mzc0MmQ0NmY4Y2RkY2Y4NDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTIz Miw2ICsyMzIsMTAgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6CiAgICAg ICAgIGV4cGVjdGF0aW9uX2xpbmUgPSBUZXN0RXhwZWN0YXRpb25MaW5lKCkKICAgICAgICAgZXhw ZWN0YXRpb25fbGluZS5vcmlnaW5hbF9zdHJpbmcgPSB0ZXN0X25hbWUKICAgICAgICAgZXhwZWN0 YXRpb25fbGluZS5tb2RpZmllcnMgPSBbVGVzdEV4cGVjdGF0aW9uUGFyc2VyLkRVTU1ZX0JVR19N T0RJRklFUiwgVGVzdEV4cGVjdGF0aW9uUGFyc2VyLlNLSVBfTU9ESUZJRVJdCisgICAgICAgICMg RklYTUU6IEl0J3Mgbm90IGNsZWFyIHdoYXQgdGhlIGV4cGVjdGF0aW9ucyBmb3IgYSBza2lwcGVk IHRlc3Qgc2hvdWxkIGJlOyB0aGUgZXhwZWN0YXRpb25zCisgICAgICAgICMgbWlnaHQgYmUgZGlm ZmVyZW50IGZvciBkaWZmZXJlbnQgZW50cmllcyBpbiBhIFNraXBwZWQgZmlsZSwgb3IgZnJvbSB0 aGUgY29tbWFuZCBsaW5lLCBvciBmcm9tCisgICAgICAgICMgb25seSBydW5uaW5nIHBhcnRzIG9m IHRoZSB0ZXN0cy4gSXQncyBhbHNvIG5vdCBjbGVhciBpZiBpdCBtYXR0ZXJzIG11Y2guCisgICAg ICAgIGV4cGVjdGF0aW9uX2xpbmUubW9kaWZpZXJzLmFwcGVuZChUZXN0RXhwZWN0YXRpb25QYXJz ZXIuV09OVEZJWF9NT0RJRklFUikKICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5uYW1lID0gdGVz dF9uYW1lCiAgICAgICAgICMgRklYTUU6IHdlIHNob3VsZCBwYXNzIGluIGEgbW9yZSBkZXNjcmlw dGl2ZSBzdHJpbmcgaGVyZS4KICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5maWxlbmFtZSA9ICc8 U2tpcHBlZCBmaWxlPicKQEAgLTc1OSw3ICs3NjMsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25z KG9iamVjdCk6CiAgICAgICAgICAgICAgICAgc2VsZi5fZXhwZWN0YXRpb25zICs9IGV4cGVjdGF0 aW9ucwogCiAgICAgICAgICMgRklYTUU6IG1vdmUgaWdub3JlX3Rlc3RzIGludG8gcG9ydC5za2lw cGVkX2xheW91dF90ZXN0cygpCi0gICAgICAgIHNlbGYuX2FkZF9za2lwcGVkX3Rlc3RzKHBvcnQu c2tpcHBlZF9sYXlvdXRfdGVzdHModGVzdHMpLnVuaW9uKHNldChwb3J0LmdldF9vcHRpb24oJ2ln bm9yZV90ZXN0cycsIFtdKSkpKQorICAgICAgICBzZWxmLmFkZF9za2lwcGVkX3Rlc3RzKHBvcnQu c2tpcHBlZF9sYXlvdXRfdGVzdHModGVzdHMpLnVuaW9uKHNldChwb3J0LmdldF9vcHRpb24oJ2ln bm9yZV90ZXN0cycsIFtdKSkpKQogCiAgICAgICAgIHNlbGYuX2hhc193YXJuaW5ncyA9IEZhbHNl CiAgICAgICAgIHNlbGYuX3JlcG9ydF93YXJuaW5ncygpCkBAIC04ODIsNyArODg2LDcgQEAgY2xh c3MgVGVzdEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgICAgICAgICAgaWYgc2VsZi5faXNfbGlu dF9tb2RlIG9yIHNlbGYuX3Rlc3RfY29uZmlnIGluIGV4cGVjdGF0aW9uX2xpbmUubWF0Y2hpbmdf Y29uZmlndXJhdGlvbnM6CiAgICAgICAgICAgICAgICAgc2VsZi5fbW9kZWwuYWRkX2V4cGVjdGF0 aW9uX2xpbmUoZXhwZWN0YXRpb25fbGluZSkKIAotICAgIGRlZiBfYWRkX3NraXBwZWRfdGVzdHMo c2VsZiwgdGVzdHNfdG9fc2tpcCk6CisgICAgZGVmIGFkZF9za2lwcGVkX3Rlc3RzKHNlbGYsIHRl c3RzX3RvX3NraXApOgogICAgICAgICBpZiBub3QgdGVzdHNfdG9fc2tpcDoKICAgICAgICAgICAg IHJldHVybgogICAgICAgICBmb3IgdGVzdCBpbiBzZWxmLl9leHBlY3RhdGlvbnM6CmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBl Y3RhdGlvbnNfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKaW5kZXggYzc4MGRhYzIzZDhi Nzk3NmMxNzU4OGIzMjUwZmYwZDUxYzcyNDE0NC4uMmI0ODUzZmE4OWYzNjA0YjgxMDAyYWE5MmNm MjgxZjdlZTZmMDIzMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0 dGVzdC5weQpAQCAtMjg0LDcgKzI4NCw3IEBAIGNsYXNzIFNraXBwZWRUZXN0cyhCYXNlKToKIAog ICAgICAgICAjIENoZWNrIHRoYXQgdGhlIGV4cGVjdGF0aW9uIGlzIGZvciBCVUdfRFVNTVkgU0tJ UCA6IC4uLiA9IFBBU1MKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwLmdldF9tb2RpZmll cnMoJ2ZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICBbVGVzdEV4cGVjdGF0aW9uUGFyc2VyLkRVTU1ZX0JVR19NT0RJRklFUiwgVGVzdEV4cGVj dGF0aW9uUGFyc2VyLlNLSVBfTU9ESUZJRVJdKQorICAgICAgICAgICAgICAgICAgICAgICAgICBb VGVzdEV4cGVjdGF0aW9uUGFyc2VyLkRVTU1ZX0JVR19NT0RJRklFUiwgVGVzdEV4cGVjdGF0aW9u UGFyc2VyLlNLSVBfTU9ESUZJRVIsIFRlc3RFeHBlY3RhdGlvblBhcnNlci5XT05URklYX01PRElG SUVSXSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZXhwLmdldF9leHBlY3RhdGlvbnMoJ2Zh aWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCcpLCBzZXQoW1BBU1NdKSkKIAogICAgIGRlZiB0ZXN0 X3NraXBwZWRfdGVzdHNfd29yayhzZWxmKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDk1YTA3ZjU5ZWFl Y2ZkZWNmMmNkZTVmMmI1ZGIxNTA3Njg2MGFmODQuLmM0ZjRmMjQwNDkyN2QwNzhkY2E3MGRhOTc0 NWVkNWZjNjY1ZGQxNjQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtNDEyLDggKzQxMiw4IEBAIGRlZiBw YXJzZV9hcmdzKGFyZ3M9Tm9uZSk6CiAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLWV4 aXQtYWZ0ZXItbi1jcmFzaGVzLW9yLXRpbWVvdXRzIiwgdHlwZT0iaW50IiwKICAgICAgICAgICAg IGRlZmF1bHQ9Tm9uZSwgaGVscD0iRXhpdCBhZnRlciB0aGUgZmlyc3QgTiBjcmFzaGVzIGluc3Rl YWQgb2YgIgogICAgICAgICAgICAgInJ1bm5pbmcgYWxsIHRlc3RzIiksCi0gICAgICAgIG9wdHBh cnNlLm1ha2Vfb3B0aW9uKCItLWl0ZXJhdGlvbnMiLCB0eXBlPSJpbnQiLCBoZWxwPSJOdW1iZXIg b2YgdGltZXMgdG8gcnVuIHRoZSBzZXQgb2YgdGVzdHMgKGUuZy4gQUJDQUJDQUJDKSIpLAotICAg ICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1yZXBlYXQtZWFjaCIsIHR5cGU9ImludCIsIGhl bHA9Ik51bWJlciBvZiB0aW1lcyB0byBydW4gZWFjaCB0ZXN0IChlLmcuIEFBQUJCQkNDQykiKSwK KyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0taXRlcmF0aW9ucyIsIHR5cGU9ImludCIs IGRlZmF1bHQ9MSwgaGVscD0iTnVtYmVyIG9mIHRpbWVzIHRvIHJ1biB0aGUgc2V0IG9mIHRlc3Rz IChlLmcuIEFCQ0FCQ0FCQykiKSwKKyAgICAgICAgb3B0cGFyc2UubWFrZV9vcHRpb24oIi0tcmVw ZWF0LWVhY2giLCB0eXBlPSJpbnQiLCBkZWZhdWx0PTEsIGhlbHA9Ik51bWJlciBvZiB0aW1lcyB0 byBydW4gZWFjaCB0ZXN0IChlLmcuIEFBQUJCQkNDQykiKSwKICAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oIi0tcmV0cnktZmFpbHVyZXMiLCBhY3Rpb249InN0b3JlX3RydWUiLAogICAgICAg ICAgICAgZGVmYXVsdD1UcnVlLAogICAgICAgICAgICAgaGVscD0iUmUtdHJ5IGFueSB0ZXN0cyB0 aGF0IHByb2R1Y2UgdW5leHBlY3RlZCByZXN1bHRzIChkZWZhdWx0KSIpLApkaWZmIC0tZ2l0IGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQppbmRl eCAxYzJmZWNkN2I3ZjhiOTlkOTBiNzFjNmU2NjRjMGRmMDQ1NmMxOTY3Li42Mzc3MzdlY2RkNzE0 NzBlNDA5MmZlMzhkZGZlMjc4NjkyZDA1ZDc4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZy5weQpAQCAtMjIwLDIxICsyMjAs MTggQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBzZWxmLl9wcmludF9jb25maWco J0NvbW1hbmQgbGluZTogJyArICcgJy5qb2luKHNlbGYuX3BvcnQuZHJpdmVyX2NtZF9saW5lKCkp KQogICAgICAgICBzZWxmLl9wcmludF9jb25maWcoJycpCiAKLSAgICBkZWYgcHJpbnRfZXhwZWN0 ZWQoc2VsZiwgbnVtX2FsbF90ZXN0X2ZpbGVzLCByZXN1bHRfc3VtbWFyeSwgdGVzdHNfd2l0aF9y ZXN1bHRfdHlwZV9jYWxsYmFjayk6Ci0gICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVkKCdGb3Vu ZCAlcy4nICUgZ3JhbW1hci5wbHVyYWxpemUoJ3Rlc3QnLCBudW1fYWxsX3Rlc3RfZmlsZXMpKQor ICAgIGRlZiBwcmludF9mb3VuZChzZWxmLCBudW1fYWxsX3Rlc3RfZmlsZXMsIG51bV90b19ydW4s IHJlcGVhdF9lYWNoLCBpdGVyYXRpb25zKToKKyAgICAgICAgZm91bmRfc3RyID0gJ0ZvdW5kICVz OyBydW5uaW5nICVkJyAlIChncmFtbWFyLnBsdXJhbGl6ZSgndGVzdCcsIG51bV9hbGxfdGVzdF9m aWxlcyksIG51bV90b19ydW4pCisgICAgICAgIGlmIHJlcGVhdF9lYWNoICogaXRlcmF0aW9ucyA+ IDE6CisgICAgICAgICAgICBmb3VuZF9zdHIgKz0gJywgJWQgdGltZXMgZWFjaCAoLS1yZXBlYXQt ZWFjaD0lZCwgLS1pdGVyYXRpb25zPSVkKScgJSAocmVwZWF0X2VhY2ggKiBpdGVyYXRpb25zLCBy ZXBlYXRfZWFjaCwgaXRlcmF0aW9ucykKKyAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWQoZm91 bmRfc3RyICsgJy4nKQorCisgICAgZGVmIHByaW50X2V4cGVjdGVkKHNlbGYsIHJlc3VsdF9zdW1t YXJ5LCB0ZXN0c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKToKICAgICAgICAgc2VsZi5fcHJp bnRfZXhwZWN0ZWRfcmVzdWx0c19vZl90eXBlKHJlc3VsdF9zdW1tYXJ5LCB0ZXN0X2V4cGVjdGF0 aW9ucy5QQVNTLCAicGFzc2VzIiwgdGVzdHNfd2l0aF9yZXN1bHRfdHlwZV9jYWxsYmFjaykKICAg ICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWRfcmVzdWx0c19vZl90eXBlKHJlc3VsdF9zdW1tYXJ5 LCB0ZXN0X2V4cGVjdGF0aW9ucy5GQUlMLCAiZmFpbHVyZXMiLCB0ZXN0c193aXRoX3Jlc3VsdF90 eXBlX2NhbGxiYWNrKQogICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZF9yZXN1bHRzX29mX3R5 cGUocmVzdWx0X3N1bW1hcnksIHRlc3RfZXhwZWN0YXRpb25zLkZMQUtZLCAiZmxha3kiLCB0ZXN0 c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKQotICAgICAgICBzZWxmLl9wcmludF9leHBlY3Rl ZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1hcnksIHRlc3RfZXhwZWN0YXRpb25zLlNLSVAs ICJza2lwcGVkIiwgdGVzdHNfd2l0aF9yZXN1bHRfdHlwZV9jYWxsYmFjaykKICAgICAgICAgc2Vs Zi5fcHJpbnRfZXhwZWN0ZWQoJycpCiAKLSAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5yZXBlYXRf ZWFjaCA+IDE6Ci0gICAgICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZCgnUnVubmluZyBlYWNo IHRlc3QgJWQgdGltZXMuJyAlIHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2gpCi0gICAgICAgIGlm IHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucyA+IDE6Ci0gICAgICAgICAgICBzZWxmLl9wcmludF9l eHBlY3RlZCgnUnVubmluZyAlZCBpdGVyYXRpb25zIG9mIHRoZSB0ZXN0cy4nICUgc2VsZi5fb3B0 aW9ucy5pdGVyYXRpb25zKQotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMgPiAx IG9yIHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2ggPiAxOgotICAgICAgICAgICAgc2VsZi5fcHJp bnRfZXhwZWN0ZWQoJycpCi0KICAgICBkZWYgcHJpbnRfd29ya2Vyc19hbmRfc2hhcmRzKHNlbGYs IG51bV93b3JrZXJzLCBudW1fc2hhcmRzLCBudW1fbG9ja2VkX3NoYXJkcyk6CiAgICAgICAgIGRy aXZlcl9uYW1lID0gc2VsZi5fcG9ydC5kcml2ZXJfbmFtZSgpCiAgICAgICAgIGlmIG51bV93b3Jr ZXJzID09IDE6CkBAIC00NDcsNyArNDQ0LDcgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAg ICAgICAiIiIKICAgICAgICAgZmFpbGVkID0gcmVzdWx0X3N1bW1hcnkudG90YWxfZmFpbHVyZXMK ICAgICAgICAgdG90YWwgPSByZXN1bHRfc3VtbWFyeS50b3RhbCAtIHJlc3VsdF9zdW1tYXJ5LmV4 cGVjdGVkX3NraXBzCi0gICAgICAgIHBhc3NlZCA9IHRvdGFsIC0gZmFpbGVkCisgICAgICAgIHBh c3NlZCA9IHRvdGFsIC0gZmFpbGVkIC0gcmVzdWx0X3N1bW1hcnkucmVtYWluaW5nCiAgICAgICAg IHBjdF9wYXNzZWQgPSAwLjAKICAgICAgICAgaWYgdG90YWwgPiAwOgogICAgICAgICAgICAgcGN0 X3Bhc3NlZCA9IGZsb2F0KHBhc3NlZCkgKiAxMDAgLyB0b3RhbApAQCAtNDYwLDYgKzQ1Nyw3IEBA IGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIHRlc3RfZXhwZWN0YXRpb25zLk5P VywgIlRlc3RzIHRvIGJlIGZpeGVkIikKIAogICAgICAgICBzZWxmLnByaW50X2FjdHVhbCgiIikK KyAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIGJlIHNraXBwaW5nIGFueXRoaW5nIG1hcmtlZCBX T05URklYLCBzbyB3ZSBzaG91bGRuJ3QgYm90aGVyIGxvZ2dpbmcgdGhlc2Ugc3RhdHMuCiAgICAg ICAgIHNlbGYuX3ByaW50X3Jlc3VsdF9zdW1tYXJ5X2VudHJ5KHJlc3VsdF9zdW1tYXJ5LAogICAg ICAgICAgICAgdGVzdF9leHBlY3RhdGlvbnMuV09OVEZJWCwKICAgICAgICAgICAgICJUZXN0cyB0 aGF0IHdpbGwgb25seSBiZSBmaXhlZCBpZiB0aGV5IGNyYXNoIChXT05URklYKSIpCkBAIC00NzEs NyArNDY5LDcgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogCiAgICAgICAgIEFyZ3M6CiAgICAg ICAgICAgcmVzdWx0X3N1bW1hcnk6IHN1bW1hcnkgdG8gcHJpbnQgcmVzdWx0cyBmb3IKLSAgICAg ICAgICB0aW1lbGluZTogdGhlIHRpbWVsaW5lIHRvIHByaW50IHJlc3VsdHMgZm9yIChOT1QsIFdP TlRGSVgsIGV0Yy4pCisgICAgICAgICAgdGltZWxpbmU6IHRoZSB0aW1lbGluZSB0byBwcmludCBy ZXN1bHRzIGZvciAoTk9XLCBXT05URklYLCBldGMuKQogICAgICAgICAgIGhlYWRpbmc6IGEgdGV4 dHVhbCBkZXNjcmlwdGlvbiBvZiB0aGUgdGltZWxpbmUKICAgICAgICAgIiIiCiAgICAgICAgIHRv dGFsID0gbGVuKHJlc3VsdF9zdW1tYXJ5LnRlc3RzX2J5X3RpbWVsaW5lW3RpbWVsaW5lXSkKQEAg LTQ4MSw3ICs0NzksNyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYucHJp bnRfYWN0dWFsKCI9PiAlcyAoJWQpOiIgJSAoaGVhZGluZywgbm90X3Bhc3NpbmcpKQogCiAgICAg ICAgIGZvciByZXN1bHQgaW4gVGVzdEV4cGVjdGF0aW9ucy5FWFBFQ1RBVElPTl9PUkRFUjoKLSAg ICAgICAgICAgIGlmIHJlc3VsdCA9PSB0ZXN0X2V4cGVjdGF0aW9ucy5QQVNTOgorICAgICAgICAg ICAgaWYgcmVzdWx0IGluICh0ZXN0X2V4cGVjdGF0aW9ucy5QQVNTLCB0ZXN0X2V4cGVjdGF0aW9u cy5TS0lQKToKICAgICAgICAgICAgICAgICBjb250aW51ZQogICAgICAgICAgICAgcmVzdWx0cyA9 IChyZXN1bHRfc3VtbWFyeS50ZXN0c19ieV9leHBlY3RhdGlvbltyZXN1bHRdICYKICAgICAgICAg ICAgICAgICAgICAgICAgcmVzdWx0X3N1bW1hcnkudGVzdHNfYnlfdGltZWxpbmVbdGltZWxpbmVd KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3Mv cHJpbnRpbmdfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQppbmRleCBmOGRkNjFkYjdjZTAyMDI3Nzg2M2E4 ODgyNWRjN2MwYTM3ZjZlMjgxLi43NTA1ZDVjMDVhM2YyY2ZjNjQ5OWFiNDBhOGRkZDg2OGJlNzJi NzU5IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3 cy9wcmludGluZ191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQpAQCAtMTMwLDcgKzEzMCw3IEBAIGNs YXNzICBUZXN0cHJpbnRlcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHBvcnQudGVzdF9l eHBlY3RhdGlvbnNfb3ZlcnJpZGVzID0gbGFtYmRhOiBOb25lCiAgICAgICAgIGV4cGVjdGF0aW9u cyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBlY3RhdGlvbnMoc2VsZi5fcG9ydCwgdGVzdF9u YW1lcykKIAotICAgICAgICBycyA9IHJlc3VsdF9zdW1tYXJ5LlJlc3VsdFN1bW1hcnkoZXhwZWN0 YXRpb25zLCB0ZXN0X25hbWVzKQorICAgICAgICBycyA9IHJlc3VsdF9zdW1tYXJ5LlJlc3VsdFN1 bW1hcnkoZXhwZWN0YXRpb25zLCB0ZXN0X25hbWVzLCAxLCBzZXQoKSkKICAgICAgICAgcmV0dXJu IHRlc3RfbmFtZXMsIHJzLCBleHBlY3RhdGlvbnMKIAogICAgIGRlZiB0ZXN0X2hlbHBfcHJpbnRl cihzZWxmKToK