88942 2012-06-12 19:00:15 -0700 nrwt: preliminary cleanup before supporting cascading expectations files 2012-06-13 11:51:14 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 65834 88944 88945 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 647590 0 dpranke 2012-06-12 19:00:15 -0700 nrwt: preliminary cleanup before supporting cascading expectations files 647591 1 147212 dpranke 2012-06-12 19:01:48 -0700 Created attachment 147212 Patch 648126 2 147212 ojan 2012-06-13 09:26:40 -0700 Comment on attachment 147212 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=147212&action=review > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:239 > + expectation_line.filename = '<Skipped file>' Should this have a FIXME to associate paths with Skipped file lines as well? I doubt we'll ever get around to it as we'll hopefully drop Skipped files entirely. 648204 3 dpranke 2012-06-13 10:21:06 -0700 (In reply to comment #2) > (From update of attachment 147212 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=147212&action=review > > > Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py:239 > > + expectation_line.filename = '<Skipped file>' > > Should this have a FIXME to associate paths with Skipped file lines as well? I doubt we'll ever get around to it as we'll hopefully drop Skipped files entirely. Two observations: the first is that some skipped entries are actually runtime-computed and don't actually live in files (some come from the command line as well). The second is that I'm planning to move the Skipped files to TestExpectations files (unless someone objects) and then, as you say, it'll go away. I'll add a comment, though. 648308 4 dpranke 2012-06-13 11:50:19 -0700 Committed r120230: <http://trac.webkit.org/changeset/120230> 648311 5 dpranke 2012-06-13 11:51:14 -0700 whoops, forgot the fixme ... will add it in the next patch. 147212 2012-06-12 19:01:48 -0700 2012-06-13 09:26:40 -0700 Patch bug-88942-20120612190147.patch text/plain 19900 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwMTQ4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGM0ODU0NWVmZTE3YTFjOGNhODdkNDQ5ZTdkYjJkZjk2 ZDEzODA2Yi4uODA0ZjAyNzUzZjFkNDRmMjJlYTAxODg5ZjNiOWI4Y2Q1MDZhZWVmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5 IEBACisyMDEyLTA2LTEyICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIG5yd3Q6IHByZWxpbWluYXJ5IGNsZWFudXAgYmVmb3JlIHN1cHBvcnRpbmcgY2FzY2Fk aW5nIGV4cGVjdGF0aW9ucyBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODg5NDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGNoYW5nZSBqdXN0IHByZXBhcmVzIHRoZSBUZXN0RXhwZWN0YXRp b25zIHBhcnNlciB0byBnZXQgZmlsZW5hbWVzCisgICAgICAgIGFsb25nIHdpdGggdGhlIGV4cGVj dGF0aW9ucywgYW5kIGltcHJvdmVzIHRoZSB3YXJuaW5nIG1lc3NhZ2VzIHNvIHRoYXQKKyAgICAg ICAgdGhleSBjb250YWluIHRoZSBmaWxlbmFtZXMgYWxvbmcgd2l0aCB0aGUgbGluZSBudW1iZXJz LgorCisgICAgICAgIFRoZXJlIHNob3VsZCBiZSBubyBmdW5jdGlvbmFsIGNoYW5nZXMgaW4gdGhp cyBwYXRjaC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRy b2xsZXJzL3Rlc3RfZXhwZWN0YXRpb25zX2VkaXRvcl91bml0dGVzdC5weToKKyAgICAgICAgKFRl c3RFeHBlY3RhdGlvbkVkaXRvclRlc3RzLm1ha2VfcGFyc2VkX2V4cGVjdGF0aW9uX2xpbmVzKToK KyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVzdF9leHBl Y3RhdGlvbnMucHk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25QYXJzZXIucGFyc2UpOgorICAg ICAgICAoVGVzdEV4cGVjdGF0aW9uUGFyc2VyLmV4cGVjdGF0aW9uX2Zvcl9za2lwcGVkX3Rlc3Qp OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uUGFyc2VyLl90b2tlbml6ZSk6CisgICAgICAgIChU ZXN0RXhwZWN0YXRpb25QYXJzZXIuX3Rva2VuaXplX2xpc3QpOgorICAgICAgICAoVGVzdEV4cGVj dGF0aW9uTGluZSk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25zTW9kZWwuX19pbml0X18pOgor ICAgICAgICAoVGVzdEV4cGVjdGF0aW9uc01vZGVsLl9hbHJlYWR5X3NlZW5fYmV0dGVyX21hdGNo KToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvbnMuX19pbml0X18pOgorICAgICAgICAoVGVzdEV4 cGVjdGF0aW9ucy5fc2hvcnRlbl9maWxlbmFtZSk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25z Ll9yZXBvcnRfd2FybmluZ3MpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9ucy5fYWRkX3NraXBw ZWRfdGVzdHMpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlv blBhcnNlclRlc3RzLl90b2tlbml6ZSk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25QYXJzZXJU ZXN0cy50ZXN0X3Rva2VuaXplX2JsYW5rKToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblBhcnNl clRlc3RzLnRlc3RfdG9rZW5pemVfbWlzc2luZ19jb2xvbik6CisgICAgICAgIChUZXN0RXhwZWN0 YXRpb25QYXJzZXJUZXN0cy50ZXN0X3Rva2VuaXplX2V4dHJhX2NvbG9uKToKKyAgICAgICAgKFRl c3RFeHBlY3RhdGlvblBhcnNlclRlc3RzLnRlc3RfdG9rZW5pemVfZW1wdHlfY29tbWVudCk6Cisg ICAgICAgIChUZXN0RXhwZWN0YXRpb25QYXJzZXJUZXN0cy50ZXN0X3Rva2VuaXplX2NvbW1lbnQp OgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uUGFyc2VyVGVzdHMudGVzdF90b2tlbml6ZV9taXNz aW5nX2VxdWFsKToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblBhcnNlclRlc3RzLnRlc3RfdG9r ZW5pemVfZXh0cmFfZXF1YWwpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uUGFyc2VyVGVzdHMu dGVzdF90b2tlbml6ZV92YWxpZCk6CisgICAgICAgIChUZXN0RXhwZWN0YXRpb25QYXJzZXJUZXN0 cy50ZXN0X3Rva2VuaXplX3ZhbGlkX3dpdGhfY29tbWVudCk6CisgICAgICAgIChUZXN0RXhwZWN0 YXRpb25QYXJzZXJUZXN0cy50ZXN0X3Rva2VuaXplX3ZhbGlkX3dpdGhfbXVsdGlwbGVfbW9kaWZp ZXJzKToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblBhcnNlclRlc3RzLnRlc3RfcGFyc2VfZW1w dHlfc3RyaW5nKToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXJUZXN0cy5fdG9r ZW5pemUpOgorICAgICAgICAoVGVzdEV4cGVjdGF0aW9uU2VyaWFsaXplclRlc3RzLmFzc2VydF9y b3VuZF90cmlwKToKKyAgICAgICAgKFRlc3RFeHBlY3RhdGlvblNlcmlhbGl6ZXJUZXN0cy5hc3Nl cnRfbGlzdF9yb3VuZF90cmlwKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rvb2wvc2Vy dmVycy9nYXJkZW5pbmdzZXJ2ZXIucHk6CisgICAgICAgIChHYXJkZW5pbmdFeHBlY3RhdGlvbnNV cGRhdGVyLnVwZGF0ZV9leHBlY3RhdGlvbnMpOgorCiAyMDEyLTA2LTEyICBDaHJpc3RvcGhlIER1 bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CiAKICAgICAgICAgW3NvdXBdIFByZXZl bnQgc2V0dGluZyBvciBlZGl0aW5nIGh0dHBPbmx5IGNvb2tpZXMgZnJvbSBKYXZhU2NyaXB0CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVy cy90ZXN0X2V4cGVjdGF0aW9uc19lZGl0b3JfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X2V4cGVjdGF0aW9uc19lZGl0b3Jf dW5pdHRlc3QucHkKaW5kZXggMzEwMjlhMzVmYWIyMWEwZDlhNTljOTFkNjM1YjAyZmVmZWYzYzNh Mi4uMzQwNjBhM2JlZjNkYmJmZDY1OWQ5OWE5YThkNTViYTAxMWQ5YzMzOSAxMDA2NDQKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9leHBl Y3RhdGlvbnNfZWRpdG9yX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfZXhwZWN0YXRpb25zX2VkaXRvcl91bml0dGVz dC5weQpAQCAtNzcsNyArNzcsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25FZGl0b3JUZXN0cyh1 bml0dGVzdC5UZXN0Q2FzZSk6CiAKICAgICBkZWYgbWFrZV9wYXJzZWRfZXhwZWN0YXRpb25fbGlu ZXMoc2VsZiwgaW5fc3RyaW5nKToKICAgICAgICAgcGFyc2VyID0gVGVzdEV4cGVjdGF0aW9uUGFy c2VyKHNlbGYudGVzdF9wb3J0LCBzZWxmLmZ1bGxfdGVzdF9saXN0LCBhbGxvd19yZWJhc2VsaW5l X21vZGlmaWVyPUZhbHNlKQotICAgICAgICBleHBlY3RhdGlvbl9saW5lcyA9IHBhcnNlci5wYXJz ZShpbl9zdHJpbmcpCisgICAgICAgIGV4cGVjdGF0aW9uX2xpbmVzID0gcGFyc2VyLnBhcnNlKCdw YXRoJywgaW5fc3RyaW5nKQogICAgICAgICBmb3IgZXhwZWN0YXRpb25fbGluZSBpbiBleHBlY3Rh dGlvbl9saW5lczoKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2UoZXhwZWN0YXRpb25fbGlu ZS5pc19pbnZhbGlkKCkpCiAgICAgICAgIHJldHVybiBleHBlY3RhdGlvbl9saW5lcwpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhw ZWN0YXRpb25zLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxz L3Rlc3RfZXhwZWN0YXRpb25zLnB5CmluZGV4IDc3NDg4ODI1ZTY3YzFjYjFlZWYyNmUyNGYyMTVj M2ZlNTVjZTc2ODIuLmU2YjRlN2RlODFhMTVmYzVjMWJkMzFjNDg2MWI3Mjc2YTIwYjljZGIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0 X2V4cGVjdGF0aW9ucy5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnMucHkKQEAgLTIyNSw4ICsyMjUsOCBAQCBjbGFzcyBU ZXN0RXhwZWN0YXRpb25QYXJzZXIob2JqZWN0KToKICAgICAgICAgc2VsZi5fZnVsbF90ZXN0X2xp c3QgPSBmdWxsX3Rlc3RfbGlzdAogICAgICAgICBzZWxmLl9hbGxvd19yZWJhc2VsaW5lX21vZGlm aWVyID0gYWxsb3dfcmViYXNlbGluZV9tb2RpZmllcgogCi0gICAgZGVmIHBhcnNlKHNlbGYsIGV4 cGVjdGF0aW9uc19zdHJpbmcpOgotICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhwZWN0YXRp b25QYXJzZXIuX3Rva2VuaXplX2xpc3QoZXhwZWN0YXRpb25zX3N0cmluZykKKyAgICBkZWYgcGFy c2Uoc2VsZiwgZmlsZW5hbWUsIGV4cGVjdGF0aW9uc19zdHJpbmcpOgorICAgICAgICBleHBlY3Rh dGlvbnMgPSBUZXN0RXhwZWN0YXRpb25QYXJzZXIuX3Rva2VuaXplX2xpc3QoZmlsZW5hbWUsIGV4 cGVjdGF0aW9uc19zdHJpbmcpCiAgICAgICAgIGZvciBleHBlY3RhdGlvbl9saW5lIGluIGV4cGVj dGF0aW9uczoKICAgICAgICAgICAgIHNlbGYuX3BhcnNlX2xpbmUoZXhwZWN0YXRpb25fbGluZSkK ICAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9ucwpAQCAtMjM2LDYgKzIzNiw4IEBAIGNsYXNzIFRl c3RFeHBlY3RhdGlvblBhcnNlcihvYmplY3QpOgogICAgICAgICBleHBlY3RhdGlvbl9saW5lLm9y aWdpbmFsX3N0cmluZyA9IHRlc3RfbmFtZQogICAgICAgICBleHBlY3RhdGlvbl9saW5lLm1vZGlm aWVycyA9IFtUZXN0RXhwZWN0YXRpb25QYXJzZXIuRFVNTVlfQlVHX01PRElGSUVSLCBUZXN0RXhw ZWN0YXRpb25QYXJzZXIuU0tJUF9NT0RJRklFUl0KICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5u YW1lID0gdGVzdF9uYW1lCisgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUuZmlsZW5hbWUgPSAnPFNr aXBwZWQgZmlsZT4nCisgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUubGluZV9udW1iZXIgPSAwCiAg ICAgICAgIGV4cGVjdGF0aW9uX2xpbmUuZXhwZWN0YXRpb25zID0gW1Rlc3RFeHBlY3RhdGlvblBh cnNlci5QQVNTX0VYUEVDVEFUSU9OXQogICAgICAgICBzZWxmLl9wYXJzZV9saW5lKGV4cGVjdGF0 aW9uX2xpbmUpCiAgICAgICAgIHJldHVybiBleHBlY3RhdGlvbl9saW5lCkBAIC0zMzcsNyArMzM5 LDcgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6CiAgICAgICAgICAgICBl eHBlY3RhdGlvbl9saW5lLm1hdGNoaW5nX3Rlc3RzLmFwcGVuZChleHBlY3RhdGlvbl9saW5lLnBh dGgpCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX3Rva2VuaXplKGNscywgZXhwZWN0YXRp b25fc3RyaW5nLCBsaW5lX251bWJlcj1Ob25lKToKKyAgICBkZWYgX3Rva2VuaXplKGNscywgZmls ZW5hbWUsIGV4cGVjdGF0aW9uX3N0cmluZywgbGluZV9udW1iZXIpOgogICAgICAgICAiIiJUb2tl bml6ZXMgYSBsaW5lIGZyb20gVGVzdEV4cGVjdGF0aW9ucyBhbmQgcmV0dXJucyBhbiB1bnBhcnNl ZCBUZXN0RXhwZWN0YXRpb25MaW5lIGluc3RhbmNlLgogCiAgICAgICAgIFRoZSBmb3JtYXQgb2Yg YSB0ZXN0IGV4cGVjdGF0aW9uIGxpbmUgaXM6CkBAIC0zNTAsNiArMzUyLDcgQEAgY2xhc3MgVGVz dEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6CiAgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUgPSBU ZXN0RXhwZWN0YXRpb25MaW5lKCkKICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5vcmlnaW5hbF9z dHJpbmcgPSBleHBlY3RhdGlvbl9zdHJpbmcKICAgICAgICAgZXhwZWN0YXRpb25fbGluZS5saW5l X251bWJlciA9IGxpbmVfbnVtYmVyCisgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUuZmlsZW5hbWUg PSBmaWxlbmFtZQogICAgICAgICBjb21tZW50X2luZGV4ID0gZXhwZWN0YXRpb25fc3RyaW5nLmZp bmQoIi8vIikKICAgICAgICAgaWYgY29tbWVudF9pbmRleCA9PSAtMToKICAgICAgICAgICAgIGNv bW1lbnRfaW5kZXggPSBsZW4oZXhwZWN0YXRpb25fc3RyaW5nKQpAQCAtMzc2LDEzICszNzksMTMg QEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uUGFyc2VyKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBl eHBlY3RhdGlvbl9saW5lCiAKICAgICBAY2xhc3NtZXRob2QKLSAgICBkZWYgX3Rva2VuaXplX2xp c3QoY2xzLCBleHBlY3RhdGlvbnNfc3RyaW5nKToKKyAgICBkZWYgX3Rva2VuaXplX2xpc3QoY2xz LCBmaWxlbmFtZSwgZXhwZWN0YXRpb25zX3N0cmluZyk6CiAgICAgICAgICIiIlJldHVybnMgYSBs aXN0IG9mIFRlc3RFeHBlY3RhdGlvbkxpbmVzLCBvbmUgZm9yIGVhY2ggbGluZSBpbiBleHBlY3Rh dGlvbnNfc3RyaW5nLiIiIgogICAgICAgICBleHBlY3RhdGlvbl9saW5lcyA9IFtdCiAgICAgICAg IGxpbmVfbnVtYmVyID0gMAogICAgICAgICBmb3IgbGluZSBpbiBleHBlY3RhdGlvbnNfc3RyaW5n LnNwbGl0KCJcbiIpOgogICAgICAgICAgICAgbGluZV9udW1iZXIgKz0gMQotICAgICAgICAgICAg ZXhwZWN0YXRpb25fbGluZXMuYXBwZW5kKGNscy5fdG9rZW5pemUobGluZSwgbGluZV9udW1iZXIp KQorICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZXMuYXBwZW5kKGNscy5fdG9rZW5pemUoZmls ZW5hbWUsIGxpbmUsIGxpbmVfbnVtYmVyKSkKICAgICAgICAgcmV0dXJuIGV4cGVjdGF0aW9uX2xp bmVzCiAKICAgICBAY2xhc3NtZXRob2QKQEAgLTM5Miw3ICszOTUsNyBAQCBjbGFzcyBUZXN0RXhw ZWN0YXRpb25QYXJzZXIob2JqZWN0KToKICAgICAgICAgcmV0dXJuIFtwYXJ0LnN0cmlwKCkubG93 ZXIoKSBmb3IgcGFydCBpbiBzcGFjZV9zZXBhcmF0ZWRfc3RyaW5nLnN0cmlwKCkuc3BsaXQoJyAn KV0KIAogCi1jbGFzcyBUZXN0RXhwZWN0YXRpb25MaW5lOgorY2xhc3MgVGVzdEV4cGVjdGF0aW9u TGluZShvYmplY3QpOgogICAgICIiIlJlcHJlc2VudHMgYSBsaW5lIGluIHRlc3QgZXhwZWN0YXRp b25zIGZpbGUuIiIiCiAKICAgICBkZWYgX19pbml0X18oc2VsZik6CkBAIC00MzIsNyArNDM1LDcg QEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uTGluZToKIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2Rl bChvYmplY3QpOgogICAgICIiIlJlcHJlc2VudHMgcmVsYXRpb25hbCBzdG9yZSBvZiBhbGwgZXhw ZWN0YXRpb25zIGFuZCBwcm92aWRlcyBDUlVEIHNlbWFudGljcyB0byBtYW5hZ2UgaXQuIiIiCiAK LSAgICBkZWYgX19pbml0X18oc2VsZik6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHNob3J0ZW5f ZmlsZW5hbWU9Tm9uZSk6CiAgICAgICAgICMgTWFwcyBhIHRlc3QgdG8gaXRzIGxpc3Qgb2YgZXhw ZWN0YXRpb25zLgogICAgICAgICBzZWxmLl90ZXN0X3RvX2V4cGVjdGF0aW9ucyA9IHt9CiAKQEAg LTQ1NCw2ICs0NTcsOCBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zTW9kZWwob2JqZWN0KToKICAg ICAgICAgc2VsZi5fdGltZWxpbmVfdG9fdGVzdHMgPSBzZWxmLl9kaWN0X29mX3NldHMoVGVzdEV4 cGVjdGF0aW9ucy5USU1FTElORVMpCiAgICAgICAgIHNlbGYuX3Jlc3VsdF90eXBlX3RvX3Rlc3Rz ID0gc2VsZi5fZGljdF9vZl9zZXRzKFRlc3RFeHBlY3RhdGlvbnMuUkVTVUxUX1RZUEVTKQogCisg ICAgICAgIHNlbGYuX3Nob3J0ZW5fZmlsZW5hbWUgPSBzaG9ydGVuX2ZpbGVuYW1lIG9yIChsYW1i ZGEgeDogeCkKKwogICAgIGRlZiBfZGljdF9vZl9zZXRzKHNlbGYsIHN0cmluZ3NfdG9fY29uc3Rh bnRzKToKICAgICAgICAgIiIiVGFrZXMgYSBkaWN0IG9mIHN0cmluZ3MtPmNvbnN0YW50cyBhbmQg cmV0dXJucyBhIGRpY3QgbWFwcGluZwogICAgICAgICBlYWNoIGNvbnN0YW50IHRvIGFuIGVtcHR5 IHNldC4iIiIKQEAgLTYzNCwyMCArNjM5LDI4IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNNb2Rl bChvYmplY3QpOgogICAgICAgICAjIHRvIGJlIHdhcm5pbmdzIGFuZCByZXR1cm4gRmFsc2UiLgog CiAgICAgICAgIGlmIHByZXZfZXhwZWN0YXRpb25fbGluZS5tYXRjaGluZ19jb25maWd1cmF0aW9u cyA9PSBleHBlY3RhdGlvbl9saW5lLm1hdGNoaW5nX2NvbmZpZ3VyYXRpb25zOgotICAgICAgICAg ICAgZXhwZWN0YXRpb25fbGluZS53YXJuaW5ncy5hcHBlbmQoJ0R1cGxpY2F0ZSBvciBhbWJpZ3Vv dXMgJXMuJyAlIGV4cGVjdGF0aW9uX3NvdXJjZSkKKyAgICAgICAgICAgIGV4cGVjdGF0aW9uX2xp bmUud2FybmluZ3MuYXBwZW5kKCdEdXBsaWNhdGUgb3IgYW1iaWd1b3VzIGVudHJ5IGZvciAlcyBv biBsaW5lcyAlczolZCBhbmQgJXM6JWQuJyAlIChleHBlY3RhdGlvbl9saW5lLm5hbWUsCisgICAg ICAgICAgICAgICAgc2VsZi5fc2hvcnRlbl9maWxlbmFtZShwcmV2X2V4cGVjdGF0aW9uX2xpbmUu ZmlsZW5hbWUpLCBwcmV2X2V4cGVjdGF0aW9uX2xpbmUubGluZV9udW1iZXIsCisgICAgICAgICAg ICAgICAgc2VsZi5fc2hvcnRlbl9maWxlbmFtZShleHBlY3RhdGlvbl9saW5lLmZpbGVuYW1lKSwg ZXhwZWN0YXRpb25fbGluZS5saW5lX251bWJlcikpCiAgICAgICAgICAgICByZXR1cm4gVHJ1ZQog CiAgICAgICAgIGlmIHByZXZfZXhwZWN0YXRpb25fbGluZS5tYXRjaGluZ19jb25maWd1cmF0aW9u cyA+PSBleHBlY3RhdGlvbl9saW5lLm1hdGNoaW5nX2NvbmZpZ3VyYXRpb25zOgotICAgICAgICAg ICAgZXhwZWN0YXRpb25fbGluZS53YXJuaW5ncy5hcHBlbmQoJ01vcmUgc3BlY2lmaWMgZW50cnkg b24gbGluZSAlZCBvdmVycmlkZXMgbGluZSAlZCcgJSAoZXhwZWN0YXRpb25fbGluZS5saW5lX251 bWJlciwgcHJldl9leHBlY3RhdGlvbl9saW5lLmxpbmVfbnVtYmVyKSkKKyAgICAgICAgICAgIGV4 cGVjdGF0aW9uX2xpbmUud2FybmluZ3MuYXBwZW5kKCdNb3JlIHNwZWNpZmljIGVudHJ5IGZvciAl cyBvbiBsaW5lICVzOiVkIG92ZXJyaWRlcyBsaW5lICVzOiVkLicgJSAoZXhwZWN0YXRpb25fbGlu ZS5uYW1lLAorICAgICAgICAgICAgICAgIHNlbGYuX3Nob3J0ZW5fZmlsZW5hbWUocHJldl9leHBl Y3RhdGlvbl9saW5lLmZpbGVuYW1lKSwgcHJldl9leHBlY3RhdGlvbl9saW5lLmxpbmVfbnVtYmVy LAorICAgICAgICAgICAgICAgIHNlbGYuX3Nob3J0ZW5fZmlsZW5hbWUoZXhwZWN0YXRpb25fbGlu ZS5maWxlbmFtZSksIGV4cGVjdGF0aW9uX2xpbmUubGluZV9udW1iZXIpKQogICAgICAgICAgICAg IyBGSVhNRTogcmV0dXJuIEZhbHNlIGlmIHdlIHdhbnQgbW9yZSBzcGVjaWZpYyB0byB3aW4uCiAg ICAgICAgICAgICByZXR1cm4gVHJ1ZQogCiAgICAgICAgIGlmIHByZXZfZXhwZWN0YXRpb25fbGlu ZS5tYXRjaGluZ19jb25maWd1cmF0aW9ucyA8PSBleHBlY3RhdGlvbl9saW5lLm1hdGNoaW5nX2Nv bmZpZ3VyYXRpb25zOgotICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS53YXJuaW5ncy5hcHBl bmQoJ01vcmUgc3BlY2lmaWMgZW50cnkgb24gbGluZSAlZCBvdmVycmlkZXMgbGluZSAlZCcgJSAo cHJldl9leHBlY3RhdGlvbl9saW5lLmxpbmVfbnVtYmVyLCBleHBlY3RhdGlvbl9saW5lLmxpbmVf bnVtYmVyKSkKKyAgICAgICAgICAgIGV4cGVjdGF0aW9uX2xpbmUud2FybmluZ3MuYXBwZW5kKCdN b3JlIHNwZWNpZmljIGVudHJ5IGZvciAlcyBvbiBsaW5lICVzOiVkIG92ZXJyaWRlcyBsaW5lICVz OiVkLicgJSAoZXhwZWN0YXRpb25fbGluZS5uYW1lLAorICAgICAgICAgICAgICAgIHNlbGYuX3No b3J0ZW5fZmlsZW5hbWUoZXhwZWN0YXRpb25fbGluZS5maWxlbmFtZSksIGV4cGVjdGF0aW9uX2xp bmUubGluZV9udW1iZXIsCisgICAgICAgICAgICAgICAgc2VsZi5fc2hvcnRlbl9maWxlbmFtZShw cmV2X2V4cGVjdGF0aW9uX2xpbmUuZmlsZW5hbWUpLCBwcmV2X2V4cGVjdGF0aW9uX2xpbmUubGlu ZV9udW1iZXIpKQogICAgICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgICAgICBpZiBwcmV2X2V4 cGVjdGF0aW9uX2xpbmUubWF0Y2hpbmdfY29uZmlndXJhdGlvbnMgJiBleHBlY3RhdGlvbl9saW5l Lm1hdGNoaW5nX2NvbmZpZ3VyYXRpb25zOgotICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZS53 YXJuaW5ncy5hcHBlbmQoJ0VudHJpZXMgb24gbGluZSAlZCBhbmQgbGluZSAlZCBtYXRjaCBvdmVy bGFwcGluZyBzZXRzIG9mIGNvbmZpZ3VyYXRpb25zJyAlIChwcmV2X2V4cGVjdGF0aW9uX2xpbmUu bGluZV9udW1iZXIsIGV4cGVjdGF0aW9uX2xpbmUubGluZV9udW1iZXIpKQorICAgICAgICAgICAg ZXhwZWN0YXRpb25fbGluZS53YXJuaW5ncy5hcHBlbmQoJ0VudHJpZXMgZm9yICVzIG9uIGxpbmVz ICVzOiVkIGFuZCAlczolZCBtYXRjaCBvdmVybGFwcGluZyBzZXRzIG9mIGNvbmZpZ3VyYXRpb25z LicgJSAoZXhwZWN0YXRpb25fbGluZS5uYW1lLAorICAgICAgICAgICAgICAgIHNlbGYuX3Nob3J0 ZW5fZmlsZW5hbWUocHJldl9leHBlY3RhdGlvbl9saW5lLmZpbGVuYW1lKSwgcHJldl9leHBlY3Rh dGlvbl9saW5lLmxpbmVfbnVtYmVyLAorICAgICAgICAgICAgICAgIHNlbGYuX3Nob3J0ZW5fZmls ZW5hbWUoZXhwZWN0YXRpb25fbGluZS5maWxlbmFtZSksIGV4cGVjdGF0aW9uX2xpbmUubGluZV9u dW1iZXIpKQogICAgICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgICAgICAjIENvbmZpZ3VyYXRp b24gc2V0cyBhcmUgZGlzam9pbnQsIHRoZW4uCkBAIC03MzksMTcgKzc1MiwxNyBAQCBjbGFzcyBU ZXN0RXhwZWN0YXRpb25zKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX2Z1bGxfdGVzdF9saXN0ID0g dGVzdHMKICAgICAgICAgc2VsZi5fdGVzdF9jb25maWcgPSBwb3J0LnRlc3RfY29uZmlndXJhdGlv bigpCiAgICAgICAgIHNlbGYuX2lzX2xpbnRfbW9kZSA9IGlzX2xpbnRfbW9kZQotICAgICAgICBz ZWxmLl9tb2RlbCA9IFRlc3RFeHBlY3RhdGlvbnNNb2RlbCgpCisgICAgICAgIHNlbGYuX21vZGVs ID0gVGVzdEV4cGVjdGF0aW9uc01vZGVsKHNlbGYuX3Nob3J0ZW5fZmlsZW5hbWUpCiAgICAgICAg IHNlbGYuX3BhcnNlciA9IFRlc3RFeHBlY3RhdGlvblBhcnNlcihwb3J0LCB0ZXN0cywgaXNfbGlu dF9tb2RlKQogICAgICAgICBzZWxmLl9wb3J0ID0gcG9ydAogICAgICAgICBzZWxmLl9za2lwcGVk X3Rlc3RzX3dhcm5pbmdzID0gW10KIAotICAgICAgICBzZWxmLl9leHBlY3RhdGlvbnMgPSBzZWxm Ll9wYXJzZXIucGFyc2UocG9ydC50ZXN0X2V4cGVjdGF0aW9ucygpKQorICAgICAgICBzZWxmLl9l eHBlY3RhdGlvbnMgPSBzZWxmLl9wYXJzZXIucGFyc2UocG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0 YXRpb25zX2ZpbGUoKSwgcG9ydC50ZXN0X2V4cGVjdGF0aW9ucygpKQogICAgICAgICBzZWxmLl9h ZGRfZXhwZWN0YXRpb25zKHNlbGYuX2V4cGVjdGF0aW9ucywgaW5fb3ZlcnJpZGVzPUZhbHNlKQog CiAgICAgICAgIG92ZXJyaWRlcyA9IHBvcnQudGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJpZGVzKCkK ICAgICAgICAgaWYgb3ZlcnJpZGVzIGFuZCBpbmNsdWRlX292ZXJyaWRlczoKLSAgICAgICAgICAg IG92ZXJyaWRlc19leHBlY3RhdGlvbnMgPSBzZWxmLl9wYXJzZXIucGFyc2Uob3ZlcnJpZGVzKQor ICAgICAgICAgICAgb3ZlcnJpZGVzX2V4cGVjdGF0aW9ucyA9IHNlbGYuX3BhcnNlci5wYXJzZSgn b3ZlcnJpZGVzJywgb3ZlcnJpZGVzKQogICAgICAgICAgICAgc2VsZi5fYWRkX2V4cGVjdGF0aW9u cyhvdmVycmlkZXNfZXhwZWN0YXRpb25zLCBpbl9vdmVycmlkZXM9VHJ1ZSkKICAgICAgICAgICAg IHNlbGYuX2V4cGVjdGF0aW9ucyArPSBvdmVycmlkZXNfZXhwZWN0YXRpb25zCiAKQEAgLTgyNiwx NyArODM5LDE2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnMob2JqZWN0KToKICAgICBkZWYgaXNf cmViYXNlbGluaW5nKHNlbGYsIHRlc3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fbW9kZWwuaGFz X21vZGlmaWVyKHRlc3QsIFJFQkFTRUxJTkUpCiAKKyAgICBkZWYgX3Nob3J0ZW5fZmlsZW5hbWUo c2VsZiwgZmlsZW5hbWUpOgorICAgICAgICBpZiBmaWxlbmFtZS5zdGFydHN3aXRoKHNlbGYuX3Bv cnQucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCkpOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3Bv cnQuaG9zdC5maWxlc3lzdGVtLnJlbHBhdGgoZmlsZW5hbWUsIHNlbGYuX3BvcnQucGF0aF9mcm9t X3dlYmtpdF9iYXNlKCkpCisgICAgICAgIHJldHVybiBmaWxlbmFtZQorCiAgICAgZGVmIF9yZXBv cnRfd2FybmluZ3Moc2VsZik6CiAgICAgICAgIHdhcm5pbmdzID0gW10KLSAgICAgICAgdGVzdF9l eHBlY3RhdGlvbl9wYXRoID0gc2VsZi5fcG9ydC5wYXRoX3RvX3Rlc3RfZXhwZWN0YXRpb25zX2Zp bGUoKQotICAgICAgICBpZiB0ZXN0X2V4cGVjdGF0aW9uX3BhdGguc3RhcnRzd2l0aChzZWxmLl9w b3J0LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpKToKLSAgICAgICAgICAgIHRlc3RfZXhwZWN0YXRp b25fcGF0aCA9IHNlbGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtLnJlbHBhdGgodGVzdF9leHBlY3Rh dGlvbl9wYXRoLCBzZWxmLl9wb3J0LnBhdGhfZnJvbV93ZWJraXRfYmFzZSgpKQogICAgICAgICBm b3IgZXhwZWN0YXRpb24gaW4gc2VsZi5fZXhwZWN0YXRpb25zOgogICAgICAgICAgICAgZm9yIHdh cm5pbmcgaW4gZXhwZWN0YXRpb24ud2FybmluZ3M6Ci0gICAgICAgICAgICAgICAgd2FybmluZ3Mu YXBwZW5kKCclczolZCAlcyAlcycgJSAodGVzdF9leHBlY3RhdGlvbl9wYXRoLCBleHBlY3RhdGlv bi5saW5lX251bWJlciwgd2FybmluZywgZXhwZWN0YXRpb24ubmFtZSBpZiBleHBlY3RhdGlvbi5l eHBlY3RhdGlvbnMgZWxzZSBleHBlY3RhdGlvbi5vcmlnaW5hbF9zdHJpbmcpKQotCi0gICAgICAg IGZvciB3YXJuaW5nIGluIHNlbGYuX3NraXBwZWRfdGVzdHNfd2FybmluZ3M6Ci0gICAgICAgICAg ICB3YXJuaW5ncy5hcHBlbmQoJyVzJXMnICUgKHRlc3RfZXhwZWN0YXRpb25fcGF0aCwgd2Fybmlu ZykpCisgICAgICAgICAgICAgICAgd2FybmluZ3MuYXBwZW5kKCclczolZCAlcyAlcycgJSAoc2Vs Zi5fc2hvcnRlbl9maWxlbmFtZShleHBlY3RhdGlvbi5maWxlbmFtZSksIGV4cGVjdGF0aW9uLmxp bmVfbnVtYmVyLCB3YXJuaW5nLCBleHBlY3RhdGlvbi5uYW1lIGlmIGV4cGVjdGF0aW9uLmV4cGVj dGF0aW9ucyBlbHNlIGV4cGVjdGF0aW9uLm9yaWdpbmFsX3N0cmluZykpCiAKICAgICAgICAgaWYg d2FybmluZ3M6CiAgICAgICAgICAgICBzZWxmLl9oYXNfd2FybmluZ3MgPSBUcnVlCkBAIC04OTMs OSArOTA1LDkgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9ucyhvYmplY3QpOgogICAgIGRlZiBfYWRk X3NraXBwZWRfdGVzdHMoc2VsZiwgdGVzdHNfdG9fc2tpcCk6CiAgICAgICAgIGlmIG5vdCB0ZXN0 c190b19za2lwOgogICAgICAgICAgICAgcmV0dXJuCi0gICAgICAgIGZvciBpbmRleCwgdGVzdCBp biBlbnVtZXJhdGUoc2VsZi5fZXhwZWN0YXRpb25zLCBzdGFydD0xKToKKyAgICAgICAgZm9yIHRl c3QgaW4gc2VsZi5fZXhwZWN0YXRpb25zOgogICAgICAgICAgICAgaWYgdGVzdC5uYW1lIGFuZCB0 ZXN0Lm5hbWUgaW4gdGVzdHNfdG9fc2tpcDoKLSAgICAgICAgICAgICAgICBzZWxmLl9za2lwcGVk X3Rlc3RzX3dhcm5pbmdzLmFwcGVuZCgnOiVkICVzIGlzIGFsc28gaW4gYSBTa2lwcGVkIGZpbGUu JyAlIChpbmRleCwgdGVzdC5uYW1lKSkKKyAgICAgICAgICAgICAgICB0ZXN0Lndhcm5pbmdzLmFw cGVuZCgnJXM6JWQgJXMgaXMgYWxzbyBpbiBhIFNraXBwZWQgZmlsZS4nICUgKHRlc3QuZmlsZW5h bWUsIHRlc3QubGluZV9udW1iZXIsIHRlc3QubmFtZSkpCiAKICAgICAgICAgZm9yIHRlc3RfbmFt ZSBpbiB0ZXN0c190b19za2lwOgogICAgICAgICAgICAgZXhwZWN0YXRpb25fbGluZSA9IHNlbGYu X3BhcnNlci5leHBlY3RhdGlvbl9mb3Jfc2tpcHBlZF90ZXN0KHRlc3RfbmFtZSkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2V4cGVj dGF0aW9uc191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L21vZGVscy90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQppbmRleCAyZmYzZDM3MTk2MmYy MDkyZWFkNGIwOWI3MTQxMzQxZDhmMTIyMzE5Li4wODQxZDQ0NzQ0Y2Q2ZDBlZjdlOTUxMjE4NjNj NjkwYmI4MzcxYjRiIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9tb2RlbHMvdGVzdF9leHBlY3RhdGlvbnNfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9kZWxzL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0 ZXN0LnB5CkBAIC00NjgsNTEgKzQ2OCw1NCBAQCBjbGFzcyBSZWJhc2VsaW5pbmdUZXN0KEJhc2Up OgogCiAKIGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlclRlc3RzKHVuaXR0ZXN0LlRlc3RDYXNl KToKKyAgICBkZWYgX3Rva2VuaXplKHNlbGYsIGxpbmUpOgorICAgICAgICByZXR1cm4gVGVzdEV4 cGVjdGF0aW9uUGFyc2VyLl90b2tlbml6ZSgncGF0aCcsIGxpbmUsIDApCisKICAgICBkZWYgdGVz dF90b2tlbml6ZV9ibGFuayhzZWxmKToKLSAgICAgICAgZXhwZWN0YXRpb24gPSBUZXN0RXhwZWN0 YXRpb25QYXJzZXIuX3Rva2VuaXplKCcnKQorICAgICAgICBleHBlY3RhdGlvbiA9IHNlbGYuX3Rv a2VuaXplKCcnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLmNvbW1lbnQs IE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGV4cGVjdGF0aW9uLndhcm5pbmdz KSwgMCkKIAogICAgIGRlZiB0ZXN0X3Rva2VuaXplX21pc3NpbmdfY29sb24oc2VsZik6Ci0gICAg ICAgIGV4cGVjdGF0aW9uID0gVGVzdEV4cGVjdGF0aW9uUGFyc2VyLl90b2tlbml6ZSgnUXV4Licp CisgICAgICAgIGV4cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJ1F1eC4nKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHN0cihleHBlY3RhdGlvbi53YXJuaW5ncyksICdbIk1pc3NpbmcgYSBc JzpcJyJdJykKIAogICAgIGRlZiB0ZXN0X3Rva2VuaXplX2V4dHJhX2NvbG9uKHNlbGYpOgotICAg ICAgICBleHBlY3RhdGlvbiA9IFRlc3RFeHBlY3RhdGlvblBhcnNlci5fdG9rZW5pemUoJ0ZPTyA6 IDogYmFyJykKKyAgICAgICAgZXhwZWN0YXRpb24gPSBzZWxmLl90b2tlbml6ZSgnRk9PIDogOiBi YXInKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihleHBlY3RhdGlvbi53YXJuaW5ncyks ICdbIkV4dHJhbmVvdXMgXCc6XCciXScpCiAKICAgICBkZWYgdGVzdF90b2tlbml6ZV9lbXB0eV9j b21tZW50KHNlbGYpOgotICAgICAgICBleHBlY3RhdGlvbiA9IFRlc3RFeHBlY3RhdGlvblBhcnNl ci5fdG9rZW5pemUoJy8vJykKKyAgICAgICAgZXhwZWN0YXRpb24gPSBzZWxmLl90b2tlbml6ZSgn Ly8nKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGV4cGVjdGF0aW9uLmNvbW1lbnQsICcnKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihleHBlY3RhdGlvbi53YXJuaW5ncyksIDApCiAK ICAgICBkZWYgdGVzdF90b2tlbml6ZV9jb21tZW50KHNlbGYpOgotICAgICAgICBleHBlY3RhdGlv biA9IFRlc3RFeHBlY3RhdGlvblBhcnNlci5fdG9rZW5pemUoJy8vUXV4LicpCisgICAgICAgIGV4 cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJy8vUXV4LicpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoZXhwZWN0YXRpb24uY29tbWVudCwgJ1F1eC4nKQogICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGxlbihleHBlY3RhdGlvbi53YXJuaW5ncyksIDApCiAKICAgICBkZWYgdGVzdF90b2tlbml6 ZV9taXNzaW5nX2VxdWFsKHNlbGYpOgotICAgICAgICBleHBlY3RhdGlvbiA9IFRlc3RFeHBlY3Rh dGlvblBhcnNlci5fdG9rZW5pemUoJ0ZPTyA6IGJhcicpCisgICAgICAgIGV4cGVjdGF0aW9uID0g c2VsZi5fdG9rZW5pemUoJ0ZPTyA6IGJhcicpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3Ry KGV4cGVjdGF0aW9uLndhcm5pbmdzKSwgIlsnTWlzc2luZyBleHBlY3RhdGlvbnNcJ10iKQogCiAg ICAgZGVmIHRlc3RfdG9rZW5pemVfZXh0cmFfZXF1YWwoc2VsZik6Ci0gICAgICAgIGV4cGVjdGF0 aW9uID0gVGVzdEV4cGVjdGF0aW9uUGFyc2VyLl90b2tlbml6ZSgnRk9PIDogYmFyID0gQkFaID0g UXV4LicpCisgICAgICAgIGV4cGVjdGF0aW9uID0gc2VsZi5fdG9rZW5pemUoJ0ZPTyA6IGJhciA9 IEJBWiA9IFF1eC4nKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihleHBlY3RhdGlvbi53 YXJuaW5ncyksICdbIkV4dHJhbmVvdXMgXCc9XCciXScpCiAKICAgICBkZWYgdGVzdF90b2tlbml6 ZV92YWxpZChzZWxmKToKLSAgICAgICAgZXhwZWN0YXRpb24gPSBUZXN0RXhwZWN0YXRpb25QYXJz ZXIuX3Rva2VuaXplKCdGT08gOiBiYXIgPSBCQVonKQorICAgICAgICBleHBlY3RhdGlvbiA9IHNl bGYuX3Rva2VuaXplKCdGT08gOiBiYXIgPSBCQVonKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KGV4cGVjdGF0aW9uLmNvbW1lbnQsIE5vbmUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVu KGV4cGVjdGF0aW9uLndhcm5pbmdzKSwgMCkKIAogICAgIGRlZiB0ZXN0X3Rva2VuaXplX3ZhbGlk X3dpdGhfY29tbWVudChzZWxmKToKLSAgICAgICAgZXhwZWN0YXRpb24gPSBUZXN0RXhwZWN0YXRp b25QYXJzZXIuX3Rva2VuaXplKCdGT08gOiBiYXIgPSBCQVogLy9RdXguJykKKyAgICAgICAgZXhw ZWN0YXRpb24gPSBzZWxmLl90b2tlbml6ZSgnRk9PIDogYmFyID0gQkFaIC8vUXV4LicpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhwZWN0YXRpb24uY29tbWVudCwgJ1F1eC4nKQogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHN0cihleHBlY3RhdGlvbi5tb2RpZmllcnMpLCAnW1wnZm9vXCdd JykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdHIoZXhwZWN0YXRpb24uZXhwZWN0YXRpb25z KSwgJ1tcJ2JhelwnXScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobGVuKGV4cGVjdGF0aW9u Lndhcm5pbmdzKSwgMCkKIAogICAgIGRlZiB0ZXN0X3Rva2VuaXplX3ZhbGlkX3dpdGhfbXVsdGlw bGVfbW9kaWZpZXJzKHNlbGYpOgotICAgICAgICBleHBlY3RhdGlvbiA9IFRlc3RFeHBlY3RhdGlv blBhcnNlci5fdG9rZW5pemUoJ0ZPTzEgRk9PMiA6IGJhciA9IEJBWiAvL1F1eC4nKQorICAgICAg ICBleHBlY3RhdGlvbiA9IHNlbGYuX3Rva2VuaXplKCdGT08xIEZPTzIgOiBiYXIgPSBCQVogLy9R dXguJykKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChleHBlY3RhdGlvbi5jb21tZW50LCAnUXV4 LicpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKGV4cGVjdGF0aW9uLm1vZGlmaWVycyks ICdbXCdmb28xXCcsIFwnZm9vMlwnXScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3RyKGV4 cGVjdGF0aW9uLmV4cGVjdGF0aW9ucyksICdbXCdiYXpcJ10nKQpAQCAtNTI0LDcgKzUyNyw3IEBA IGNsYXNzIFRlc3RFeHBlY3RhdGlvblBhcnNlclRlc3RzKHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgdGVzdF9wb3J0LnRlc3RfZXhpc3RzID0gbGFtYmRhIHRlc3Q6IFRydWUKICAgICAgICAg dGVzdF9jb25maWcgPSB0ZXN0X3BvcnQudGVzdF9jb25maWd1cmF0aW9uKCkKICAgICAgICAgZnVs bF90ZXN0X2xpc3QgPSBbXQotICAgICAgICBleHBlY3RhdGlvbl9saW5lID0gVGVzdEV4cGVjdGF0 aW9uUGFyc2VyLl90b2tlbml6ZSgnJykKKyAgICAgICAgZXhwZWN0YXRpb25fbGluZSA9IHNlbGYu X3Rva2VuaXplKCcnKQogICAgICAgICBwYXJzZXIgPSBUZXN0RXhwZWN0YXRpb25QYXJzZXIodGVz dF9wb3J0LCBmdWxsX3Rlc3RfbGlzdCwgYWxsb3dfcmViYXNlbGluZV9tb2RpZmllcj1GYWxzZSkK ICAgICAgICAgcGFyc2VyLl9wYXJzZV9saW5lKGV4cGVjdGF0aW9uX2xpbmUpCiAgICAgICAgIHNl bGYuYXNzZXJ0RmFsc2UoZXhwZWN0YXRpb25fbGluZS5pc19pbnZhbGlkKCkpCkBAIC01MzgsMTQg KzU0MSwxNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyVGVzdHModW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICBzZWxmLl9zZXJpYWxpemVyID0gVGVzdEV4cGVjdGF0aW9uU2Vy aWFsaXplcihzZWxmLl9jb252ZXJ0ZXIpCiAgICAgICAgIHVuaXR0ZXN0LlRlc3RDYXNlLl9faW5p dF9fKHNlbGYsIHRlc3RGdW5jKQogCisgICAgZGVmIF90b2tlbml6ZShzZWxmLCBsaW5lKToKKyAg ICAgICAgcmV0dXJuIFRlc3RFeHBlY3RhdGlvblBhcnNlci5fdG9rZW5pemUoJ3BhdGgnLCBsaW5l LCAwKQorCiAgICAgZGVmIGFzc2VydF9yb3VuZF90cmlwKHNlbGYsIGluX3N0cmluZywgZXhwZWN0 ZWRfc3RyaW5nPU5vbmUpOgotICAgICAgICBleHBlY3RhdGlvbiA9IFRlc3RFeHBlY3RhdGlvblBh cnNlci5fdG9rZW5pemUoaW5fc3RyaW5nKQorICAgICAgICBleHBlY3RhdGlvbiA9IHNlbGYuX3Rv a2VuaXplKGluX3N0cmluZykKICAgICAgICAgaWYgZXhwZWN0ZWRfc3RyaW5nIGlzIE5vbmU6CiAg ICAgICAgICAgICBleHBlY3RlZF9zdHJpbmcgPSBpbl9zdHJpbmcKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChleHBlY3RlZF9zdHJpbmcsIHNlbGYuX3NlcmlhbGl6ZXIudG9fc3RyaW5nKGV4cGVj dGF0aW9uKSkKIAogICAgIGRlZiBhc3NlcnRfbGlzdF9yb3VuZF90cmlwKHNlbGYsIGluX3N0cmlu ZywgZXhwZWN0ZWRfc3RyaW5nPU5vbmUpOgotICAgICAgICBleHBlY3RhdGlvbnMgPSBUZXN0RXhw ZWN0YXRpb25QYXJzZXIuX3Rva2VuaXplX2xpc3QoaW5fc3RyaW5nKQorICAgICAgICBleHBlY3Rh dGlvbnMgPSBUZXN0RXhwZWN0YXRpb25QYXJzZXIuX3Rva2VuaXplX2xpc3QoJ3BhdGgnLCBpbl9z dHJpbmcpCiAgICAgICAgIGlmIGV4cGVjdGVkX3N0cmluZyBpcyBOb25lOgogICAgICAgICAgICAg ZXhwZWN0ZWRfc3RyaW5nID0gaW5fc3RyaW5nCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZXhw ZWN0ZWRfc3RyaW5nLCBUZXN0RXhwZWN0YXRpb25TZXJpYWxpemVyLmxpc3RfdG9fc3RyaW5nKGV4 cGVjdGF0aW9ucywgc2VsZi5fY29udmVydGVyKSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlci5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdG9vbC9zZXJ2ZXJzL2dhcmRlbmluZ3NlcnZlci5weQppbmRleCAzNjkwNzA5ODJi OWYxYmYzZGE5NTIzNjYyMzJiYzk4ODg5MTBiYzExLi5iZmUwMDNmZTlmZmYxMjQ1N2M3YzBmOTky YTZjNzM4YjJlN2I5ZDIzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rvb2wv c2VydmVycy9nYXJkZW5pbmdzZXJ2ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90 b29sL3NlcnZlcnMvZ2FyZGVuaW5nc2VydmVyLnB5CkBAIC02OSw3ICs2OSw3IEBAIGNsYXNzIEdh cmRlbmluZ0V4cGVjdGF0aW9uc1VwZGF0ZXIoQnVnTWFuYWdlcik6CiAgICAgICAgIHJldHVybiAi QlVHX05FVyIKIAogICAgIGRlZiB1cGRhdGVfZXhwZWN0YXRpb25zKHNlbGYsIGZhaWx1cmVfaW5m b19saXN0KToKLSAgICAgICAgZXhwZWN0YXRpb25fbGluZXMgPSBzZWxmLl9wYXJzZXIucGFyc2Uo c2VsZi5fdG9vbC5maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHNlbGYuX3BhdGhfdG9fdGVzdF9l eHBlY3RhdGlvbnNfZmlsZSkpCisgICAgICAgIGV4cGVjdGF0aW9uX2xpbmVzID0gc2VsZi5fcGFy c2VyLnBhcnNlKHNlbGYuX3BhdGhfdG9fdGVzdF9leHBlY3RhdGlvbnNfZmlsZSwgc2VsZi5fdG9v bC5maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHNlbGYuX3BhdGhfdG9fdGVzdF9leHBlY3RhdGlv bnNfZmlsZSkpCiAgICAgICAgIGVkaXRvciA9IFRlc3RFeHBlY3RhdGlvbnNFZGl0b3IoZXhwZWN0 YXRpb25fbGluZXMsIHNlbGYpCiAgICAgICAgIHVwZGF0ZWRfZXhwZWN0YXRpb25fbGluZXMgPSBb XQogICAgICAgICAjIEZJWE1FOiBHcm91cCBmYWlsdXJlcyBieSB0ZXN0TmFtZStmYWlsdXJlVHlw ZUxpc3QuCg==