91297 2012-07-13 16:18:54 -0700 test-webkitpy: clean up logging to make it ninja-esque 2012-07-16 14:13:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76022 1 dpranke dpranke abarth eric ojan rniwa tony oldest_to_newest 669548 0 dpranke 2012-07-13 16:18:54 -0700 test-webkitpy: clean up logging to make it ninja-esque 669559 1 152366 dpranke 2012-07-13 16:25:24 -0700 Created attachment 152366 Patch 669654 2 152366 abarth 2012-07-13 18:24:25 -0700 Comment on attachment 152366 Patch Ok. I like the idea of getting the error message right away. 670650 3 dpranke 2012-07-16 14:13:43 -0700 Committed r122764: <http://trac.webkit.org/changeset/122764> 152366 2012-07-13 16:25:24 -0700 2012-07-13 18:24:24 -0700 Patch bug-91297-20120713162523.patch text/plain 13120 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyNjMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTBjYWJiODQ4Nzg1MGUwYWJlNGMzYzExNjI2NWQyZmU3 NDc3YzRkNC4uNzUyYjA3NWFkOGZlZWU2Y2VmNjViNmRlNjg2NTgyOTIwY2RhMDc1ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU3 IEBACiAyMDEyLTA3LTEzICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHRlc3Qtd2Via2l0cHk6IGNsZWFuIHVwIGxvZ2dpbmcgdG8gbWFrZSBpdCBuaW5qYS1l c3F1ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTEy OTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlz IHBhdGNoIGNoYW5nZXMgdGhlIG91dHB1dCBvZiB0ZXN0LXdlYmtpdHB5IHRvIGJlIGNsb3NlciB0 bworICAgICAgICB3aGF0IG5pbmphIHByb2R1Y2VzLiBOYW1lbHk6CisKKyAgICAgICAgSWYgeW91 IGFyZSBydW5uaW5nIHdpdGggc3RkZXJyIHdyaXRpbmcgdG8gYSB0dHkgKGFuZCBub3QgLXYpLCB3 ZQorICAgICAgICB3aWxsIG5vIGxvbmdlciBwcmludCAnLi4uJyBhcyB0ZXN0cyBjb21wbGV0ZS4g SW5zdGVhZCwgd2UgdXNlIGEKKyAgICAgICAgbWV0ZXJlZCBzdHJlYW0gYW5kIHByaW50IGVudHJp ZXMgb2YgdGhlIGZvcm06CisgICAgICAgICAgICdbWC9ZXSB0ZXN0X25hbWUgcGFzc2VkL2ZhaWxl ZC9lcnJlZCcKKyAgICAgICAgd2hlcmUgWCBpcyB0aGUgY3VycmVudCB0ZXN0ICMgYW5kIFkgaXMg dGhlIHRvdGFsIG51bWJlciBvZiB0ZXN0cy4KKworICAgICAgICBJZiB5b3UgYXJlIHJ1bm5pbmcg d2l0aCBzdGRlcnIgcGlwZWQgdG8gYSBmaWxlIG9yIG90aGVyIG5vbi10dHkKKyAgICAgICAgb2Jq ZWN0IChvciB3aXRoIC12KSwgeW91IGdldCB0aGUgc2FtZSBvdXRwdXQsIG9uZSBwZXIgbGluZSBm b3IKKyAgICAgICAgZXZlcnkgdGVzdC4KKworICAgICAgICBJbiBhZGRpdGlvbiwgaWYgdGVzdHMg ZmFpbCBvciBlcnIgb3V0LCB5b3UgZ2V0IHRoZSBzdGFjayB0cmFjZQorICAgICAgICBpbW1lZGlh dGVseTsgeW91IGRvbid0IGhhdmUgdG8gd2FpdCB1bnRpbCB0aGUgZW5kIG9mIHRoZSBydW4uCisK KyAgICAgICAgTGFzdGx5LCB0aGlzIGNoYW5nZSBjbGVhbnMgdXAgdGhlIHVuaXQgdGVzdHMgZm9y IHRlc3Qtd2Via2l0cHkKKyAgICAgICAgaXRzZWxmIHRvIG5vdCBjb25mdXNlIHRoZSBsb2dnZXIg YW5kIHRvIHdvcmsgY2xlYW5seSB3LyBtdWx0aXBsZQorICAgICAgICBwcm9jZXNzZXMuIEl0IGxv b2tzIGxpa2UgYmV0d2VlbiB0aGlzIGFuZCBhbGwgdGhlIGNsZWFuIHVwIGluCisgICAgICAgIE1l c3NhZ2VQb29sIHRoYXQgaGFwcGVuZWQgYXMgaXQgbGFuZGVkLCB3ZSBjYW4gbm93IHJ1bgorICAg ICAgICBtdWx0aXByb2Nlc3NpbmcgdGVzdHMgaW4gcGFyYWxsZWwuCisKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3Rlc3QvZmluZGVyLnB5OgorICAgICAgICAoRmluZGVyLl9kZWZhdWx0X25h bWVzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rlc3QvZmluZGVyX3VuaXR0ZXN0LnB5 OgorICAgICAgICAoRmluZGVyVGVzdC5zZXRVcCk6CisgICAgICAgIChGaW5kZXJUZXN0LnRlYXJE b3duKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Rlc3QvcHJpbnRlci5weToKKyAgICAg ICAgKFByaW50ZXIuX19pbml0X18pOgorICAgICAgICAoUHJpbnRlci5jb25maWd1cmUpOgorICAg ICAgICAoUHJpbnRlci5wcmludF9zdGFydGVkX3Rlc3QpOgorICAgICAgICAoUHJpbnRlci5wcmlu dF9maW5pc2hlZF90ZXN0KToKKyAgICAgICAgKFByaW50ZXIuX3Rlc3RfbGluZSk6CisgICAgICAg IChQcmludGVyLnByaW50X3Jlc3VsdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90ZXN0 L3J1bm5lci5weToKKyAgICAgICAgKFJ1bm5lci5ydW4pOgorICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvdGVzdC9ydW5uZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChSdW5uZXJUZXN0LnNldFVw KToKKyAgICAgICAgKFJ1bm5lclRlc3QpOgorICAgICAgICAoUnVubmVyVGVzdC50ZWFyRG93bik6 CisgICAgICAgIChSdW5uZXJUZXN0LmFzc2VydF9ydW4pOgorICAgICAgICAoUnVubmVyVGVzdC50 ZXN0X3JlZ3VsYXIpOgorICAgICAgICAoUnVubmVyVGVzdC50ZXN0X3ZlcmJvc2UpOgorICAgICAg ICAoUnVubmVyVGVzdC50ZXN0X3RpbWluZyk6CisKKzIwMTItMDctMTMgIERpcmsgUHJhbmtlICA8 ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgdGVzdC13ZWJraXRweTogcnVuIHRlc3Rz IGluIHBhcmFsbGVsCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05MTI5NAogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvZmlu ZGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L2ZpbmRlci5weQppbmRleCAwYjE0 ZjA0NTMxYjQwMzYxMGJiOWVkNGQxMjQ1N2IyMWU3OTI5YTM0Li5mY2JiMGU5Y2YyN2YzYTczZWNl Y2JiNWU2YzU4MDY4MmE1Yjk1YTJjIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3Rlc3QvZmluZGVyLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9maW5kZXIu cHkKQEAgLTE2NSwxMSArMTY1LDYgQEAgY2xhc3MgRmluZGVyKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICd3ZWJraXRweS50b29sJykKICAgICAgICAgICAgICAg ICBzZWxmLl9leGNsdWRlKG1vZHVsZXMsIHdpbjMyX2JsYWNrbGlzdCwgJ2ZhaWwgaG9ycmlibHkg b24gd2luMzInLCA1NDUyNikKIAotICAgICAgICBpZiBza2lwX2lmX3BhcmFsbGVsOgotICAgICAg ICAgICAgc2VyaWFsX3Rlc3RzID0gKCd3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZV91 bml0dGVzdC5FeGVjdXRpdmVUZXN0LnRlc3RfcnVubmluZ19pbl9wYXJhbGxlbCcsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgJ3dlYmtpdHB5LnRlc3QnKQotICAgICAgICAgICAgc2VsZi5f ZXhjbHVkZShtb2R1bGVzLCBzZXJpYWxfdGVzdHMsICd0ZXN0cyBmYWlsIHdoZW4gcnVuIGluIHBh cmFsbGVsIHdpdGggb3RoZXIgdGVzdHMnLCAxMjM0NSkKLQogICAgICAgICByZXR1cm4gbW9kdWxl cwogCiAgICAgZGVmIF9leGNsdWRlKHNlbGYsIG1vZHVsZXMsIG1vZHVsZV9wcmVmaXhlcywgcmVh c29uLCBidWdpZCk6CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvZmlu ZGVyX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L2ZpbmRlcl91bml0 dGVzdC5weQppbmRleCAwOTA0OGIxNTk5ZjQwNWI4ZDQxNDIyZDBhNDEyZjJlOTU4ZGQ1ZjUzLi4z ODZjNTc5Yzc3NGNkOTIyMmE5MDFhMzVjMjRkZTJjNGJhMWUyYTljIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3Rlc3QvZmluZGVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvdGVzdC9maW5kZXJfdW5pdHRlc3QucHkKQEAgLTQ3LDE4ICs0NywxNSBA QCBjbGFzcyBGaW5kZXJUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgIyBIZXJlIHdl IGhhdmUgdG8ganVtcCB0aHJvdWdoIGEgaG9vcCB0byBtYWtlIHN1cmUgdGVzdC13ZWJraXRweSBk b2Vzbid0IGxvZwogICAgICAgICAjIGFueSBtZXNzYWdlcyBmcm9tIHRoZXNlIHRlc3RzIDooLgog ICAgICAgICBzZWxmLnJvb3RfbG9nZ2VyID0gbG9nZ2luZy5nZXRMb2dnZXIoKQotICAgICAgICBz ZWxmLmxvZ19oYW5kbGVyID0gTm9uZQotICAgICAgICBmb3IgaCBpbiBzZWxmLnJvb3RfbG9nZ2Vy LmhhbmRsZXJzOgotICAgICAgICAgICAgaWYgZ2V0YXR0cihoLCAnbmFtZScsIE5vbmUpID09ICd3 ZWJraXRweS50ZXN0LnByaW50ZXInOgotICAgICAgICAgICAgICAgIHNlbGYubG9nX2hhbmRsZXIg PSBoCi0gICAgICAgICAgICAgICAgYnJlYWsKLSAgICAgICAgaWYgc2VsZi5sb2dfaGFuZGxlcjoK LSAgICAgICAgICAgIHNlbGYubG9nX2xldmVsID0gc2VsZi5sb2dfaGFuZGxlci5sZXZlbAotICAg ICAgICAgICAgc2VsZi5sb2dfaGFuZGxlci5sZXZlbCA9IGxvZ2dpbmcuQ1JJVElDQUwKKyAgICAg ICAgc2VsZi5sb2dfbGV2ZWxzID0gW10KKyAgICAgICAgc2VsZi5sb2dfaGFuZGxlcnMgPSBzZWxm LnJvb3RfbG9nZ2VyLmhhbmRsZXJzWzpdCisgICAgICAgIGZvciBoYW5kbGVyIGluIHNlbGYubG9n X2hhbmRsZXJzOgorICAgICAgICAgICAgc2VsZi5sb2dfbGV2ZWxzLmFwcGVuZChoYW5kbGVyLmxl dmVsKQorICAgICAgICAgICAgaGFuZGxlci5sZXZlbCA9IGxvZ2dpbmcuQ1JJVElDQUwKIAogICAg IGRlZiB0ZWFyRG93bihzZWxmKToKLSAgICAgICAgaWYgc2VsZi5sb2dfaGFuZGxlcjoKLSAgICAg ICAgICAgIHNlbGYubG9nX2hhbmRsZXIuc2V0TGV2ZWwoc2VsZi5sb2dfbGV2ZWwpCisgICAgICAg IGZvciBoYW5kbGVyIGluIHNlbGYubG9nX2hhbmRsZXJzOgorICAgICAgICAgICAgaGFuZGxlci5s ZXZlbCA9IHNlbGYubG9nX2xldmVscy5wb3AoMCkKIAogICAgIGRlZiB0ZXN0X2FkZGl0aW9uYWxf c3lzdGVtX3BhdGhzKHNlbGYpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFscyhzZWxmLmZpbmRl ci5hZGRpdGlvbmFsX3BhdGhzKFsnL3VzciddKSwKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvdGVzdC9wcmludGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L3By aW50ZXIucHkKaW5kZXggMTgwNTk3ODAyNDBhMjBiZGVlOTE2ZTk5Y2UyMzM3MjQ2NjU3YjEwNi4u OWNjNDlkZDhmNjRjOThiYTkxZjZlMDNlZGI2YmVjNTEzODNjZmFjZSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L3ByaW50ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS90ZXN0L3ByaW50ZXIucHkKQEAgLTI2LDYgKzI2LDcgQEAgaW1wb3J0IHJlCiBpbXBv cnQgU3RyaW5nSU8KIAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtIGltcG9ydCBvdXRwdXRj YXB0dXJlCitmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy52aWV3cy5tZXRlcmVkX3N0cmVhbSBp bXBvcnQgTWV0ZXJlZFN0cmVhbQogCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18p CiAKQEAgLTMzLDggKzM0LDE1IEBAIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykK IGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICBkZWYgX19pbml0X18oc2VsZiwgc3RyZWFtLCBv cHRpb25zPU5vbmUpOgogICAgICAgICBzZWxmLnN0cmVhbSA9IHN0cmVhbQorICAgICAgICBzZWxm Lm1ldGVyID0gTm9uZQogICAgICAgICBzZWxmLm9wdGlvbnMgPSBvcHRpb25zCiAgICAgICAgIHNl bGYudGVzdF9kZXNjcmlwdGlvbiA9IHJlLmNvbXBpbGUoIihcdyspIFwoKFtcdy5dKylcKSIpCisg ICAgICAgIHNlbGYubnVtX3Rlc3RzID0gMAorICAgICAgICBzZWxmLm51bV9jb21wbGV0ZWQgPSAw CisgICAgICAgIHNlbGYucnVubmluZ190ZXN0cyA9IFtdCisgICAgICAgIHNlbGYuY29tcGxldGVk X3Rlc3RzID0gW10KKyAgICAgICAgaWYgb3B0aW9uczoKKyAgICAgICAgICAgIHNlbGYuY29uZmln dXJlKG9wdGlvbnMpCiAKICAgICBkZWYgdGVzdF9uYW1lKHNlbGYsIHRlc3QpOgogICAgICAgICBt ID0gc2VsZi50ZXN0X2Rlc2NyaXB0aW9uLm1hdGNoKHN0cih0ZXN0KSkKQEAgLTUzLDYgKzYxLDgg QEAgY2xhc3MgUHJpbnRlcihvYmplY3QpOgogICAgICAgICBlbGlmIG9wdGlvbnMudmVyYm9zZSA9 PSAyOgogICAgICAgICAgICAgbG9nX2xldmVsID0gbG9nZ2luZy5ERUJVRwogCisgICAgICAgIHNl bGYubWV0ZXIgPSBNZXRlcmVkU3RyZWFtKHNlbGYuc3RyZWFtLCAob3B0aW9ucy52ZXJib3NlID09 IDIpKQorCiAgICAgICAgIGhhbmRsZXIgPSBsb2dnaW5nLlN0cmVhbUhhbmRsZXIoc2VsZi5zdHJl YW0pCiAgICAgICAgICMgV2UgY29uc3RyYWluIHRoZSBsZXZlbCBvbiB0aGUgaGFuZGxlciByYXRo ZXIgdGhhbiBvbiB0aGUgcm9vdAogICAgICAgICAjIGxvZ2dlciBpdHNlbGYuICBUaGlzIGlzIHBy b2JhYmx5IGJldHRlciBiZWNhdXNlIHRoZSBoYW5kbGVyIGlzCkBAIC05OSw1OCArMTA5LDY0IEBA IGNsYXNzIFByaW50ZXIob2JqZWN0KToKICAgICAgICAgICAgIG91dHB1dGNhcHR1cmUuT3V0cHV0 Q2FwdHVyZS5zdHJlYW1fd3JhcHBlciA9IF9DYXB0dXJlQW5kUGFzc1Rocm91Z2hTdHJlYW0KIAog ICAgIGRlZiBwcmludF9zdGFydGVkX3Rlc3Qoc2VsZiwgc291cmNlLCB0ZXN0X25hbWUpOgorICAg ICAgICBzZWxmLnJ1bm5pbmdfdGVzdHMuYXBwZW5kKHRlc3RfbmFtZSkKKyAgICAgICAgaWYgbGVu KHNlbGYucnVubmluZ190ZXN0cykgPiAxOgorICAgICAgICAgICAgc3VmZml4ID0gJyAoKyVkKScg JSAobGVuKHNlbGYucnVubmluZ190ZXN0cykgLSAxKQorICAgICAgICBlbHNlOgorICAgICAgICAg ICAgc3VmZml4ID0gJycKKwogICAgICAgICBpZiBzZWxmLm9wdGlvbnMudmVyYm9zZToKLSAgICAg ICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKHRlc3RfbmFtZSkKKyAgICAgICAgICAgIHdyaXRlID0g c2VsZi5tZXRlci53cml0ZV91cGRhdGUKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHdyaXRl ID0gc2VsZi5tZXRlci53cml0ZV90aHJvdHRsZWRfdXBkYXRlCisKKyAgICAgICAgd3JpdGUoc2Vs Zi5fdGVzdF9saW5lKHNlbGYucnVubmluZ190ZXN0c1swXSwgc3VmZml4KSkKIAogICAgIGRlZiBw cmludF9maW5pc2hlZF90ZXN0KHNlbGYsIHJlc3VsdCwgdGVzdF9uYW1lLCB0ZXN0X3RpbWUsIGZh aWx1cmUsIGVycik6Ci0gICAgICAgIHRpbWluZyA9ICcnCi0gICAgICAgIGlmIHNlbGYub3B0aW9u cy50aW1pbmc6Ci0gICAgICAgICAgICB0aW1pbmcgPSAnICUuNGZzJyAlIHRlc3RfdGltZQotICAg ICAgICBpZiBzZWxmLm9wdGlvbnMudmVyYm9zZToKLSAgICAgICAgICAgIGlmIGZhaWx1cmU6Ci0g ICAgICAgICAgICAgICAgbXNnID0gJyBmYWlsZWQnCi0gICAgICAgICAgICBlbGlmIGVycjoKLSAg ICAgICAgICAgICAgICBtc2cgPSAnIGVycmVkJworICAgICAgICB3cml0ZSA9IHNlbGYubWV0ZXIu d3JpdGVsbgorICAgICAgICBpZiBmYWlsdXJlOgorICAgICAgICAgICAgbGluZXMgPSBmYWlsdXJl WzBdWzFdLnNwbGl0bGluZXMoKSArIFsnJ10KKyAgICAgICAgICAgIHN1ZmZpeCA9ICcgZmFpbGVk OicKKyAgICAgICAgZWxpZiBlcnI6CisgICAgICAgICAgICBsaW5lcyA9IGVyclswXVsxXS5zcGxp dGxpbmVzKCkgKyBbJyddCisgICAgICAgICAgICBzdWZmaXggPSAnIGVycmVkOicKKyAgICAgICAg ZWxzZToKKyAgICAgICAgICAgIHN1ZmZpeCA9ICcgcGFzc2VkJworICAgICAgICAgICAgbGluZXMg PSBbXQorICAgICAgICAgICAgaWYgc2VsZi5vcHRpb25zLnZlcmJvc2U6CisgICAgICAgICAgICAg ICAgd3JpdGUgPSBzZWxmLm1ldGVyLndyaXRlbG4KICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAg ICAgICAgICAgbXNnID0gJyBwYXNzZWQnCi0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSht c2cgKyB0aW1pbmcgKyAnXG4nKQorICAgICAgICAgICAgICAgIHdyaXRlID0gc2VsZi5tZXRlci53 cml0ZV90aHJvdHRsZWRfdXBkYXRlCisgICAgICAgIGlmIHNlbGYub3B0aW9ucy50aW1pbmc6Cisg ICAgICAgICAgICBzdWZmaXggKz0gJyAlLjRmcycgJSB0ZXN0X3RpbWUKKworICAgICAgICBzZWxm Lm51bV9jb21wbGV0ZWQgKz0gMQorCisgICAgICAgIGlmIHRlc3RfbmFtZSA9PSBzZWxmLnJ1bm5p bmdfdGVzdHNbMF06CisgICAgICAgICAgICBzZWxmLmNvbXBsZXRlZF90ZXN0cy5pbnNlcnQoMCwg W3Rlc3RfbmFtZSwgc3VmZml4LCBsaW5lc10pCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBp ZiBmYWlsdXJlOgotICAgICAgICAgICAgICAgIG1zZyA9ICdGJwotICAgICAgICAgICAgZWxpZiBl cnI6Ci0gICAgICAgICAgICAgICAgbXNnID0gJ0UnCisgICAgICAgICAgICBzZWxmLmNvbXBsZXRl ZF90ZXN0cy5hcHBlbmQoW3Rlc3RfbmFtZSwgc3VmZml4LCBsaW5lc10pCisgICAgICAgIHNlbGYu cnVubmluZ190ZXN0cy5yZW1vdmUodGVzdF9uYW1lKQorCisgICAgICAgIGZvciB0ZXN0X25hbWUs IG1zZywgbGluZXMgaW4gc2VsZi5jb21wbGV0ZWRfdGVzdHM6CisgICAgICAgICAgICBpZiBsaW5l czoKKyAgICAgICAgICAgICAgICBzZWxmLm1ldGVyLndyaXRlbG4oc2VsZi5fdGVzdF9saW5lKHRl c3RfbmFtZSwgbXNnKSkKKyAgICAgICAgICAgICAgICBmb3IgbGluZSBpbiBsaW5lczoKKyAgICAg ICAgICAgICAgICAgICAgc2VsZi5tZXRlci53cml0ZWxuKCcgICcgKyBsaW5lKQogICAgICAgICAg ICAgZWxzZToKLSAgICAgICAgICAgICAgICBtc2cgPSAnLicKLSAgICAgICAgICAgIHNlbGYuc3Ry ZWFtLndyaXRlKG1zZykKKyAgICAgICAgICAgICAgICB3cml0ZShzZWxmLl90ZXN0X2xpbmUodGVz dF9uYW1lLCBtc2cpKQorICAgICAgICBzZWxmLmNvbXBsZXRlZF90ZXN0cyA9IFtdCiAKLSAgICBk ZWYgcHJpbnRfcmVzdWx0KHNlbGYsIHJlc3VsdCwgcnVuX3RpbWUpOgotICAgICAgICBzZWxmLnN0 cmVhbS53cml0ZSgnXG4nKQotCi0gICAgICAgIGZvciAodGVzdCwgZXJyKSBpbiByZXN1bHQuZXJy b3JzOgotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIj0iICogODAgKyAnXG4nKQotICAg ICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIkVSUk9SOiAiICsgc2VsZi50ZXN0X25hbWUodGVz dCkgKyAnXG4nKQotICAgICAgICAgICAgc2VsZi5zdHJlYW0ud3JpdGUoIi0iICogODAgKyAnXG4n KQotICAgICAgICAgICAgZm9yIGxpbmUgaW4gZXJyLnNwbGl0bGluZXMoKToKLSAgICAgICAgICAg ICAgICBzZWxmLnN0cmVhbS53cml0ZShsaW5lICsgJ1xuJykKLSAgICAgICAgICAgIHNlbGYuc3Ry ZWFtLndyaXRlKCdcbicpCi0KLSAgICAgICAgZm9yICh0ZXN0LCBmYWlsdXJlKSBpbiByZXN1bHQu ZmFpbHVyZXM6Ci0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiPSIgKiA4MCArICdcbicp Ci0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgiRkFJTFVSRTogIiArIHNlbGYudGVzdF9u YW1lKHRlc3QpICsgJ1xuJykKLSAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCItIiAqIDgw ICsgJ1xuJykKLSAgICAgICAgICAgIGZvciBsaW5lIGluIGZhaWx1cmUuc3BsaXRsaW5lcygpOgot ICAgICAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKGxpbmUgKyAnXG4nKQotICAgICAgICAg ICAgc2VsZi5zdHJlYW0ud3JpdGUoJ1xuJykKLQotICAgICAgICBzZWxmLnN0cmVhbS53cml0ZSgn LScgKiA4MCArICdcbicpCi0gICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCdSYW4gJWQgdGVzdCVz IGluICUuM2ZzXG4nICUKLSAgICAgICAgICAgIChyZXN1bHQudGVzdHNSdW4sIHJlc3VsdC50ZXN0 c1J1biAhPSAxIGFuZCAicyIgb3IgIiIsIHJ1bl90aW1lKSkKKyAgICBkZWYgX3Rlc3RfbGluZShz ZWxmLCB0ZXN0X25hbWUsIHN1ZmZpeCk6CisgICAgICAgIHJldHVybiAnWyVkLyVkXSAlcyVzJyAl IChzZWxmLm51bV9jb21wbGV0ZWQsIHNlbGYubnVtX3Rlc3RzLCB0ZXN0X25hbWUsIHN1ZmZpeCkK IAorICAgIGRlZiBwcmludF9yZXN1bHQoc2VsZiwgcmVzdWx0LCBydW5fdGltZSk6CisgICAgICAg IHdyaXRlID0gc2VsZi5tZXRlci53cml0ZWxuCisgICAgICAgIHdyaXRlKCdSYW4gJWQgdGVzdCVz IGluICUuM2ZzJyAlIChyZXN1bHQudGVzdHNSdW4sIHJlc3VsdC50ZXN0c1J1biAhPSAxIGFuZCAi cyIgb3IgIiIsIHJ1bl90aW1lKSkKICAgICAgICAgaWYgcmVzdWx0Lndhc1N1Y2Nlc3NmdWwoKToK LSAgICAgICAgICAgIHNlbGYuc3RyZWFtLndyaXRlKCdcbk9LXG4nKQorICAgICAgICAgICAgd3Jp dGUoJ1xuT0tcbicpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICBzZWxmLnN0cmVhbS53cml0 ZSgnRkFJTEVEIChmYWlsdXJlcz0lZCwgZXJyb3JzPSVkKVxuJyAlCi0gICAgICAgICAgICAgICAg KGxlbihyZXN1bHQuZmFpbHVyZXMpLCBsZW4ocmVzdWx0LmVycm9ycykpKQorICAgICAgICAgICAg d3JpdGUoJ0ZBSUxFRCAoZmFpbHVyZXM9JWQsIGVycm9ycz0lZClcbicgJSAobGVuKHJlc3VsdC5m YWlsdXJlcyksIGxlbihyZXN1bHQuZXJyb3JzKSkpCiAKIAogY2xhc3MgX0NhcHR1cmVBbmRQYXNz VGhyb3VnaFN0cmVhbShvYmplY3QpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90ZXN0L3J1bm5lci5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9ydW5uZXIucHkK aW5kZXggZjhmMTliMjU0MDdmYTAwMzcwOWEyMjViOTZlODdhMDczY2M2NjFhNS4uMmE5YWE0MjQz Y2MzMjVjNWQ1ZWJiNTgzNjI4MWNlMDZkMWFkMWY1NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90ZXN0L3J1bm5lci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Rl c3QvcnVubmVyLnB5CkBAIC01MSw2ICs1MSw3IEBAIGNsYXNzIFJ1bm5lcihvYmplY3QpOgogICAg IGRlZiBydW4oc2VsZiwgc3VpdGUpOgogICAgICAgICBydW5fc3RhcnRfdGltZSA9IHRpbWUudGlt ZSgpCiAgICAgICAgIGFsbF90ZXN0X25hbWVzID0gc2VsZi5hbGxfdGVzdF9uYW1lcyhzdWl0ZSkK KyAgICAgICAgc2VsZi5wcmludGVyLm51bV90ZXN0cyA9IGxlbihhbGxfdGVzdF9uYW1lcykKIAog ICAgICAgICB3aXRoIG1lc3NhZ2VfcG9vbC5nZXQoc2VsZiwgc2VsZi53b3JrZXJfZmFjdG9yeSwg aW50KHNlbGYub3B0aW9ucy5jaGlsZF9wcm9jZXNzZXMpKSBhcyBwb29sOgogICAgICAgICAgICAg cG9vbC5ydW4oKCd0ZXN0JywgdGVzdF9uYW1lKSBmb3IgdGVzdF9uYW1lIGluIGFsbF90ZXN0X25h bWVzKQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90ZXN0L3J1bm5lcl91bml0 dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdGVzdC9ydW5uZXJfdW5pdHRlc3QucHkK aW5kZXggOTQzNmI4Yzk2MTg4ZGU1ODI2NmRmMTdhNzNhMzgxOTg4M2E1ZWFjMS4uMDdjNWMzMWVh MDhjYTk2YTJlOGQ5ODY1NTQzMTBiODVkNTNjNzkzMiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRweS90ZXN0L3J1bm5lcl91bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3Rlc3QvcnVubmVyX3VuaXR0ZXN0LnB5CkBAIC0yMCw2ICsyMCw3IEBACiAjIE9SIFRP UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9ydCBsb2dnaW5nCiBpbXBvcnQg cmUKIGltcG9ydCBTdHJpbmdJTwogaW1wb3J0IHVuaXR0ZXN0CkBAIC02OSw3ICs3MCwyMiBAQCBj bGFzcyBGYWtlTG9hZGVyKG9iamVjdCk6CiAKIAogY2xhc3MgUnVubmVyVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6Ci0gICAgZGVmIGFzc2VydF9ydW4oc2VsZiwgb3B0aW9ucyk6CisgICAgZGVmIHNl dFVwKHNlbGYpOgorICAgICAgICAjIEhlcmUgd2UgaGF2ZSB0byBqdW1wIHRocm91Z2ggYSBob29w IHRvIG1ha2Ugc3VyZSB0ZXN0LXdlYmtpdHB5IGRvZXNuJ3QgbG9nCisgICAgICAgICMgYW55IG1l c3NhZ2VzIGZyb20gdGhlc2UgdGVzdHMgOiguCisgICAgICAgIHNlbGYucm9vdF9sb2dnZXIgPSBs b2dnaW5nLmdldExvZ2dlcigpCisgICAgICAgIHNlbGYubG9nX2xldmVscyA9IFtdCisgICAgICAg IHNlbGYubG9nX2hhbmRsZXJzID0gc2VsZi5yb290X2xvZ2dlci5oYW5kbGVyc1s6XQorICAgICAg ICBmb3IgaGFuZGxlciBpbiBzZWxmLmxvZ19oYW5kbGVyczoKKyAgICAgICAgICAgIHNlbGYubG9n X2xldmVscy5hcHBlbmQoaGFuZGxlci5sZXZlbCkKKyAgICAgICAgICAgIGhhbmRsZXIubGV2ZWwg PSBsb2dnaW5nLkNSSVRJQ0FMCisKKyAgICBkZWYgdGVhckRvd24oc2VsZik6CisgICAgICAgIGZv ciBoYW5kbGVyIGluIHNlbGYubG9nX2hhbmRsZXJzOgorICAgICAgICAgICAgaGFuZGxlci5sZXZl bCA9IHNlbGYubG9nX2xldmVscy5wb3AoMCkKKworICAgIGRlZiBhc3NlcnRfcnVuKHNlbGYsIHZl cmJvc2U9MCwgdGltaW5nPUZhbHNlLCBjaGlsZF9wcm9jZXNzZXM9MSwgcXVpZXQ9RmFsc2UpOgor ICAgICAgICBvcHRpb25zID0gTW9ja09wdGlvbnModmVyYm9zZT12ZXJib3NlLCB0aW1pbmc9dGlt aW5nLCBjaGlsZF9wcm9jZXNzZXM9Y2hpbGRfcHJvY2Vzc2VzLCBxdWlldD1xdWlldCwgcGFzc190 aHJvdWdoPUZhbHNlKQogICAgICAgICBzdHJlYW0gPSBTdHJpbmdJTy5TdHJpbmdJTygpCiAgICAg ICAgIGxvYWRlciA9IEZha2VMb2FkZXIoKCd0ZXN0MSAoRm9vKScsICcuJywgJycpLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICgndGVzdDIgKEZvbyknLCAnRicsICd0ZXN0MlxuZmFpbGVk JyksCkBAIC04MywxMyArOTksMTMgQEAgY2xhc3MgUnVubmVyVGVzdCh1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgICMgRklYTUU6IGNoZWNrIHRoZSBvdXRwdXQgZnJvbSB0aGUgdGVzdAogCiAg ICAgZGVmIHRlc3RfcmVndWxhcihzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRfcnVuKE1vY2tP cHRpb25zKHZlcmJvc2U9MCwgdGltaW5nPUZhbHNlLCBjaGlsZF9wcm9jZXNzZXM9MSkpCisgICAg ICAgIHNlbGYuYXNzZXJ0X3J1bigpCiAKICAgICBkZWYgdGVzdF92ZXJib3NlKHNlbGYpOgotICAg ICAgICBzZWxmLmFzc2VydF9ydW4oTW9ja09wdGlvbnModmVyYm9zZT0xLCB0aW1pbmc9RmFsc2Us IGNoaWxkX3Byb2Nlc3Nlcz0xKSkKKyAgICAgICAgc2VsZi5hc3NlcnRfcnVuKHZlcmJvc2U9MSkK IAogICAgIGRlZiB0ZXN0X3RpbWluZyhzZWxmKToKLSAgICAgICAgc2VsZi5hc3NlcnRfcnVuKE1v Y2tPcHRpb25zKHZlcmJvc2U9MCwgdGltaW5nPVRydWUsIGNoaWxkX3Byb2Nlc3Nlcz0xKSkKKyAg ICAgICAgc2VsZi5hc3NlcnRfcnVuKHRpbWluZz1UcnVlKQogCiAKIGlmIF9fbmFtZV9fID09ICdf X21haW5fXyc6Cg==