91442 2012-07-16 16:33:26 -0700 nrwt: move the bulk of the "expected" output to printing.py 2012-07-17 16:08:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dpranke dpranke abarth eric ojan tony oldest_to_newest 670770 0 dpranke 2012-07-16 16:33:26 -0700 nrwt: move the bulk of the "expected" output to printing.py 670771 1 152640 dpranke 2012-07-16 16:34:42 -0700 Created attachment 152640 Patch 671532 2 152640 ojan 2012-07-17 13:29:47 -0700 Comment on attachment 152640 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152640&action=review > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:421 > + self._printer._print_expected(tests_run_msg) Calling a private method here. This should probably be print_expected and print_expected below should be something like...print_expected_details or something. 671538 3 dpranke 2012-07-17 13:35:07 -0700 (In reply to comment #2) > (From update of attachment 152640 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=152640&action=review > > > Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:421 > > + self._printer._print_expected(tests_run_msg) > > Calling a private method here. This should probably be print_expected and print_expected below should be something like...print_expected_details or something. That gets fixed in https://bugs.webkit.org/show_bug.cgi?id=91447 , where these messages turn into _log.debug(). Is it okay to leave this as-is for the moment, or should I merge the other patch into this one, or would you prefer I rename the methods as you suggest? 671554 4 152640 ojan 2012-07-17 13:45:19 -0700 Comment on attachment 152640 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=152640&action=review >>> Tools/Scripts/webkitpy/layout_tests/controllers/manager.py:421 >>> + self._printer._print_expected(tests_run_msg) >> >> Calling a private method here. This should probably be print_expected and print_expected below should be something like...print_expected_details or something. > > That gets fixed in https://bugs.webkit.org/show_bug.cgi?id=91447 , where these messages turn into _log.debug(). Is it okay to leave this as-is for the moment, or should I merge the other patch into this one, or would you prefer I rename the methods as you suggest? I see. Given that I've already r+'ed the other patch, I think it's fine. :) 671703 5 dpranke 2012-07-17 16:08:24 -0700 Committed r122887: <http://trac.webkit.org/changeset/122887> 152640 2012-07-16 16:34:42 -0700 2012-07-17 13:45:19 -0700 Patch bug-91442-20120716163441.patch text/plain 10125 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNzY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNzI0YjkxZTQ5MmI3YWY0NGQyZjY0YTFhNjg3ZDU2Yzlm YWI5YjkzNS4uMWQ4YTlhZDFhNzkzMzFhNDIwMjA3ZDllY2ZlNDkyY2U0NjUxMDVlNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMx IEBACiAyMDEyLTA3LTE2ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIG5yd3Q6IG1vdmUgdGhlIGJ1bGsgb2YgdGhlICJleHBlY3RlZCIgb3V0cHV0IHRvIHBy aW50aW5nLnB5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD05MTQ0MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IE1vcmUgcHJpbnRpbmctcmVsYXRlZCByZWZhY3RvcmluZy4gVGhpcyBtb3ZlcyBhbGwgb2YgdGhl IGNvZGUKKyAgICAgICAgdGhhdCBwcmludHMgdGhlIHJlc3VsdHMgd2UgZXhwZWN0IHRvIGdldCwg YnV0IGRvZXNuJ3QgbW92ZSBhIGZldworICAgICAgICBkYW5nbGluZyBwcmludGZzICh0aG9zZSds bCBnZXQgaGl0IGluIGEgbGF0ZXIgcGF0Y2gpLgorICAgICAgICAKKyAgICAgICAgTm8gZnVuY3Rp b25hbCBjaGFuZ2VzOyBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weToKKyAgICAg ICAgKE1hbmFnZXIuX3NwbGl0X2ludG9fY2h1bmtzX2lmX25lY2Vzc2FyeSk6CisgICAgICAgIChN YW5hZ2VyLnByZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1dCk6CisgICAgICAgIChNYW5hZ2Vy LnByaW50X2NvbmZpZyk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv dmlld3MvcHJpbnRpbmcucHk6CisgICAgICAgIChQcmludGVyLnByaW50X2V4cGVjdGVkKToKKyAg ICAgICAgKFByaW50ZXIpOgorICAgICAgICAoUHJpbnRlci5fcHJpbnRfZXhwZWN0ZWRfcmVzdWx0 c19vZl90eXBlKToKKyAgICAgICAgKFByaW50ZXIuX251bV9kaWdpdHMpOgorICAgICAgICAoUHJp bnRlci5fcHJpbnRfZXhwZWN0ZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL3ZpZXdzL3ByaW50aW5nX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdHByaW50ZXIu dGVzdF9wcmludF9leHBlY3RlZCk6CisKKzIwMTItMDctMTYgIERpcmsgUHJhbmtlICA8ZHByYW5r ZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgbnJ3dDogbW92ZSBhIGJ1bmNoIG9mIHByaW50aW5n IGNvZGUgZnJvbSBtYW5hZ2VyLnB5IHRvIHByaW50aW5nLnB5CiAgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MTQzOQogCmRpZmYgLS1naXQgYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvbWFuYWdlci5weQpp bmRleCBhMzJlMWEzMDVhMTZlNDA5NGYwYTYzNzU0ZmM5NTNlMzQwYWRiMGIwLi45OWE4NjFlNzlk NWQ3NDYxNDI1YzY0NWRlYmE5NjU5Yzk5NGQ4ZDBhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9tYW5hZ2VyLnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL21hbmFnZXIucHkKQEAg LTQxOCwxNCArNDE4LDE0IEBAIGNsYXNzIE1hbmFnZXIob2JqZWN0KToKICAgICAgICAgZmlsZXMg PSB0ZXN0X2ZpbGVzW3NsaWNlX3N0YXJ0OnNsaWNlX2VuZF0KIAogICAgICAgICB0ZXN0c19ydW5f bXNnID0gJ1J1bm5pbmc6ICVkIHRlc3RzIChjaHVuayBzbGljZSBbJWQ6JWRdIG9mICVkKScgJSAo KHNsaWNlX2VuZCAtIHNsaWNlX3N0YXJ0KSwgc2xpY2Vfc3RhcnQsIHNsaWNlX2VuZCwgbnVtX3Rl c3RzKQotICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2V4cGVjdGVkKHRlc3RzX3J1bl9tc2cp CisgICAgICAgIHNlbGYuX3ByaW50ZXIuX3ByaW50X2V4cGVjdGVkKHRlc3RzX3J1bl9tc2cpCiAK ICAgICAgICAgIyBJZiB3ZSByZWFjaGVkIHRoZSBlbmQgYW5kIHdlIGRvbid0IGhhdmUgZW5vdWdo IHRlc3RzLCB3ZSBydW4gc29tZQogICAgICAgICAjIGZyb20gdGhlIGJlZ2lubmluZy4KICAgICAg ICAgaWYgc2xpY2VfZW5kIC0gc2xpY2Vfc3RhcnQgPCBjaHVua19sZW46CiAgICAgICAgICAgICBl eHRyYSA9IGNodW5rX2xlbiAtIChzbGljZV9lbmQgLSBzbGljZV9zdGFydCkKICAgICAgICAgICAg IGV4dHJhX21zZyA9ICgnICAgbGFzdCBjaHVuayBpcyBwYXJ0aWFsLCBhcHBlbmRpbmcgWzA6JWRd JyAlIGV4dHJhKQotICAgICAgICAgICAgc2VsZi5fcHJpbnRlci5wcmludF9leHBlY3RlZChleHRy YV9tc2cpCisgICAgICAgICAgICBzZWxmLl9wcmludGVyLl9wcmludF9leHBlY3RlZChleHRyYV9t c2cpCiAgICAgICAgICAgICB0ZXN0c19ydW5fbXNnICs9ICJcbiIgKyBleHRyYV9tc2cKICAgICAg ICAgICAgIGZpbGVzLmV4dGVuZCh0ZXN0X2ZpbGVzWzA6ZXh0cmFdKQogICAgICAgICB0ZXN0c19y dW5fZmlsZW5hbWUgPSBzZWxmLl9maWxlc3lzdGVtLmpvaW4oc2VsZi5fcmVzdWx0c19kaXJlY3Rv cnksICJ0ZXN0c19ydW4udHh0IikKQEAgLTUxMiwxMSArNTEyLDcgQEAgY2xhc3MgTWFuYWdlcihv YmplY3QpOgogICAgICAgICAgICAgKHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucyBpZiBzZWxmLl9v cHRpb25zLml0ZXJhdGlvbnMgZWxzZSAxKQogICAgICAgICByZXN1bHRfc3VtbWFyeSA9IFJlc3Vs dFN1bW1hcnkoc2VsZi5fZXhwZWN0YXRpb25zLCBzZWxmLl90ZXN0X2ZpbGVzIHwgc2tpcHBlZCwg aXRlcmF0aW9ucykKIAotICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2V4cGVjdGVkKCdGb3Vu ZCAlcy4nICUgZ3JhbW1hci5wbHVyYWxpemUoJ3Rlc3QnLCBudW1fYWxsX3Rlc3RfZmlsZXMpKQot ICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1h cnksIHRlc3RfZXhwZWN0YXRpb25zLlBBU1MsICJwYXNzZXMiKQotICAgICAgICBzZWxmLl9wcmlu dF9leHBlY3RlZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1hcnksIHRlc3RfZXhwZWN0YXRp b25zLkZBSUwsICJmYWlsdXJlcyIpCi0gICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVkX3Jlc3Vs dHNfb2ZfdHlwZShyZXN1bHRfc3VtbWFyeSwgdGVzdF9leHBlY3RhdGlvbnMuRkxBS1ksICJmbGFr eSIpCi0gICAgICAgIHNlbGYuX3ByaW50X2V4cGVjdGVkX3Jlc3VsdHNfb2ZfdHlwZShyZXN1bHRf c3VtbWFyeSwgdGVzdF9leHBlY3RhdGlvbnMuU0tJUCwgInNraXBwZWQiKQorICAgICAgICBzZWxm Ll9wcmludGVyLnByaW50X2V4cGVjdGVkKG51bV9hbGxfdGVzdF9maWxlcywgcmVzdWx0X3N1bW1h cnksIHNlbGYuX2V4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSkKIAogICAg ICAgICBpZiBzZWxmLl9vcHRpb25zLnNraXBwZWQgIT0gJ2lnbm9yZSc6CiAgICAgICAgICAgICAj IE5vdGUgdGhhdCB3ZSBkb24ndCBhY3R1YWxseSBydW4gdGhlIHNraXBwZWQgdGVzdHMgKHRoZXkg d2VyZQpAQCAtNTI3LDE0ICs1MjMsNiBAQCBjbGFzcyBNYW5hZ2VyKG9iamVjdCk6CiAgICAgICAg ICAgICAgICAgcmVzdWx0LnR5cGUgPSB0ZXN0X2V4cGVjdGF0aW9ucy5TS0lQCiAgICAgICAgICAg ICAgICAgZm9yIGl0ZXJhdGlvbiBpbiByYW5nZShpdGVyYXRpb25zKToKICAgICAgICAgICAgICAg ICAgICAgcmVzdWx0X3N1bW1hcnkuYWRkKHJlc3VsdCwgZXhwZWN0ZWQ9VHJ1ZSwgdGVzdF9pc19z bG93PXNlbGYuX3Rlc3RfaXNfc2xvdyh0ZXN0KSkKLSAgICAgICAgc2VsZi5fcHJpbnRlci5wcmlu dF9leHBlY3RlZCgnJykKLQotICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoID4g MToKLSAgICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQoJ1J1bm5pbmcgZWFj aCB0ZXN0ICVkIHRpbWVzLicgJSBzZWxmLl9vcHRpb25zLnJlcGVhdF9lYWNoKQotICAgICAgICBp ZiBzZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMgPiAxOgotICAgICAgICAgICAgc2VsZi5fcHJpbnRl ci5wcmludF9leHBlY3RlZCgnUnVubmluZyAlZCBpdGVyYXRpb25zIG9mIHRoZSB0ZXN0cy4nICUg c2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQotICAgICAgICBpZiBpdGVyYXRpb25zID4gMToKLSAg ICAgICAgICAgIHNlbGYuX3ByaW50ZXIucHJpbnRfZXhwZWN0ZWQoJycpCiAKICAgICAgICAgcmV0 dXJuIHJlc3VsdF9zdW1tYXJ5CiAKQEAgLTExMjgsMjYgKzExMTYsNiBAQCBjbGFzcyBNYW5hZ2Vy KG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgICAgICcgJy5qb2luKHNlbGYuX3BvcnQuZHJp dmVyX2NtZF9saW5lKCkpKQogICAgICAgICBwLnByaW50X2NvbmZpZygiIikKIAotICAgIGRlZiBf cHJpbnRfZXhwZWN0ZWRfcmVzdWx0c19vZl90eXBlKHNlbGYsIHJlc3VsdF9zdW1tYXJ5LAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdF90eXBlLCByZXN1bHRf dHlwZV9zdHIpOgotICAgICAgICAiIiJQcmludCB0aGUgbnVtYmVyIG9mIHRoZSB0ZXN0cyBpbiBh IGdpdmVuIHJlc3VsdCBjbGFzcy4KLQotICAgICAgICBBcmdzOgotICAgICAgICAgIHJlc3VsdF9z dW1tYXJ5IC0gdGhlIG9iamVjdCBjb250YWluaW5nIGFsbCB0aGUgcmVzdWx0cyB0byByZXBvcnQg b24KLSAgICAgICAgICByZXN1bHRfdHlwZSAtIHRoZSBwYXJ0aWN1bGFyIHJlc3VsdCB0eXBlIHRv IHJlcG9ydCBpbiB0aGUgc3VtbWFyeS4KLSAgICAgICAgICByZXN1bHRfdHlwZV9zdHIgLSBhIHN0 cmluZyBkZXNjcmlwdGlvbiBvZiB0aGUgcmVzdWx0X3R5cGUuCi0gICAgICAgICIiIgotICAgICAg ICB0ZXN0cyA9IHNlbGYuX2V4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZShy ZXN1bHRfdHlwZSkKLSAgICAgICAgbm93ID0gcmVzdWx0X3N1bW1hcnkudGVzdHNfYnlfdGltZWxp bmVbdGVzdF9leHBlY3RhdGlvbnMuTk9XXQotICAgICAgICB3b250Zml4ID0gcmVzdWx0X3N1bW1h cnkudGVzdHNfYnlfdGltZWxpbmVbdGVzdF9leHBlY3RhdGlvbnMuV09OVEZJWF0KLQotICAgICAg ICAjIFdlIHVzZSBhIGZhbmN5IGZvcm1hdCBzdHJpbmcgaW4gb3JkZXIgdG8gcHJpbnQgdGhlIGRh dGEgb3V0IGluIGEKLSAgICAgICAgIyBuaWNlbHktYWxpZ25lZCB0YWJsZS4KLSAgICAgICAgZm10 c3RyID0gKCJFeHBlY3Q6ICUlNWQgJSUtOHMgKCUlJWRkIG5vdywgJSUlZGQgd29udGZpeCkiCi0g ICAgICAgICAgICAgICAgICAlIChzZWxmLl9udW1fZGlnaXRzKG5vdyksIHNlbGYuX251bV9kaWdp dHMod29udGZpeCkpKQotICAgICAgICBzZWxmLl9wcmludGVyLnByaW50X2V4cGVjdGVkKGZtdHN0 ciAlCi0gICAgICAgICAgICAobGVuKHRlc3RzKSwgcmVzdWx0X3R5cGVfc3RyLCBsZW4odGVzdHMg JiBub3cpLCBsZW4odGVzdHMgJiB3b250Zml4KSkpCi0KICAgICBkZWYgX251bV9kaWdpdHMoc2Vs ZiwgbnVtKToKICAgICAgICAgIiIiUmV0dXJucyB0aGUgbnVtYmVyIG9mIGRpZ2l0cyBuZWVkZWQg dG8gcmVwcmVzZW50IHRoZSBsZW5ndGggb2YgYQogICAgICAgICBzZXF1ZW5jZS4iIiIKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3ZpZXdzL3ByaW50aW5n LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcu cHkKaW5kZXggZTZjMjJjZGVhODA1N2NmZjA2N2ZmZDg5OTQ4ODQ5YTc3NjUxNjcwYy4uM2Q3OGU5 NDNmYjRmYTI3NzhhZTVmNGQxZGQ3MzVmZWE3ZGIwYjQyNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvdmlld3MvcHJpbnRpbmcucHkKQEAgLTE5NCw2 ICsxOTQsNTAgQEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgIGRlZiBoZWxwX3ByaW50aW5n KHNlbGYpOgogICAgICAgICBzZWxmLl93cml0ZShIRUxQX1BSSU5USU5HKQogCisgICAgZGVmIHBy aW50X2V4cGVjdGVkKHNlbGYsIG51bV9hbGxfdGVzdF9maWxlcywgcmVzdWx0X3N1bW1hcnksIHRl c3RzX3dpdGhfcmVzdWx0X3R5cGVfY2FsbGJhY2spOgorICAgICAgICBzZWxmLl9wcmludF9leHBl Y3RlZCgnRm91bmQgJXMuJyAlIGdyYW1tYXIucGx1cmFsaXplKCd0ZXN0JywgbnVtX2FsbF90ZXN0 X2ZpbGVzKSkKKyAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWRfcmVzdWx0c19vZl90eXBlKHJl c3VsdF9zdW1tYXJ5LCB0ZXN0X2V4cGVjdGF0aW9ucy5QQVNTLCAicGFzc2VzIiwgdGVzdHNfd2l0 aF9yZXN1bHRfdHlwZV9jYWxsYmFjaykKKyAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWRfcmVz dWx0c19vZl90eXBlKHJlc3VsdF9zdW1tYXJ5LCB0ZXN0X2V4cGVjdGF0aW9ucy5GQUlMLCAiZmFp bHVyZXMiLCB0ZXN0c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKQorICAgICAgICBzZWxmLl9w cmludF9leHBlY3RlZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1hcnksIHRlc3RfZXhwZWN0 YXRpb25zLkZMQUtZLCAiZmxha3kiLCB0ZXN0c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKQor ICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZF9yZXN1bHRzX29mX3R5cGUocmVzdWx0X3N1bW1h cnksIHRlc3RfZXhwZWN0YXRpb25zLlNLSVAsICJza2lwcGVkIiwgdGVzdHNfd2l0aF9yZXN1bHRf dHlwZV9jYWxsYmFjaykKKyAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWQoJycpCisKKyAgICAg ICAgaWYgc2VsZi5fb3B0aW9ucy5yZXBlYXRfZWFjaCA+IDE6CisgICAgICAgICAgICBzZWxmLl9w cmludF9leHBlY3RlZCgnUnVubmluZyBlYWNoIHRlc3QgJWQgdGltZXMuJyAlIHNlbGYuX29wdGlv bnMucmVwZWF0X2VhY2gpCisgICAgICAgIGlmIHNlbGYuX29wdGlvbnMuaXRlcmF0aW9ucyA+IDE6 CisgICAgICAgICAgICBzZWxmLl9wcmludF9leHBlY3RlZCgnUnVubmluZyAlZCBpdGVyYXRpb25z IG9mIHRoZSB0ZXN0cy4nICUgc2VsZi5fb3B0aW9ucy5pdGVyYXRpb25zKQorICAgICAgICBpZiBz ZWxmLl9vcHRpb25zLml0ZXJhdGlvbnMgPiAxIG9yIHNlbGYuX29wdGlvbnMucmVwZWF0X2VhY2gg PiAxOgorICAgICAgICAgICAgc2VsZi5fcHJpbnRfZXhwZWN0ZWQoJycpCisKKyAgICBkZWYgX3By aW50X2V4cGVjdGVkX3Jlc3VsdHNfb2ZfdHlwZShzZWxmLCByZXN1bHRfc3VtbWFyeSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXN1bHRfdHlwZSwgcmVzdWx0X3R5 cGVfc3RyLCB0ZXN0c193aXRoX3Jlc3VsdF90eXBlX2NhbGxiYWNrKToKKyAgICAgICAgIiIiUHJp bnQgdGhlIG51bWJlciBvZiB0aGUgdGVzdHMgaW4gYSBnaXZlbiByZXN1bHQgY2xhc3MuCisKKyAg ICAgICAgQXJnczoKKyAgICAgICAgICByZXN1bHRfc3VtbWFyeSAtIHRoZSBvYmplY3QgY29udGFp bmluZyBhbGwgdGhlIHJlc3VsdHMgdG8gcmVwb3J0IG9uCisgICAgICAgICAgcmVzdWx0X3R5cGUg LSB0aGUgcGFydGljdWxhciByZXN1bHQgdHlwZSB0byByZXBvcnQgaW4gdGhlIHN1bW1hcnkuCisg ICAgICAgICAgcmVzdWx0X3R5cGVfc3RyIC0gYSBzdHJpbmcgZGVzY3JpcHRpb24gb2YgdGhlIHJl c3VsdF90eXBlLgorICAgICAgICAgIGV4cGVjdGF0aW9ucyAtIHBvcHVsYXRlZCBUZXN0RXhwZWN0 YXRpb25zIG9iamVjdCBmb3Igc3RhdHMKKyAgICAgICAgIiIiCisgICAgICAgIHRlc3RzID0gdGVz dHNfd2l0aF9yZXN1bHRfdHlwZV9jYWxsYmFjayhyZXN1bHRfdHlwZSkKKyAgICAgICAgbm93ID0g cmVzdWx0X3N1bW1hcnkudGVzdHNfYnlfdGltZWxpbmVbdGVzdF9leHBlY3RhdGlvbnMuTk9XXQor ICAgICAgICB3b250Zml4ID0gcmVzdWx0X3N1bW1hcnkudGVzdHNfYnlfdGltZWxpbmVbdGVzdF9l eHBlY3RhdGlvbnMuV09OVEZJWF0KKworICAgICAgICAjIFdlIHVzZSBhIGZhbmN5IGZvcm1hdCBz dHJpbmcgaW4gb3JkZXIgdG8gcHJpbnQgdGhlIGRhdGEgb3V0IGluIGEKKyAgICAgICAgIyBuaWNl bHktYWxpZ25lZCB0YWJsZS4KKyAgICAgICAgZm10c3RyID0gKCJFeHBlY3Q6ICUlNWQgJSUtOHMg KCUlJWRkIG5vdywgJSUlZGQgd29udGZpeCkiCisgICAgICAgICAgICAgICAgICAlIChzZWxmLl9u dW1fZGlnaXRzKG5vdyksIHNlbGYuX251bV9kaWdpdHMod29udGZpeCkpKQorICAgICAgICBzZWxm Ll9wcmludF9leHBlY3RlZChmbXRzdHIgJQorICAgICAgICAgICAgKGxlbih0ZXN0cyksIHJlc3Vs dF90eXBlX3N0ciwgbGVuKHRlc3RzICYgbm93KSwgbGVuKHRlc3RzICYgd29udGZpeCkpKQorCisg ICAgZGVmIF9udW1fZGlnaXRzKHNlbGYsIG51bSk6CisgICAgICAgICIiIlJldHVybnMgdGhlIG51 bWJlciBvZiBkaWdpdHMgbmVlZGVkIHRvIHJlcHJlc2VudCB0aGUgbGVuZ3RoIG9mIGEKKyAgICAg ICAgc2VxdWVuY2UuIiIiCisgICAgICAgIG5kaWdpdHMgPSAxCisgICAgICAgIGlmIGxlbihudW0p OgorICAgICAgICAgICAgbmRpZ2l0cyA9IGludChtYXRoLmxvZzEwKGxlbihudW0pKSkgKyAxCisg ICAgICAgIHJldHVybiBuZGlnaXRzCisKICAgICBkZWYgcHJpbnRfcmVzdWx0cyhzZWxmLCBydW5f dGltZSwgdGhyZWFkX3RpbWluZ3MsIHRlc3RfdGltaW5ncywgaW5kaXZpZHVhbF90ZXN0X3RpbWlu Z3MsIHJlc3VsdF9zdW1tYXJ5LCB1bmV4cGVjdGVkX3Jlc3VsdHMpOgogICAgICAgICBzZWxmLl9w cmludF90aW1pbmdfc3RhdGlzdGljcyhydW5fdGltZSwgdGhyZWFkX3RpbWluZ3MsIHRlc3RfdGlt aW5ncywgaW5kaXZpZHVhbF90ZXN0X3RpbWluZ3MsIHJlc3VsdF9zdW1tYXJ5KQogICAgICAgICBz ZWxmLl9wcmludF9yZXN1bHRfc3VtbWFyeShyZXN1bHRfc3VtbWFyeSkKQEAgLTQyMCw3ICs0NjQs NyBAQCBjbGFzcyBQcmludGVyKG9iamVjdCk6CiAgICAgZGVmIHByaW50X2NvbmZpZyhzZWxmLCBt c2cpOgogICAgICAgICBzZWxmLndyaXRlKG1zZywgJ2NvbmZpZycpCiAKLSAgICBkZWYgcHJpbnRf ZXhwZWN0ZWQoc2VsZiwgbXNnKToKKyAgICBkZWYgX3ByaW50X2V4cGVjdGVkKHNlbGYsIG1zZyk6 CiAgICAgICAgIHNlbGYud3JpdGUobXNnLCAnZXhwZWN0ZWQnKQogCiAgICAgZGVmIHByaW50X3Rp bWluZyhzZWxmLCBtc2cpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvdmlld3MvcHJpbnRpbmdfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQppbmRleCBiMjk4MzQx ZjJiY2IyMTAyMTBlNWM4YmY5ZWQ1OGU5M2MzYjg0NDAyLi42M2QzMmY0NjU5OWY2YWFiM2RkODg3 MjQ1ZTI3M2EzNjE0ZmU2MzdmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy92aWV3cy9wcmludGluZ191bml0dGVzdC5weQpAQCAtMTg4 LDcgKzE4OCw3IEBAIGNsYXNzICBUZXN0cHJpbnRlcih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAg ICAgIHNlbGYuZG9fc3dpdGNoX3Rlc3RzKCdwcmludF9jb25maWcnLCAnY29uZmlnJywgdG9fYnVp bGRib3Q9RmFsc2UpCiAKICAgICBkZWYgdGVzdF9wcmludF9leHBlY3RlZChzZWxmKToKLSAgICAg ICAgc2VsZi5kb19zd2l0Y2hfdGVzdHMoJ3ByaW50X2V4cGVjdGVkJywgJ2V4cGVjdGVkJywgdG9f YnVpbGRib3Q9RmFsc2UpCisgICAgICAgIHNlbGYuZG9fc3dpdGNoX3Rlc3RzKCdfcHJpbnRfZXhw ZWN0ZWQnLCAnZXhwZWN0ZWQnLCB0b19idWlsZGJvdD1GYWxzZSkKIAogICAgIGRlZiB0ZXN0X3By aW50X3RpbWluZyhzZWxmKToKICAgICAgICAgc2VsZi5kb19zd2l0Y2hfdGVzdHMoJ3ByaW50X3Rp bWluZycsICd0aW1pbmcnLCB0b19idWlsZGJvdD1GYWxzZSkK