105248 2012-12-17 21:10:38 -0800 Consider removing --pause-before-testing option 2012-12-18 10:56:50 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77037 1 rniwa rniwa abarth dpranke eric mjs webkit.review.bot oldest_to_newest 793328 0 rniwa 2012-12-17 21:10:38 -0800 Now that we've added --profile option to run-perf-tests, do we still need --pause-before-testing? We added this option to help us attach profiler but it adds a lot of crafts to various parts in webkitpy. 793368 1 eric 2012-12-17 22:29:33 -0800 Completely up to you. :) 793371 2 rniwa 2012-12-17 22:35:21 -0800 (In reply to comment #1) > Completely up to you. :) Alright. Let's get rid of it. I'm planning to make a serious of improvements to run-perf-tests and not having to support it will considerably simplify the patch. 793378 3 eric 2012-12-17 22:48:15 -0800 I would caution you that --profile is not currently designed to handle every possible iprofiler, etc. configuration, so if others are using --pause-before-testing for more exciting profiling, it may still have its uses. 793381 4 rniwa 2012-12-17 22:53:57 -0800 (In reply to comment #3) > I would caution you that --profile is not currently designed to handle every possible iprofiler, etc. configuration, so if others are using --pause-before-testing for more exciting profiling, it may still have its uses. I guess we can always restore it if someone complaints. 793387 5 179882 rniwa 2012-12-17 23:01:14 -0800 Created attachment 179882 Cleanup 793390 6 179882 eric 2012-12-17 23:04:04 -0800 Comment on attachment 179882 Cleanup I believe you can also remove Driver.start() as dpranke told me once it only existed for this option to perf-tests. 793392 7 rniwa 2012-12-17 23:07:58 -0800 (In reply to comment #6) > (From update of attachment 179882 [details]) > I believe you can also remove Driver.start() as dpranke told me once it only existed for this option to perf-tests. Will do. 793393 8 179883 rniwa 2012-12-17 23:10:06 -0800 Created attachment 179883 Also remove Driver.start 793398 9 179883 eric 2012-12-17 23:15:41 -0800 Comment on attachment 179883 Also remove Driver.start This looks fine to me, but you should probably also have dpranke take a look, and probably give folks at least until tomorrow to give comments (since you announced it on webkit-dev). :) 793834 10 179883 rniwa 2012-12-18 10:56:48 -0800 Comment on attachment 179883 Also remove Driver.start Clearing flags on attachment: 179883 Committed r138042: <http://trac.webkit.org/changeset/138042> 793835 11 rniwa 2012-12-18 10:56:50 -0800 All reviewed patches have been landed. Closing bug. 179882 2012-12-17 23:01:14 -0800 2012-12-17 23:10:06 -0800 Cleanup fix105248 text/plain 13419 rniwa SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3Rz cnVubmVyX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAx Mzc5NzYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0c3J1bm5lcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTYyLDggKzE2Miw3IEBA CiAKICAgICBkZWYgcnVuX3Rlc3Qoc2VsZiwgdGVzdF9uYW1lKToKICAgICAgICAgcnVubmVyLCBw b3J0ID0gc2VsZi5jcmVhdGVfcnVubmVyKCkKLSAgICAgICAgZHJpdmVyID0gTWFpblRlc3QuVGVz dERyaXZlcigpCi0gICAgICAgIHJldHVybiBydW5uZXIuX3J1bl9zaW5nbGVfdGVzdChDaHJvbWl1 bVN0eWxlUGVyZlRlc3QocG9ydCwgdGVzdF9uYW1lLCBydW5uZXIuX2hvc3QuZmlsZXN5c3RlbS5q b2luKCdzb21lLWRpcicsIHRlc3RfbmFtZSkpLCBkcml2ZXIpCisgICAgICAgIHJldHVybiBydW5u ZXIuX3J1bl9zaW5nbGVfdGVzdChDaHJvbWl1bVN0eWxlUGVyZlRlc3QocG9ydCwgdGVzdF9uYW1l LCBydW5uZXIuX2hvc3QuZmlsZXN5c3RlbS5qb2luKCdzb21lLWRpcicsIHRlc3RfbmFtZSkpKQog CiAgICAgZGVmIHRlc3RfcnVuX3Bhc3NpbmdfdGVzdChzZWxmKToKICAgICAgICAgc2VsZi5hc3Nl cnRUcnVlKHNlbGYucnVuX3Rlc3QoJ3Bhc3MuaHRtbCcpKQpAQCAtMjI0LDI2ICsyMjMsNiBAQAog CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdERyaXZlcldpdGhTdG9wQ291bnQuc3RvcF9j b3VudCwgNikKIAotICAgIGRlZiB0ZXN0X3J1bl90ZXN0X3BhdXNlX2JlZm9yZV90ZXN0aW5nKHNl bGYpOgotICAgICAgICBjbGFzcyBUZXN0RHJpdmVyV2l0aFN0YXJ0Q291bnQoTWFpblRlc3QuVGVz dERyaXZlcik6Ci0gICAgICAgICAgICBzdGFydF9jb3VudCA9IDAKLQotICAgICAgICAgICAgZGVm IHN0YXJ0KHNlbGYpOgotICAgICAgICAgICAgICAgIFRlc3REcml2ZXJXaXRoU3RhcnRDb3VudC5z dGFydF9jb3VudCArPSAxCi0KLSAgICAgICAgcnVubmVyLCBwb3J0ID0gc2VsZi5jcmVhdGVfcnVu bmVyKGFyZ3M9WyItLXBhdXNlLWJlZm9yZS10ZXN0aW5nIl0sIGRyaXZlcl9jbGFzcz1UZXN0RHJp dmVyV2l0aFN0YXJ0Q291bnQpCi0gICAgICAgIHRlc3RzID0gc2VsZi5fdGVzdHNfZm9yX3J1bm5l cihydW5uZXIsIFsnaW5zcGVjdG9yL3Bhc3MuaHRtbCddKQotCi0gICAgICAgIG91dHB1dCA9IE91 dHB1dENhcHR1cmUoKQotICAgICAgICBvdXRwdXQuY2FwdHVyZV9vdXRwdXQoKQotICAgICAgICB0 cnk6Ci0gICAgICAgICAgICB1bmV4cGVjdGVkX3Jlc3VsdF9jb3VudCA9IHJ1bm5lci5fcnVuX3Rl c3RzX3NldCh0ZXN0cywgcG9ydCkKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVGVzdERy aXZlcldpdGhTdGFydENvdW50LnN0YXJ0X2NvdW50LCAxKQotICAgICAgICBmaW5hbGx5OgotICAg ICAgICAgICAgc3Rkb3V0LCBzdGRlcnIsIGxvZyA9IG91dHB1dC5yZXN0b3JlX291dHB1dCgpCi0g ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5ub3JtYWxpemVGaW5pc2hlZFRpbWUobG9nKSwK LSAgICAgICAgICAgICJSZWFkeSB0byBydW4gdGVzdD9cblJ1bm5pbmcgaW5zcGVjdG9yL3Bhc3Mu aHRtbCAoMSBvZiAxKVxuUkVTVUxUIGdyb3VwX25hbWU6IHRlc3RfbmFtZT0gNDIgbXNcbkZpbmlz aGVkOiAwLjEgc1xuXG4iKQotCiAgICAgZGVmIHRlc3RfcnVuX3Rlc3Rfc2V0X2Zvcl9wYXJzZXJf dGVzdHMoc2VsZik6CiAgICAgICAgIHJ1bm5lciwgcG9ydCA9IHNlbGYuY3JlYXRlX3J1bm5lcigp CiAgICAgICAgIHRlc3RzID0gc2VsZi5fdGVzdHNfZm9yX3J1bm5lcihydW5uZXIsIFsnQmluZGlu Z3MvZXZlbnQtdGFyZ2V0LXdyYXBwZXIuaHRtbCcsICdQYXJzZXIvc29tZS1wYXJzZXIuaHRtbCdd KQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVz dHNydW5uZXIucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3Jt YW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXIucHkJKHJldmlzaW9uIDEzNzk3NikKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC05OCw4ICs5OCw2IEBACiAgICAgICAgICAgICAgICAgaGVscD0iUGF0 aCB0byB0aGUgZGlyZWN0b3J5IHVuZGVyIHdoaWNoIGJ1aWxkIGZpbGVzIGFyZSBrZXB0IChzaG91 bGQgbm90IGluY2x1ZGUgY29uZmlndXJhdGlvbikiKSwKICAgICAgICAgICAgIG9wdHBhcnNlLm1h a2Vfb3B0aW9uKCItLXRpbWUtb3V0LW1zIiwgZGVmYXVsdD02MDAgKiAxMDAwLAogICAgICAgICAg ICAgICAgIGhlbHA9IlNldCB0aGUgdGltZW91dCBmb3IgZWFjaCB0ZXN0IiksCi0gICAgICAgICAg ICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS1wYXVzZS1iZWZvcmUtdGVzdGluZyIsIGRlc3Q9InBh dXNlX2JlZm9yZV90ZXN0aW5nIiwgYWN0aW9uPSJzdG9yZV90cnVlIiwgZGVmYXVsdD1GYWxzZSwK LSAgICAgICAgICAgICAgICBoZWxwPSJQYXVzZSBiZWZvcmUgcnVubmluZyB0aGUgdGVzdHMgdG8g bGV0IHVzZXIgYXR0YWNoIGEgcGVyZm9ybWFuY2UgbW9uaXRvci4iKSwKICAgICAgICAgICAgIG9w dHBhcnNlLm1ha2Vfb3B0aW9uKCItLW5vLXJlc3VsdHMiLCBhY3Rpb249InN0b3JlX2ZhbHNlIiwg ZGVzdD0iZ2VuZXJhdGVfcmVzdWx0cyIsIGRlZmF1bHQ9VHJ1ZSwKICAgICAgICAgICAgICAgICBo ZWxwPSJEbyBubyBnZW5lcmF0ZSByZXN1bHRzIEpTT04gYW5kIHJlc3VsdHMgcGFnZS4iKSwKICAg ICAgICAgICAgIG9wdHBhcnNlLm1ha2Vfb3B0aW9uKCItLW91dHB1dC1qc29uLXBhdGgiLCBhY3Rp b249J2NhbGxiYWNrJywgY2FsbGJhY2s9X2V4cGFuZF9wYXRoLCB0eXBlPSJzdHIiLApAQCAtMzE2 LDMwICszMTQsMTkgQEAKICAgICAgICAgZHJpdmVyID0gTm9uZQogCiAgICAgICAgIGZvciB0ZXN0 IGluIHRlc3RzOgotICAgICAgICAgICAgZHJpdmVyID0gcG9ydC5jcmVhdGVfZHJpdmVyKHdvcmtl cl9udW1iZXI9MCwgbm9fdGltZW91dD1UcnVlKQotCi0gICAgICAgICAgICBpZiBzZWxmLl9vcHRp b25zLnBhdXNlX2JlZm9yZV90ZXN0aW5nOgotICAgICAgICAgICAgICAgIGRyaXZlci5zdGFydCgp Ci0gICAgICAgICAgICAgICAgaWYgbm90IHNlbGYuX2hvc3QudXNlci5jb25maXJtKCJSZWFkeSB0 byBydW4gdGVzdD8iKToKLSAgICAgICAgICAgICAgICAgICAgZHJpdmVyLnN0b3AoKQotICAgICAg ICAgICAgICAgICAgICByZXR1cm4gdW5leHBlY3RlZAotCiAgICAgICAgICAgICBfbG9nLmluZm8o J1J1bm5pbmcgJXMgKCVkIG9mICVkKScgJSAodGVzdC50ZXN0X25hbWUoKSwgZXhwZWN0ZWQgKyB1 bmV4cGVjdGVkICsgMSwgbGVuKHRlc3RzKSkpCi0gICAgICAgICAgICBpZiBzZWxmLl9ydW5fc2lu Z2xlX3Rlc3QodGVzdCwgZHJpdmVyKToKKyAgICAgICAgICAgIGlmIHNlbGYuX3J1bl9zaW5nbGVf dGVzdCh0ZXN0KToKICAgICAgICAgICAgICAgICBleHBlY3RlZCA9IGV4cGVjdGVkICsgMQogICAg ICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICB1bmV4cGVjdGVkID0gdW5leHBlY3RlZCAr IDEKIAogICAgICAgICAgICAgX2xvZy5pbmZvKCcnKQogCi0gICAgICAgICAgICBkcml2ZXIuc3Rv cCgpCi0KICAgICAgICAgcmV0dXJuIHVuZXhwZWN0ZWQKIAotICAgIGRlZiBfcnVuX3NpbmdsZV90 ZXN0KHNlbGYsIHRlc3QsIGRyaXZlcik6CisgICAgZGVmIF9ydW5fc2luZ2xlX3Rlc3Qoc2VsZiwg dGVzdCk6CiAgICAgICAgIHN0YXJ0X3RpbWUgPSB0aW1lLnRpbWUoKQotCi0gICAgICAgIG5ld19y ZXN1bHRzID0gdGVzdC5ydW4oZHJpdmVyLCBzZWxmLl9vcHRpb25zLnRpbWVfb3V0X21zKQorICAg ICAgICBuZXdfcmVzdWx0cyA9IHRlc3QucnVuKHNlbGYuX29wdGlvbnMudGltZV9vdXRfbXMpCiAg ICAgICAgIGlmIG5ld19yZXN1bHRzOgogICAgICAgICAgICAgc2VsZi5fcmVzdWx0cy51cGRhdGUo bmV3X3Jlc3VsdHMpCiAgICAgICAgIGVsc2U6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RfdW5pdHRlc3Qu cHkJKHJldmlzaW9uIDEzNzk3NikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFu Y2VfdGVzdHMvcGVyZnRlc3RfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2OSw3ICsx NjksNyBAQAogICAgICAgICBvdXRwdXRfY2FwdHVyZSA9IE91dHB1dENhcHR1cmUoKQogICAgICAg ICBvdXRwdXRfY2FwdHVyZS5jYXB0dXJlX291dHB1dCgpCiAgICAgICAgIHRyeToKLSAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwodGVzdC5ydW4oZHJpdmVyLCBOb25lKSwKKyAgICAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwodGVzdC5fcnVuX3dpdGhfZHJpdmVyKGRyaXZlciwgTm9uZSksCiAg ICAgICAgICAgICAgICAgeydzb21lLXRlc3QnOiB7J21heCc6IDIwMDAwLCAnYXZnJzogMTEwMDAu MCwgJ21lZGlhbic6IDExMDAwLCAnc3RkZXYnOiA1NjI3LjMxNDMzODcxMTM3OCwgJ21pbic6IDIw MDAsICd1bml0JzogJ21zJywKICAgICAgICAgICAgICAgICAgICAgJ3ZhbHVlcyc6IFtpICogMTAw MCBmb3IgaSBpbiByYW5nZSgyLCAyMSldfX0pCiAgICAgICAgIGZpbmFsbHk6CkBAIC0xODcsNyAr MTg3LDcgQEAKICAgICAgICAgb3V0cHV0X2NhcHR1cmUgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAg ICAgb3V0cHV0X2NhcHR1cmUuY2FwdHVyZV9vdXRwdXQoKQogICAgICAgICB0cnk6Ci0gICAgICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKHRlc3QucnVuKGRyaXZlciwgTm9uZSksCisgICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHRlc3QuX3J1bl93aXRoX2RyaXZlcihkcml2ZXIsIE5vbmUpLAog ICAgICAgICAgICAgICAgIHsnc29tZS10ZXN0JzogeydtYXgnOiAyMDAwMCwgJ2F2Zyc6IDExMDAw LjAsICdtZWRpYW4nOiAxMTAwMCwgJ3N0ZGV2JzogNTYyNy4zMTQzMzg3MTEzNzgsICdtaW4nOiAy MDAwLCAndW5pdCc6ICdtcycsCiAgICAgICAgICAgICAgICAgICAgICd2YWx1ZXMnOiBbaSAqIDEw MDAgZm9yIGkgaW4gcmFuZ2UoMiwgMjEpXX0sCiAgICAgICAgICAgICAgICAgICdzb21lLXRlc3Q6 TWFsbG9jJzogeydtYXgnOiAxMCwgJ2F2Zyc6IDEwLjAsICdtZWRpYW4nOiAxMCwgJ21pbic6IDEw LCAnc3RkZXYnOiAwLjAsICd1bml0JzogJ2J5dGVzJywKQEAgLTIwOSw3ICsyMDksNyBAQAogICAg ICAgICAgICAgcG9ydCA9IE1vY2tQb3J0KCkKICAgICAgICAgICAgIHRlc3QgPSBQYWdlTG9hZGlu Z1BlcmZUZXN0KHBvcnQsICdzb21lLXRlc3QnLCAnL3BhdGgvc29tZS1kaXIvc29tZS10ZXN0JykK ICAgICAgICAgICAgIGRyaXZlciA9IFRlc3RQYWdlTG9hZGluZ1BlcmZUZXN0Lk1vY2tEcml2ZXIo WzEsIDIsIDMsIDQsIDUsIDYsIDcsICdzb21lIGVycm9yJywgOSwgMTAsIDExLCAxMiwgMTMsIDE0 LCAxNSwgMTYsIDE3LCAxOCwgMTksIDIwXSwgdGVzdCkKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwodGVzdC5ydW4oZHJpdmVyLCBOb25lKSwgTm9uZSkKKyAgICAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwodGVzdC5fcnVuX3dpdGhfZHJpdmVyKGRyaXZlciwgTm9uZSksIE5vbmUpCiAgICAg ICAgIGZpbmFsbHk6CiAgICAgICAgICAgICBhY3R1YWxfc3Rkb3V0LCBhY3R1YWxfc3RkZXJyLCBh Y3R1YWxfbG9ncyA9IG91dHB1dF9jYXB0dXJlLnJlc3RvcmVfb3V0cHV0KCkKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChhY3R1YWxfc3Rkb3V0LCAnJykKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdC5weQkocmV2aXNpb24g MTM3OTc2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJm dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNTMsMjkgKzUzLDM2IEBACiAKIAogY2xhc3MgUGVy ZlRlc3Qob2JqZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgdGVzdF9uYW1lLCBw YXRoX29yX3VybCk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIHRlc3RfbmFtZSwgdGVz dF9wYXRoKToKICAgICAgICAgc2VsZi5fcG9ydCA9IHBvcnQKICAgICAgICAgc2VsZi5fdGVzdF9u YW1lID0gdGVzdF9uYW1lCi0gICAgICAgIHNlbGYuX3BhdGhfb3JfdXJsID0gcGF0aF9vcl91cmwK KyAgICAgICAgc2VsZi5fdGVzdF9wYXRoID0gdGVzdF9wYXRoCiAKICAgICBkZWYgdGVzdF9uYW1l KHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fdGVzdF9uYW1lCiAKLSAgICBkZWYgcGF0aF9v cl91cmwoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9wYXRoX29yX3VybAorICAgIGRlZiB0 ZXN0X3BhdGgoc2VsZik6CisgICAgICAgIHJldHVybiBzZWxmLl90ZXN0X3BhdGgKIAogICAgIGRl ZiBwcmVwYXJlKHNlbGYsIHRpbWVfb3V0X21zKToKICAgICAgICAgcmV0dXJuIFRydWUKIAotICAg IGRlZiBydW4oc2VsZiwgZHJpdmVyLCB0aW1lX291dF9tcyk6Ci0gICAgICAgIG91dHB1dCA9IHNl bGYucnVuX3NpbmdsZShkcml2ZXIsIHNlbGYucGF0aF9vcl91cmwoKSwgdGltZV9vdXRfbXMpCisg ICAgZGVmIHJ1bihzZWxmLCB0aW1lX291dF9tcyk6CisgICAgICAgIGRyaXZlciA9IHNlbGYuX3Bv cnQuY3JlYXRlX2RyaXZlcih3b3JrZXJfbnVtYmVyPTAsIG5vX3RpbWVvdXQ9VHJ1ZSkKKyAgICAg ICAgdHJ5OgorICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl93aXRoX2RyaXZlcihkcml2ZXIs IHRpbWVfb3V0X21zKQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgZHJpdmVyLnN0b3Ao KQorCisgICAgZGVmIF9ydW5fd2l0aF9kcml2ZXIoc2VsZiwgZHJpdmVyLCB0aW1lX291dF9tcyk6 CisgICAgICAgIG91dHB1dCA9IHNlbGYucnVuX3NpbmdsZShkcml2ZXIsIHNlbGYudGVzdF9wYXRo KCksIHRpbWVfb3V0X21zKQogICAgICAgICBzZWxmLl9maWx0ZXJfc3RkZXJyKG91dHB1dCkKICAg ICAgICAgaWYgc2VsZi5ydW5fZmFpbGVkKG91dHB1dCk6CiAgICAgICAgICAgICByZXR1cm4gTm9u ZQogICAgICAgICByZXR1cm4gc2VsZi5wYXJzZV9vdXRwdXQob3V0cHV0KQogCi0gICAgZGVmIHJ1 bl9zaW5nbGUoc2VsZiwgZHJpdmVyLCBwYXRoX29yX3VybCwgdGltZV9vdXRfbXMsIHNob3VsZF9y dW5fcGl4ZWxfdGVzdD1GYWxzZSk6Ci0gICAgICAgIHJldHVybiBkcml2ZXIucnVuX3Rlc3QoRHJp dmVySW5wdXQocGF0aF9vcl91cmwsIHRpbWVfb3V0X21zLCBpbWFnZV9oYXNoPU5vbmUsIHNob3Vs ZF9ydW5fcGl4ZWxfdGVzdD1zaG91bGRfcnVuX3BpeGVsX3Rlc3QpLCBzdG9wX3doZW5fZG9uZT1G YWxzZSkKKyAgICBkZWYgcnVuX3NpbmdsZShzZWxmLCBkcml2ZXIsIHRlc3RfcGF0aCwgdGltZV9v dXRfbXMsIHNob3VsZF9ydW5fcGl4ZWxfdGVzdD1GYWxzZSk6CisgICAgICAgIHJldHVybiBkcml2 ZXIucnVuX3Rlc3QoRHJpdmVySW5wdXQodGVzdF9wYXRoLCB0aW1lX291dF9tcywgaW1hZ2VfaGFz aD1Ob25lLCBzaG91bGRfcnVuX3BpeGVsX3Rlc3Q9c2hvdWxkX3J1bl9waXhlbF90ZXN0KSwgc3Rv cF93aGVuX2RvbmU9RmFsc2UpCiAKICAgICBkZWYgcnVuX2ZhaWxlZChzZWxmLCBvdXRwdXQpOgog ICAgICAgICBpZiBvdXRwdXQudGV4dCA9PSBOb25lIG9yIG91dHB1dC5lcnJvcjoKQEAgLTIwOCw4 ICsyMTUsOCBAQAogY2xhc3MgQ2hyb21pdW1TdHlsZVBlcmZUZXN0KFBlcmZUZXN0KToKICAgICBf Y2hyb21pdW1fc3R5bGVfcmVzdWx0X3JlZ2V4ID0gcmUuY29tcGlsZShyJ15SRVNVTFRccysoP1A8 bmFtZT5bXj1dKylccyo9XHMrKD9QPHZhbHVlPlxkKyhcLlxkKyk/KVxzKig/UDx1bml0Plx3Kykk JykKIAotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB0ZXN0X25hbWUsIHBhdGhfb3JfdXJs KToKLSAgICAgICAgc3VwZXIoQ2hyb21pdW1TdHlsZVBlcmZUZXN0LCBzZWxmKS5fX2luaXRfXyhw b3J0LCB0ZXN0X25hbWUsIHBhdGhfb3JfdXJsKQorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0 LCB0ZXN0X25hbWUsIHRlc3RfcGF0aCk6CisgICAgICAgIHN1cGVyKENocm9taXVtU3R5bGVQZXJm VGVzdCwgc2VsZikuX19pbml0X18ocG9ydCwgdGVzdF9uYW1lLCB0ZXN0X3BhdGgpCiAKICAgICBk ZWYgcGFyc2Vfb3V0cHV0KHNlbGYsIG91dHB1dCk6CiAgICAgICAgIHRlc3RfZmFpbGVkID0gRmFs c2UKQEAgLTIyOSwxNCArMjM2LDE0IEBACiBjbGFzcyBQYWdlTG9hZGluZ1BlcmZUZXN0KFBlcmZU ZXN0KToKICAgICBfRk9SQ0VfR0NfRklMRSA9ICdyZXNvdXJjZXMvZm9yY2UtZ2MuaHRtbCcKIAot ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB0ZXN0X25hbWUsIHBhdGhfb3JfdXJsKToKLSAg ICAgICAgc3VwZXIoUGFnZUxvYWRpbmdQZXJmVGVzdCwgc2VsZikuX19pbml0X18ocG9ydCwgdGVz dF9uYW1lLCBwYXRoX29yX3VybCkKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgdGVzdF9u YW1lLCB0ZXN0X3BhdGgpOgorICAgICAgICBzdXBlcihQYWdlTG9hZGluZ1BlcmZUZXN0LCBzZWxm KS5fX2luaXRfXyhwb3J0LCB0ZXN0X25hbWUsIHRlc3RfcGF0aCkKICAgICAgICAgc2VsZi5mb3Jj ZV9nY190ZXN0ID0gc2VsZi5fcG9ydC5ob3N0LmZpbGVzeXN0ZW0uam9pbihzZWxmLl9wb3J0LnBl cmZfdGVzdHNfZGlyKCksIHNlbGYuX0ZPUkNFX0dDX0ZJTEUpCiAKLSAgICBkZWYgcnVuX3Npbmds ZShzZWxmLCBkcml2ZXIsIHBhdGhfb3JfdXJsLCB0aW1lX291dF9tcywgc2hvdWxkX3J1bl9waXhl bF90ZXN0PUZhbHNlKToKKyAgICBkZWYgcnVuX3NpbmdsZShzZWxmLCBkcml2ZXIsIHRlc3RfcGF0 aCwgdGltZV9vdXRfbXMsIHNob3VsZF9ydW5fcGl4ZWxfdGVzdD1GYWxzZSk6CiAgICAgICAgICMg Rm9yY2UgR0MgdG8gcHJldmVudCBwYWdlbG9hZCBub2lzZS4gU2VlIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODIwMwogICAgICAgICBzdXBlcihQYWdlTG9hZGluZ1Bl cmZUZXN0LCBzZWxmKS5ydW5fc2luZ2xlKGRyaXZlciwgc2VsZi5mb3JjZV9nY190ZXN0LCB0aW1l X291dF9tcywgRmFsc2UpCi0gICAgICAgIHJldHVybiBzdXBlcihQYWdlTG9hZGluZ1BlcmZUZXN0 LCBzZWxmKS5ydW5fc2luZ2xlKGRyaXZlciwgcGF0aF9vcl91cmwsIHRpbWVfb3V0X21zLCBzaG91 bGRfcnVuX3BpeGVsX3Rlc3QpCisgICAgICAgIHJldHVybiBzdXBlcihQYWdlTG9hZGluZ1BlcmZU ZXN0LCBzZWxmKS5ydW5fc2luZ2xlKGRyaXZlciwgdGVzdF9wYXRoLCB0aW1lX291dF9tcywgc2hv dWxkX3J1bl9waXhlbF90ZXN0KQogCiAgICAgZGVmIGNhbGN1bGF0ZV9zdGF0aXN0aWNzKHNlbGYs IHZhbHVlcyk6CiAgICAgICAgIHNvcnRlZF92YWx1ZXMgPSBzb3J0ZWQodmFsdWVzKQpAQCAtMjU4 LDEyICsyNjUsMTIgQEAKICAgICAgICAgICAgICdzdGRldic6IG1hdGguc3FydChzcXVhcmVTdW0g LyAobGVuKHNvcnRlZF92YWx1ZXMpIC0gMSkpfQogICAgICAgICByZXR1cm4gcmVzdWx0CiAKLSAg ICBkZWYgcnVuKHNlbGYsIGRyaXZlciwgdGltZV9vdXRfbXMpOgorICAgIGRlZiBfcnVuX3dpdGhf ZHJpdmVyKHNlbGYsIGRyaXZlciwgdGltZV9vdXRfbXMpOgogICAgICAgICByZXN1bHRzID0ge30K ICAgICAgICAgcmVzdWx0cy5zZXRkZWZhdWx0KHNlbGYudGVzdF9uYW1lKCksIHsndW5pdCc6ICdt cycsICd2YWx1ZXMnOiBbXX0pCiAKICAgICAgICAgZm9yIGkgaW4gcmFuZ2UoMCwgMjApOgotICAg ICAgICAgICAgb3V0cHV0ID0gc2VsZi5ydW5fc2luZ2xlKGRyaXZlciwgc2VsZi5wYXRoX29yX3Vy bCgpLCB0aW1lX291dF9tcykKKyAgICAgICAgICAgIG91dHB1dCA9IHNlbGYucnVuX3NpbmdsZShk cml2ZXIsIHNlbGYudGVzdF9wYXRoKCksIHRpbWVfb3V0X21zKQogICAgICAgICAgICAgaWYgbm90 IG91dHB1dCBvciBzZWxmLnJ1bl9mYWlsZWQob3V0cHV0KToKICAgICAgICAgICAgICAgICByZXR1 cm4gTm9uZQogICAgICAgICAgICAgaWYgaSA9PSAwOgpAQCAtMzI1LDggKzMzMiw4IEBACiAKIAog Y2xhc3MgUmVwbGF5UGVyZlRlc3QoUGFnZUxvYWRpbmdQZXJmVGVzdCk6Ci0gICAgZGVmIF9faW5p dF9fKHNlbGYsIHBvcnQsIHRlc3RfbmFtZSwgcGF0aF9vcl91cmwpOgotICAgICAgICBzdXBlcihS ZXBsYXlQZXJmVGVzdCwgc2VsZikuX19pbml0X18ocG9ydCwgdGVzdF9uYW1lLCBwYXRoX29yX3Vy bCkKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgdGVzdF9uYW1lLCB0ZXN0X3BhdGgpOgor ICAgICAgICBzdXBlcihSZXBsYXlQZXJmVGVzdCwgc2VsZikuX19pbml0X18ocG9ydCwgdGVzdF9u YW1lLCB0ZXN0X3BhdGgpCiAKICAgICBkZWYgX3N0YXJ0X3JlcGxheV9zZXJ2ZXIoc2VsZiwgYXJj aGl2ZSwgcmVjb3JkKToKICAgICAgICAgdHJ5OgpAQCAtMzM5LDExICszNDYsMTEgQEAKIAogICAg IGRlZiBwcmVwYXJlKHNlbGYsIHRpbWVfb3V0X21zKToKICAgICAgICAgZmlsZXN5c3RlbSA9IHNl bGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtCi0gICAgICAgIHBhdGhfd2l0aG91dF9leHQgPSBmaWxl c3lzdGVtLnNwbGl0ZXh0KHNlbGYucGF0aF9vcl91cmwoKSlbMF0KKyAgICAgICAgcGF0aF93aXRo b3V0X2V4dCA9IGZpbGVzeXN0ZW0uc3BsaXRleHQoc2VsZi50ZXN0X3BhdGgoKSlbMF0KIAogICAg ICAgICBzZWxmLl9hcmNoaXZlX3BhdGggPSBmaWxlc3lzdGVtLmpvaW4ocGF0aF93aXRob3V0X2V4 dCArICcud3ByJykKICAgICAgICAgc2VsZi5fZXhwZWN0ZWRfaW1hZ2VfcGF0aCA9IGZpbGVzeXN0 ZW0uam9pbihwYXRoX3dpdGhvdXRfZXh0ICsgJy1leHBlY3RlZC5wbmcnKQotICAgICAgICBzZWxm Ll91cmwgPSBmaWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHNlbGYucGF0aF9vcl91cmwoKSkuc3Bs aXQoJ1xuJylbMF0KKyAgICAgICAgc2VsZi5fdXJsID0gZmlsZXN5c3RlbS5yZWFkX3RleHRfZmls ZShzZWxmLnRlc3RfcGF0aCgpKS5zcGxpdCgnXG4nKVswXQogCiAgICAgICAgIGlmIGZpbGVzeXN0 ZW0uaXNmaWxlKHNlbGYuX2FyY2hpdmVfcGF0aCkgYW5kIGZpbGVzeXN0ZW0uaXNmaWxlKHNlbGYu X2V4cGVjdGVkX2ltYWdlX3BhdGgpOgogICAgICAgICAgICAgX2xvZy5pbmZvKCJSZXBsYXkgcmVh ZHkgZm9yICVzIiAlIHNlbGYuX2FyY2hpdmVfcGF0aCkKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNzk4NykKKysrIFRvb2xz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDEyLTEyLTE3ICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIENvbnNpZGVyIHJlbW92 aW5nIC0tcGF1c2UtYmVmb3JlLXRlc3Rpbmcgb3B0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgLS1wYXVzZS1iZWZvcmUtdGVzdGluZyBv cHRpb24uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3Bl cmZ0ZXN0LnB5OgorICAgICAgICAoUGVyZlRlc3QuX19pbml0X18pOgorICAgICAgICAoUGVyZlRl c3QudGVzdF9wYXRoKTogUmVuYW1lZCBmcm9tIHBhdGhfb3JfdXJsLgorICAgICAgICAoUGVyZlRl c3QucnVuKToKKyAgICAgICAgKFBlcmZUZXN0KTogUmVtb3ZlZCAiZHJpdmVyIiBhcmd1bWVudC4K KyAgICAgICAgKFBlcmZUZXN0Ll9ydW5fd2l0aF9kcml2ZXIpOgorICAgICAgICAoUGVyZlRlc3Qu cnVuX3NpbmdsZSk6CisgICAgICAgIChDaHJvbWl1bVN0eWxlUGVyZlRlc3QuX19pbml0X18pOgor ICAgICAgICAoUGFnZUxvYWRpbmdQZXJmVGVzdC5fX2luaXRfXyk6CisgICAgICAgIChQYWdlTG9h ZGluZ1BlcmZUZXN0LnJ1bl9zaW5nbGUpOgorICAgICAgICAoUGFnZUxvYWRpbmdQZXJmVGVzdC5f cnVuX3dpdGhfZHJpdmVyKTogUmVuYW1lZCBmcm9tIHJ1biBzbyB0aGF0IFBlcmZUZXN0LnJ1biBj YW4gY3JlYXRlIGEgZHJpdmVyIGZvciB1cy4KKyAgICAgICAgKFJlcGxheVBlcmZUZXN0Ll9faW5p dF9fKToKKyAgICAgICAgKFJlcGxheVBlcmZUZXN0LnByZXBhcmUpOgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RfdW5pdHRlc3QucHk6CisgICAg ICAgIChUZXN0UGFnZUxvYWRpbmdQZXJmVGVzdC50ZXN0X3J1bik6CisgICAgICAgIChUZXN0UGFn ZUxvYWRpbmdQZXJmVGVzdC50ZXN0X3J1bl93aXRoX21lbW9yeV9vdXRwdXQpOgorICAgICAgICAo VGVzdFBhZ2VMb2FkaW5nUGVyZlRlc3QudGVzdF9ydW5fd2l0aF9iYWRfb3V0cHV0KToKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5w eToKKyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5fcGFyc2VfYXJncyk6CisgICAgICAgIChQZXJm VGVzdHNSdW5uZXIuX3J1bl90ZXN0c19zZXQpOiBSZW1vdmVkIHRoZSBjb2RlIHRvIGNyZWF0ZSBh IGRyaXZlciBhbmQgcGF1c2UgYmVmb3JlIHJ1bm5pbmcgdGhlIHRlc3QuCisgICAgICAgIChQZXJm VGVzdHNSdW5uZXIuX3J1bl9zaW5nbGVfdGVzdCk6IFJlbW92ZWQgImRyaXZlciIgYXJndW1lbnQu CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNy dW5uZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChydW5fdGVzdCk6CisgICAgICAgICh0ZXN0X3J1 bl90ZXN0X3BhdXNlX2JlZm9yZV90ZXN0aW5nKTogUmVtb3ZlZC4KKwogMjAxMi0xMi0xNyAgSnVs aWVuIENoYWZmcmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmll d2VkIHVuaXQgdGVzdCBza2lwcGluZy4K 179883 2012-12-17 23:10:06 -0800 2012-12-18 10:56:48 -0800 Also remove Driver.start fix105248b text/plain 14497 rniwa SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDEzNzk4NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDM5IEBACisyMDEyLTEyLTE3ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgor CisgICAgICAgIENvbnNpZGVyIHJlbW92aW5nIC0tcGF1c2UtYmVmb3JlLXRlc3Rpbmcgb3B0aW9u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUyNDgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUg LS1wYXVzZS1iZWZvcmUtdGVzdGluZyBvcHRpb24uCisKKyAgICAgICAgKiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weToKKyAgICAgICAgKERyaXZlclBy b3h5LnN0YXJ0KTogUmVtb3ZlZC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1h bmNlX3Rlc3RzL3BlcmZ0ZXN0LnB5OgorICAgICAgICAoUGVyZlRlc3QuX19pbml0X18pOgorICAg ICAgICAoUGVyZlRlc3QudGVzdF9wYXRoKTogUmVuYW1lZCBmcm9tIHBhdGhfb3JfdXJsLgorICAg ICAgICAoUGVyZlRlc3QucnVuKToKKyAgICAgICAgKFBlcmZUZXN0KTogUmVtb3ZlZCAiZHJpdmVy IiBhcmd1bWVudC4KKyAgICAgICAgKFBlcmZUZXN0Ll9ydW5fd2l0aF9kcml2ZXIpOgorICAgICAg ICAoUGVyZlRlc3QucnVuX3NpbmdsZSk6CisgICAgICAgIChDaHJvbWl1bVN0eWxlUGVyZlRlc3Qu X19pbml0X18pOgorICAgICAgICAoUGFnZUxvYWRpbmdQZXJmVGVzdC5fX2luaXRfXyk6CisgICAg ICAgIChQYWdlTG9hZGluZ1BlcmZUZXN0LnJ1bl9zaW5nbGUpOgorICAgICAgICAoUGFnZUxvYWRp bmdQZXJmVGVzdC5fcnVuX3dpdGhfZHJpdmVyKTogUmVuYW1lZCBmcm9tIHJ1biBzbyB0aGF0IFBl cmZUZXN0LnJ1biBjYW4gY3JlYXRlIGEgZHJpdmVyIGZvciB1cy4KKyAgICAgICAgKFJlcGxheVBl cmZUZXN0Ll9faW5pdF9fKToKKyAgICAgICAgKFJlcGxheVBlcmZUZXN0LnByZXBhcmUpOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RfdW5pdHRl c3QucHk6CisgICAgICAgIChUZXN0UGFnZUxvYWRpbmdQZXJmVGVzdC50ZXN0X3J1bik6CisgICAg ICAgIChUZXN0UGFnZUxvYWRpbmdQZXJmVGVzdC50ZXN0X3J1bl93aXRoX21lbW9yeV9vdXRwdXQp OgorICAgICAgICAoVGVzdFBhZ2VMb2FkaW5nUGVyZlRlc3QudGVzdF9ydW5fd2l0aF9iYWRfb3V0 cHV0KToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0c3J1bm5lci5weToKKyAgICAgICAgKFBlcmZUZXN0c1J1bm5lci5fcGFyc2VfYXJncyk6Cisg ICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX3J1bl90ZXN0c19zZXQpOiBSZW1vdmVkIHRoZSBjb2Rl IHRvIGNyZWF0ZSBhIGRyaXZlciBhbmQgcGF1c2UgYmVmb3JlIHJ1bm5pbmcgdGhlIHRlc3QuCisg ICAgICAgIChQZXJmVGVzdHNSdW5uZXIuX3J1bl9zaW5nbGVfdGVzdCk6IFJlbW92ZWQgImRyaXZl ciIgYXJndW1lbnQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0 cy9wZXJmdGVzdHNydW5uZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChydW5fdGVzdCk6CisgICAg ICAgICh0ZXN0X3J1bl90ZXN0X3BhdXNlX2JlZm9yZV90ZXN0aW5nKTogUmVtb3ZlZC4KKwogMjAx Mi0xMi0xNyAgSnVsaWVuIENoYWZmcmFpeCAgPGpjaGFmZnJhaXhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBVbnJldmlld2VkIHVuaXQgdGVzdCBza2lwcGluZy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyLnB5CShyZXZpc2lvbiAx Mzc5NzYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZl ci5weQkod29ya2luZyBjb3B5KQpAQCAtNTQxLDE2ICs1NDEsNiBAQAogCiAgICAgICAgIHJldHVy biBzZWxmLl9ydW5uaW5nX2RyaXZlcnNbY21kX2xpbmVfa2V5XS5ydW5fdGVzdChkcml2ZXJfaW5w dXQsIHN0b3Bfd2hlbl9kb25lKQogCi0gICAgZGVmIHN0YXJ0KHNlbGYpOgotICAgICAgICAjIEZJ WE1FOiBDYWxsZXJzIHNob3VsZG4ndCBub3JtYWxseSBjYWxsIHRoaXMsIHNpbmNlIHRoaXMgcm91 dGluZQotICAgICAgICAjIG1heSBub3QgYmUgc3BlY2lmeWluZyB0aGUgY29ycmVjdCBjb21iaW5h dGlvbiBvZiBwaXhlbCB0ZXN0IGFuZAotICAgICAgICAjIHBlcl90ZXN0IGFyZ3MuCi0gICAgICAg ICMKLSAgICAgICAgIyBUaGUgb25seSByZWFzb24gd2UgaGF2ZSB0aGlzIHJvdXRpbmUgYXQgYWxs IGlzIHNvIHRoZSBwZXJmdGVzdHJ1bm5lcgotICAgICAgICAjIGNhbiBwYXVzZSBiZWZvcmUgcnVu bmluZyBhIHRlc3Q7IGl0IG1pZ2h0IGJlIGJldHRlciB0byBwdXNoIHRoYXQKLSAgICAgICAgIyBp bnRvIHJ1bl90ZXN0KCkgZGlyZWN0bHkuCi0gICAgICAgIHNlbGYuX2RyaXZlci5zdGFydChzZWxm Ll9wb3J0LmdldF9vcHRpb24oJ3BpeGVsX3Rlc3RzJyksIFtdKQotCiAgICAgZGVmIGhhc19jcmFz aGVkKHNlbGYpOgogICAgICAgICByZXR1cm4gYW55KGRyaXZlci5oYXNfY3Jhc2hlZCgpIGZvciBk cml2ZXIgaW4gc2VsZi5fcnVubmluZ19kcml2ZXJzLnZhbHVlcygpKQogCkluZGV4OiBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVz dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rl c3RzL3BlcmZ0ZXN0c3J1bm5lcl91bml0dGVzdC5weQkocmV2aXNpb24gMTM3OTc2KQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90ZXN0cy9wZXJmdGVzdHNydW5uZXJfdW5p dHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2Miw4ICsxNjIsNyBAQAogCiAgICAgZGVmIHJ1 bl90ZXN0KHNlbGYsIHRlc3RfbmFtZSk6CiAgICAgICAgIHJ1bm5lciwgcG9ydCA9IHNlbGYuY3Jl YXRlX3J1bm5lcigpCi0gICAgICAgIGRyaXZlciA9IE1haW5UZXN0LlRlc3REcml2ZXIoKQotICAg ICAgICByZXR1cm4gcnVubmVyLl9ydW5fc2luZ2xlX3Rlc3QoQ2hyb21pdW1TdHlsZVBlcmZUZXN0 KHBvcnQsIHRlc3RfbmFtZSwgcnVubmVyLl9ob3N0LmZpbGVzeXN0ZW0uam9pbignc29tZS1kaXIn LCB0ZXN0X25hbWUpKSwgZHJpdmVyKQorICAgICAgICByZXR1cm4gcnVubmVyLl9ydW5fc2luZ2xl X3Rlc3QoQ2hyb21pdW1TdHlsZVBlcmZUZXN0KHBvcnQsIHRlc3RfbmFtZSwgcnVubmVyLl9ob3N0 LmZpbGVzeXN0ZW0uam9pbignc29tZS1kaXInLCB0ZXN0X25hbWUpKSkKIAogICAgIGRlZiB0ZXN0 X3J1bl9wYXNzaW5nX3Rlc3Qoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLnJ1 bl90ZXN0KCdwYXNzLmh0bWwnKSkKQEAgLTIyNCwyNiArMjIzLDYgQEAKIAogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKFRlc3REcml2ZXJXaXRoU3RvcENvdW50LnN0b3BfY291bnQsIDYpCiAKLSAg ICBkZWYgdGVzdF9ydW5fdGVzdF9wYXVzZV9iZWZvcmVfdGVzdGluZyhzZWxmKToKLSAgICAgICAg Y2xhc3MgVGVzdERyaXZlcldpdGhTdGFydENvdW50KE1haW5UZXN0LlRlc3REcml2ZXIpOgotICAg ICAgICAgICAgc3RhcnRfY291bnQgPSAwCi0KLSAgICAgICAgICAgIGRlZiBzdGFydChzZWxmKToK LSAgICAgICAgICAgICAgICBUZXN0RHJpdmVyV2l0aFN0YXJ0Q291bnQuc3RhcnRfY291bnQgKz0g MQotCi0gICAgICAgIHJ1bm5lciwgcG9ydCA9IHNlbGYuY3JlYXRlX3J1bm5lcihhcmdzPVsiLS1w YXVzZS1iZWZvcmUtdGVzdGluZyJdLCBkcml2ZXJfY2xhc3M9VGVzdERyaXZlcldpdGhTdGFydENv dW50KQotICAgICAgICB0ZXN0cyA9IHNlbGYuX3Rlc3RzX2Zvcl9ydW5uZXIocnVubmVyLCBbJ2lu c3BlY3Rvci9wYXNzLmh0bWwnXSkKLQotICAgICAgICBvdXRwdXQgPSBPdXRwdXRDYXB0dXJlKCkK LSAgICAgICAgb3V0cHV0LmNhcHR1cmVfb3V0cHV0KCkKLSAgICAgICAgdHJ5OgotICAgICAgICAg ICAgdW5leHBlY3RlZF9yZXN1bHRfY291bnQgPSBydW5uZXIuX3J1bl90ZXN0c19zZXQodGVzdHMs IHBvcnQpCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFRlc3REcml2ZXJXaXRoU3RhcnRD b3VudC5zdGFydF9jb3VudCwgMSkKLSAgICAgICAgZmluYWxseToKLSAgICAgICAgICAgIHN0ZG91 dCwgc3RkZXJyLCBsb2cgPSBvdXRwdXQucmVzdG9yZV9vdXRwdXQoKQotICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHNlbGYubm9ybWFsaXplRmluaXNoZWRUaW1lKGxvZyksCi0gICAgICAgICAgICAi UmVhZHkgdG8gcnVuIHRlc3Q/XG5SdW5uaW5nIGluc3BlY3Rvci9wYXNzLmh0bWwgKDEgb2YgMSlc blJFU1VMVCBncm91cF9uYW1lOiB0ZXN0X25hbWU9IDQyIG1zXG5GaW5pc2hlZDogMC4xIHNcblxu IikKLQogICAgIGRlZiB0ZXN0X3J1bl90ZXN0X3NldF9mb3JfcGFyc2VyX3Rlc3RzKHNlbGYpOgog ICAgICAgICBydW5uZXIsIHBvcnQgPSBzZWxmLmNyZWF0ZV9ydW5uZXIoKQogICAgICAgICB0ZXN0 cyA9IHNlbGYuX3Rlc3RzX2Zvcl9ydW5uZXIocnVubmVyLCBbJ0JpbmRpbmdzL2V2ZW50LXRhcmdl dC13cmFwcGVyLmh0bWwnLCAnUGFyc2VyL3NvbWUtcGFyc2VyLmh0bWwnXSkKSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3RzcnVubmVyLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVy ZnRlc3RzcnVubmVyLnB5CShyZXZpc2lvbiAxMzc5NzYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0c3J1bm5lci5weQkod29ya2luZyBjb3B5KQpA QCAtOTgsOCArOTgsNiBAQAogICAgICAgICAgICAgICAgIGhlbHA9IlBhdGggdG8gdGhlIGRpcmVj dG9yeSB1bmRlciB3aGljaCBidWlsZCBmaWxlcyBhcmUga2VwdCAoc2hvdWxkIG5vdCBpbmNsdWRl IGNvbmZpZ3VyYXRpb24pIiksCiAgICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29wdGlvbigiLS10 aW1lLW91dC1tcyIsIGRlZmF1bHQ9NjAwICogMTAwMCwKICAgICAgICAgICAgICAgICBoZWxwPSJT ZXQgdGhlIHRpbWVvdXQgZm9yIGVhY2ggdGVzdCIpLAotICAgICAgICAgICAgb3B0cGFyc2UubWFr ZV9vcHRpb24oIi0tcGF1c2UtYmVmb3JlLXRlc3RpbmciLCBkZXN0PSJwYXVzZV9iZWZvcmVfdGVz dGluZyIsIGFjdGlvbj0ic3RvcmVfdHJ1ZSIsIGRlZmF1bHQ9RmFsc2UsCi0gICAgICAgICAgICAg ICAgaGVscD0iUGF1c2UgYmVmb3JlIHJ1bm5pbmcgdGhlIHRlc3RzIHRvIGxldCB1c2VyIGF0dGFj aCBhIHBlcmZvcm1hbmNlIG1vbml0b3IuIiksCiAgICAgICAgICAgICBvcHRwYXJzZS5tYWtlX29w dGlvbigiLS1uby1yZXN1bHRzIiwgYWN0aW9uPSJzdG9yZV9mYWxzZSIsIGRlc3Q9ImdlbmVyYXRl X3Jlc3VsdHMiLCBkZWZhdWx0PVRydWUsCiAgICAgICAgICAgICAgICAgaGVscD0iRG8gbm8gZ2Vu ZXJhdGUgcmVzdWx0cyBKU09OIGFuZCByZXN1bHRzIHBhZ2UuIiksCiAgICAgICAgICAgICBvcHRw YXJzZS5tYWtlX29wdGlvbigiLS1vdXRwdXQtanNvbi1wYXRoIiwgYWN0aW9uPSdjYWxsYmFjaycs IGNhbGxiYWNrPV9leHBhbmRfcGF0aCwgdHlwZT0ic3RyIiwKQEAgLTMxNiwzMCArMzE0LDE5IEBA CiAgICAgICAgIGRyaXZlciA9IE5vbmUKIAogICAgICAgICBmb3IgdGVzdCBpbiB0ZXN0czoKLSAg ICAgICAgICAgIGRyaXZlciA9IHBvcnQuY3JlYXRlX2RyaXZlcih3b3JrZXJfbnVtYmVyPTAsIG5v X3RpbWVvdXQ9VHJ1ZSkKLQotICAgICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5wYXVzZV9iZWZv cmVfdGVzdGluZzoKLSAgICAgICAgICAgICAgICBkcml2ZXIuc3RhcnQoKQotICAgICAgICAgICAg ICAgIGlmIG5vdCBzZWxmLl9ob3N0LnVzZXIuY29uZmlybSgiUmVhZHkgdG8gcnVuIHRlc3Q/Iik6 Ci0gICAgICAgICAgICAgICAgICAgIGRyaXZlci5zdG9wKCkKLSAgICAgICAgICAgICAgICAgICAg cmV0dXJuIHVuZXhwZWN0ZWQKLQogICAgICAgICAgICAgX2xvZy5pbmZvKCdSdW5uaW5nICVzICgl ZCBvZiAlZCknICUgKHRlc3QudGVzdF9uYW1lKCksIGV4cGVjdGVkICsgdW5leHBlY3RlZCArIDEs IGxlbih0ZXN0cykpKQotICAgICAgICAgICAgaWYgc2VsZi5fcnVuX3NpbmdsZV90ZXN0KHRlc3Qs IGRyaXZlcik6CisgICAgICAgICAgICBpZiBzZWxmLl9ydW5fc2luZ2xlX3Rlc3QodGVzdCk6CiAg ICAgICAgICAgICAgICAgZXhwZWN0ZWQgPSBleHBlY3RlZCArIDEKICAgICAgICAgICAgIGVsc2U6 CiAgICAgICAgICAgICAgICAgdW5leHBlY3RlZCA9IHVuZXhwZWN0ZWQgKyAxCiAKICAgICAgICAg ICAgIF9sb2cuaW5mbygnJykKIAotICAgICAgICAgICAgZHJpdmVyLnN0b3AoKQotCiAgICAgICAg IHJldHVybiB1bmV4cGVjdGVkCiAKLSAgICBkZWYgX3J1bl9zaW5nbGVfdGVzdChzZWxmLCB0ZXN0 LCBkcml2ZXIpOgorICAgIGRlZiBfcnVuX3NpbmdsZV90ZXN0KHNlbGYsIHRlc3QpOgogICAgICAg ICBzdGFydF90aW1lID0gdGltZS50aW1lKCkKLQotICAgICAgICBuZXdfcmVzdWx0cyA9IHRlc3Qu cnVuKGRyaXZlciwgc2VsZi5fb3B0aW9ucy50aW1lX291dF9tcykKKyAgICAgICAgbmV3X3Jlc3Vs dHMgPSB0ZXN0LnJ1bihzZWxmLl9vcHRpb25zLnRpbWVfb3V0X21zKQogICAgICAgICBpZiBuZXdf cmVzdWx0czoKICAgICAgICAgICAgIHNlbGYuX3Jlc3VsdHMudXBkYXRlKG5ld19yZXN1bHRzKQog ICAgICAgICBlbHNlOgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wZXJmb3JtYW5jZV90 ZXN0cy9wZXJmdGVzdF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dl YmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0ZXN0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAx Mzc5NzYpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1hbmNlX3Rlc3RzL3BlcmZ0 ZXN0X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNjksNyArMTY5LDcgQEAKICAgICAg ICAgb3V0cHV0X2NhcHR1cmUgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgb3V0cHV0X2NhcHR1 cmUuY2FwdHVyZV9vdXRwdXQoKQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHRlc3QucnVuKGRyaXZlciwgTm9uZSksCisgICAgICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHRlc3QuX3J1bl93aXRoX2RyaXZlcihkcml2ZXIsIE5vbmUpLAogICAgICAgICAgICAgICAg IHsnc29tZS10ZXN0JzogeydtYXgnOiAyMDAwMCwgJ2F2Zyc6IDExMDAwLjAsICdtZWRpYW4nOiAx MTAwMCwgJ3N0ZGV2JzogNTYyNy4zMTQzMzg3MTEzNzgsICdtaW4nOiAyMDAwLCAndW5pdCc6ICdt cycsCiAgICAgICAgICAgICAgICAgICAgICd2YWx1ZXMnOiBbaSAqIDEwMDAgZm9yIGkgaW4gcmFu Z2UoMiwgMjEpXX19KQogICAgICAgICBmaW5hbGx5OgpAQCAtMTg3LDcgKzE4Nyw3IEBACiAgICAg ICAgIG91dHB1dF9jYXB0dXJlID0gT3V0cHV0Q2FwdHVyZSgpCiAgICAgICAgIG91dHB1dF9jYXB0 dXJlLmNhcHR1cmVfb3V0cHV0KCkKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbCh0ZXN0LnJ1bihkcml2ZXIsIE5vbmUpLAorICAgICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbCh0ZXN0Ll9ydW5fd2l0aF9kcml2ZXIoZHJpdmVyLCBOb25lKSwKICAgICAgICAgICAgICAg ICB7J3NvbWUtdGVzdCc6IHsnbWF4JzogMjAwMDAsICdhdmcnOiAxMTAwMC4wLCAnbWVkaWFuJzog MTEwMDAsICdzdGRldic6IDU2MjcuMzE0MzM4NzExMzc4LCAnbWluJzogMjAwMCwgJ3VuaXQnOiAn bXMnLAogICAgICAgICAgICAgICAgICAgICAndmFsdWVzJzogW2kgKiAxMDAwIGZvciBpIGluIHJh bmdlKDIsIDIxKV19LAogICAgICAgICAgICAgICAgICAnc29tZS10ZXN0Ok1hbGxvYyc6IHsnbWF4 JzogMTAsICdhdmcnOiAxMC4wLCAnbWVkaWFuJzogMTAsICdtaW4nOiAxMCwgJ3N0ZGV2JzogMC4w LCAndW5pdCc6ICdieXRlcycsCkBAIC0yMDksNyArMjA5LDcgQEAKICAgICAgICAgICAgIHBvcnQg PSBNb2NrUG9ydCgpCiAgICAgICAgICAgICB0ZXN0ID0gUGFnZUxvYWRpbmdQZXJmVGVzdChwb3J0 LCAnc29tZS10ZXN0JywgJy9wYXRoL3NvbWUtZGlyL3NvbWUtdGVzdCcpCiAgICAgICAgICAgICBk cml2ZXIgPSBUZXN0UGFnZUxvYWRpbmdQZXJmVGVzdC5Nb2NrRHJpdmVyKFsxLCAyLCAzLCA0LCA1 LCA2LCA3LCAnc29tZSBlcnJvcicsIDksIDEwLCAxMSwgMTIsIDEzLCAxNCwgMTUsIDE2LCAxNywg MTgsIDE5LCAyMF0sIHRlc3QpCi0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRlc3QucnVu KGRyaXZlciwgTm9uZSksIE5vbmUpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHRlc3Qu X3J1bl93aXRoX2RyaXZlcihkcml2ZXIsIE5vbmUpLCBOb25lKQogICAgICAgICBmaW5hbGx5Ogog ICAgICAgICAgICAgYWN0dWFsX3N0ZG91dCwgYWN0dWFsX3N0ZGVyciwgYWN0dWFsX2xvZ3MgPSBv dXRwdXRfY2FwdHVyZS5yZXN0b3JlX291dHB1dCgpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo YWN0dWFsX3N0ZG91dCwgJycpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BlcmZvcm1h bmNlX3Rlc3RzL3BlcmZ0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3QucHkJKHJldmlzaW9uIDEzNzk3NikKKysrIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcGVyZm9ybWFuY2VfdGVzdHMvcGVyZnRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTUzLDI5ICs1MywzNiBAQAogCiAKIGNsYXNzIFBlcmZUZXN0KG9iamVjdCk6 Ci0gICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIHRlc3RfbmFtZSwgcGF0aF9vcl91cmwpOgor ICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCB0ZXN0X25hbWUsIHRlc3RfcGF0aCk6CiAgICAg ICAgIHNlbGYuX3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYuX3Rlc3RfbmFtZSA9IHRlc3RfbmFt ZQotICAgICAgICBzZWxmLl9wYXRoX29yX3VybCA9IHBhdGhfb3JfdXJsCisgICAgICAgIHNlbGYu X3Rlc3RfcGF0aCA9IHRlc3RfcGF0aAogCiAgICAgZGVmIHRlc3RfbmFtZShzZWxmKToKICAgICAg ICAgcmV0dXJuIHNlbGYuX3Rlc3RfbmFtZQogCi0gICAgZGVmIHBhdGhfb3JfdXJsKHNlbGYpOgot ICAgICAgICByZXR1cm4gc2VsZi5fcGF0aF9vcl91cmwKKyAgICBkZWYgdGVzdF9wYXRoKHNlbGYp OgorICAgICAgICByZXR1cm4gc2VsZi5fdGVzdF9wYXRoCiAKICAgICBkZWYgcHJlcGFyZShzZWxm LCB0aW1lX291dF9tcyk6CiAgICAgICAgIHJldHVybiBUcnVlCiAKLSAgICBkZWYgcnVuKHNlbGYs IGRyaXZlciwgdGltZV9vdXRfbXMpOgotICAgICAgICBvdXRwdXQgPSBzZWxmLnJ1bl9zaW5nbGUo ZHJpdmVyLCBzZWxmLnBhdGhfb3JfdXJsKCksIHRpbWVfb3V0X21zKQorICAgIGRlZiBydW4oc2Vs ZiwgdGltZV9vdXRfbXMpOgorICAgICAgICBkcml2ZXIgPSBzZWxmLl9wb3J0LmNyZWF0ZV9kcml2 ZXIod29ya2VyX251bWJlcj0wLCBub190aW1lb3V0PVRydWUpCisgICAgICAgIHRyeToKKyAgICAg ICAgICAgIHJldHVybiBzZWxmLl9ydW5fd2l0aF9kcml2ZXIoZHJpdmVyLCB0aW1lX291dF9tcykK KyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIGRyaXZlci5zdG9wKCkKKworICAgIGRlZiBf cnVuX3dpdGhfZHJpdmVyKHNlbGYsIGRyaXZlciwgdGltZV9vdXRfbXMpOgorICAgICAgICBvdXRw dXQgPSBzZWxmLnJ1bl9zaW5nbGUoZHJpdmVyLCBzZWxmLnRlc3RfcGF0aCgpLCB0aW1lX291dF9t cykKICAgICAgICAgc2VsZi5fZmlsdGVyX3N0ZGVycihvdXRwdXQpCiAgICAgICAgIGlmIHNlbGYu cnVuX2ZhaWxlZChvdXRwdXQpOgogICAgICAgICAgICAgcmV0dXJuIE5vbmUKICAgICAgICAgcmV0 dXJuIHNlbGYucGFyc2Vfb3V0cHV0KG91dHB1dCkKIAotICAgIGRlZiBydW5fc2luZ2xlKHNlbGYs IGRyaXZlciwgcGF0aF9vcl91cmwsIHRpbWVfb3V0X21zLCBzaG91bGRfcnVuX3BpeGVsX3Rlc3Q9 RmFsc2UpOgotICAgICAgICByZXR1cm4gZHJpdmVyLnJ1bl90ZXN0KERyaXZlcklucHV0KHBhdGhf b3JfdXJsLCB0aW1lX291dF9tcywgaW1hZ2VfaGFzaD1Ob25lLCBzaG91bGRfcnVuX3BpeGVsX3Rl c3Q9c2hvdWxkX3J1bl9waXhlbF90ZXN0KSwgc3RvcF93aGVuX2RvbmU9RmFsc2UpCisgICAgZGVm IHJ1bl9zaW5nbGUoc2VsZiwgZHJpdmVyLCB0ZXN0X3BhdGgsIHRpbWVfb3V0X21zLCBzaG91bGRf cnVuX3BpeGVsX3Rlc3Q9RmFsc2UpOgorICAgICAgICByZXR1cm4gZHJpdmVyLnJ1bl90ZXN0KERy aXZlcklucHV0KHRlc3RfcGF0aCwgdGltZV9vdXRfbXMsIGltYWdlX2hhc2g9Tm9uZSwgc2hvdWxk X3J1bl9waXhlbF90ZXN0PXNob3VsZF9ydW5fcGl4ZWxfdGVzdCksIHN0b3Bfd2hlbl9kb25lPUZh bHNlKQogCiAgICAgZGVmIHJ1bl9mYWlsZWQoc2VsZiwgb3V0cHV0KToKICAgICAgICAgaWYgb3V0 cHV0LnRleHQgPT0gTm9uZSBvciBvdXRwdXQuZXJyb3I6CkBAIC0yMDgsOCArMjE1LDggQEAKIGNs YXNzIENocm9taXVtU3R5bGVQZXJmVGVzdChQZXJmVGVzdCk6CiAgICAgX2Nocm9taXVtX3N0eWxl X3Jlc3VsdF9yZWdleCA9IHJlLmNvbXBpbGUocideUkVTVUxUXHMrKD9QPG5hbWU+W149XSspXHMq PVxzKyg/UDx2YWx1ZT5cZCsoXC5cZCspPylccyooP1A8dW5pdD5cdyspJCcpCiAKLSAgICBkZWYg X19pbml0X18oc2VsZiwgcG9ydCwgdGVzdF9uYW1lLCBwYXRoX29yX3VybCk6Ci0gICAgICAgIHN1 cGVyKENocm9taXVtU3R5bGVQZXJmVGVzdCwgc2VsZikuX19pbml0X18ocG9ydCwgdGVzdF9uYW1l LCBwYXRoX29yX3VybCkKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcG9ydCwgdGVzdF9uYW1lLCB0 ZXN0X3BhdGgpOgorICAgICAgICBzdXBlcihDaHJvbWl1bVN0eWxlUGVyZlRlc3QsIHNlbGYpLl9f aW5pdF9fKHBvcnQsIHRlc3RfbmFtZSwgdGVzdF9wYXRoKQogCiAgICAgZGVmIHBhcnNlX291dHB1 dChzZWxmLCBvdXRwdXQpOgogICAgICAgICB0ZXN0X2ZhaWxlZCA9IEZhbHNlCkBAIC0yMjksMTQg KzIzNiwxNCBAQAogY2xhc3MgUGFnZUxvYWRpbmdQZXJmVGVzdChQZXJmVGVzdCk6CiAgICAgX0ZP UkNFX0dDX0ZJTEUgPSAncmVzb3VyY2VzL2ZvcmNlLWdjLmh0bWwnCiAKLSAgICBkZWYgX19pbml0 X18oc2VsZiwgcG9ydCwgdGVzdF9uYW1lLCBwYXRoX29yX3VybCk6Ci0gICAgICAgIHN1cGVyKFBh Z2VMb2FkaW5nUGVyZlRlc3QsIHNlbGYpLl9faW5pdF9fKHBvcnQsIHRlc3RfbmFtZSwgcGF0aF9v cl91cmwpCisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHBvcnQsIHRlc3RfbmFtZSwgdGVzdF9wYXRo KToKKyAgICAgICAgc3VwZXIoUGFnZUxvYWRpbmdQZXJmVGVzdCwgc2VsZikuX19pbml0X18ocG9y dCwgdGVzdF9uYW1lLCB0ZXN0X3BhdGgpCiAgICAgICAgIHNlbGYuZm9yY2VfZ2NfdGVzdCA9IHNl bGYuX3BvcnQuaG9zdC5maWxlc3lzdGVtLmpvaW4oc2VsZi5fcG9ydC5wZXJmX3Rlc3RzX2Rpcigp LCBzZWxmLl9GT1JDRV9HQ19GSUxFKQogCi0gICAgZGVmIHJ1bl9zaW5nbGUoc2VsZiwgZHJpdmVy LCBwYXRoX29yX3VybCwgdGltZV9vdXRfbXMsIHNob3VsZF9ydW5fcGl4ZWxfdGVzdD1GYWxzZSk6 CisgICAgZGVmIHJ1bl9zaW5nbGUoc2VsZiwgZHJpdmVyLCB0ZXN0X3BhdGgsIHRpbWVfb3V0X21z LCBzaG91bGRfcnVuX3BpeGVsX3Rlc3Q9RmFsc2UpOgogICAgICAgICAjIEZvcmNlIEdDIHRvIHBy ZXZlbnQgcGFnZWxvYWQgbm9pc2UuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTgyMDMKICAgICAgICAgc3VwZXIoUGFnZUxvYWRpbmdQZXJmVGVzdCwgc2VsZiku cnVuX3NpbmdsZShkcml2ZXIsIHNlbGYuZm9yY2VfZ2NfdGVzdCwgdGltZV9vdXRfbXMsIEZhbHNl KQotICAgICAgICByZXR1cm4gc3VwZXIoUGFnZUxvYWRpbmdQZXJmVGVzdCwgc2VsZikucnVuX3Np bmdsZShkcml2ZXIsIHBhdGhfb3JfdXJsLCB0aW1lX291dF9tcywgc2hvdWxkX3J1bl9waXhlbF90 ZXN0KQorICAgICAgICByZXR1cm4gc3VwZXIoUGFnZUxvYWRpbmdQZXJmVGVzdCwgc2VsZikucnVu X3NpbmdsZShkcml2ZXIsIHRlc3RfcGF0aCwgdGltZV9vdXRfbXMsIHNob3VsZF9ydW5fcGl4ZWxf dGVzdCkKIAogICAgIGRlZiBjYWxjdWxhdGVfc3RhdGlzdGljcyhzZWxmLCB2YWx1ZXMpOgogICAg ICAgICBzb3J0ZWRfdmFsdWVzID0gc29ydGVkKHZhbHVlcykKQEAgLTI1OCwxMiArMjY1LDEyIEBA CiAgICAgICAgICAgICAnc3RkZXYnOiBtYXRoLnNxcnQoc3F1YXJlU3VtIC8gKGxlbihzb3J0ZWRf dmFsdWVzKSAtIDEpKX0KICAgICAgICAgcmV0dXJuIHJlc3VsdAogCi0gICAgZGVmIHJ1bihzZWxm LCBkcml2ZXIsIHRpbWVfb3V0X21zKToKKyAgICBkZWYgX3J1bl93aXRoX2RyaXZlcihzZWxmLCBk cml2ZXIsIHRpbWVfb3V0X21zKToKICAgICAgICAgcmVzdWx0cyA9IHt9CiAgICAgICAgIHJlc3Vs dHMuc2V0ZGVmYXVsdChzZWxmLnRlc3RfbmFtZSgpLCB7J3VuaXQnOiAnbXMnLCAndmFsdWVzJzog W119KQogCiAgICAgICAgIGZvciBpIGluIHJhbmdlKDAsIDIwKToKLSAgICAgICAgICAgIG91dHB1 dCA9IHNlbGYucnVuX3NpbmdsZShkcml2ZXIsIHNlbGYucGF0aF9vcl91cmwoKSwgdGltZV9vdXRf bXMpCisgICAgICAgICAgICBvdXRwdXQgPSBzZWxmLnJ1bl9zaW5nbGUoZHJpdmVyLCBzZWxmLnRl c3RfcGF0aCgpLCB0aW1lX291dF9tcykKICAgICAgICAgICAgIGlmIG5vdCBvdXRwdXQgb3Igc2Vs Zi5ydW5fZmFpbGVkKG91dHB1dCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIE5vbmUKICAgICAg ICAgICAgIGlmIGkgPT0gMDoKQEAgLTMyNSw4ICszMzIsOCBAQAogCiAKIGNsYXNzIFJlcGxheVBl cmZUZXN0KFBhZ2VMb2FkaW5nUGVyZlRlc3QpOgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0 LCB0ZXN0X25hbWUsIHBhdGhfb3JfdXJsKToKLSAgICAgICAgc3VwZXIoUmVwbGF5UGVyZlRlc3Qs IHNlbGYpLl9faW5pdF9fKHBvcnQsIHRlc3RfbmFtZSwgcGF0aF9vcl91cmwpCisgICAgZGVmIF9f aW5pdF9fKHNlbGYsIHBvcnQsIHRlc3RfbmFtZSwgdGVzdF9wYXRoKToKKyAgICAgICAgc3VwZXIo UmVwbGF5UGVyZlRlc3QsIHNlbGYpLl9faW5pdF9fKHBvcnQsIHRlc3RfbmFtZSwgdGVzdF9wYXRo KQogCiAgICAgZGVmIF9zdGFydF9yZXBsYXlfc2VydmVyKHNlbGYsIGFyY2hpdmUsIHJlY29yZCk6 CiAgICAgICAgIHRyeToKQEAgLTMzOSwxMSArMzQ2LDExIEBACiAKICAgICBkZWYgcHJlcGFyZShz ZWxmLCB0aW1lX291dF9tcyk6CiAgICAgICAgIGZpbGVzeXN0ZW0gPSBzZWxmLl9wb3J0Lmhvc3Qu ZmlsZXN5c3RlbQotICAgICAgICBwYXRoX3dpdGhvdXRfZXh0ID0gZmlsZXN5c3RlbS5zcGxpdGV4 dChzZWxmLnBhdGhfb3JfdXJsKCkpWzBdCisgICAgICAgIHBhdGhfd2l0aG91dF9leHQgPSBmaWxl c3lzdGVtLnNwbGl0ZXh0KHNlbGYudGVzdF9wYXRoKCkpWzBdCiAKICAgICAgICAgc2VsZi5fYXJj aGl2ZV9wYXRoID0gZmlsZXN5c3RlbS5qb2luKHBhdGhfd2l0aG91dF9leHQgKyAnLndwcicpCiAg ICAgICAgIHNlbGYuX2V4cGVjdGVkX2ltYWdlX3BhdGggPSBmaWxlc3lzdGVtLmpvaW4ocGF0aF93 aXRob3V0X2V4dCArICctZXhwZWN0ZWQucG5nJykKLSAgICAgICAgc2VsZi5fdXJsID0gZmlsZXN5 c3RlbS5yZWFkX3RleHRfZmlsZShzZWxmLnBhdGhfb3JfdXJsKCkpLnNwbGl0KCdcbicpWzBdCisg ICAgICAgIHNlbGYuX3VybCA9IGZpbGVzeXN0ZW0ucmVhZF90ZXh0X2ZpbGUoc2VsZi50ZXN0X3Bh dGgoKSkuc3BsaXQoJ1xuJylbMF0KIAogICAgICAgICBpZiBmaWxlc3lzdGVtLmlzZmlsZShzZWxm Ll9hcmNoaXZlX3BhdGgpIGFuZCBmaWxlc3lzdGVtLmlzZmlsZShzZWxmLl9leHBlY3RlZF9pbWFn ZV9wYXRoKToKICAgICAgICAgICAgIF9sb2cuaW5mbygiUmVwbGF5IHJlYWR5IGZvciAlcyIgJSBz ZWxmLl9hcmNoaXZlX3BhdGgpCg==