50205 2010-11-29 20:19:03 -0800 [chromium] new-run-webkit-tests: add better messages, return code for --lint-test-files 2010-12-09 15:22:25 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ojan dpranke dpranke eric levin ojan tony oldest_to_newest 314836 0 ojan 2010-11-29 20:19:03 -0800 Sync to r72870 and run "new-run-webkit-tests --lint-test-files". It should give errors that there are 3 duplicate lines on mac. It doesn't give any errors, but if you actually run the tests, it does. This means the presubmit for test_expectations isn't working. 315394 1 dpranke 2010-11-30 16:38:47 -0800 When you say "it doesn't give any errors", what are you referring to? for me, it does print messages to stderr, but the return code is 0. check-webkit-style reports the error as well. Is that what you see/saw? 315479 2 75241 dpranke 2010-11-30 18:55:54 -0800 Created attachment 75241 Patch 315482 3 dpranke 2010-11-30 19:00:50 -0800 Per conversation w/ Ojan, it sounds like it was user error with new-run-webkit-tests and either user error with webkit-patch land-cowboy or a bug. For the former, he didn't specify --platform chromium-mac, so the command linted the platform/mac (webkit) version of the file, which was fine. Also, he ran land-cowboy, which skips the check-webkit-style presubmit check, which should have reported the error correctly (it does for me when I try to reproduce what he saw). That said, I'll use this bug as an excuse to clean up the --lint-test-files code and logging. The log output should be cleaner, we no longer use the 'print' statement, and the exception raising is a bit more straightforward. Also, I removed the 'suppress_errors' keyword param to the constructor, which appears to be unused (I don't remember why it was there in the first place). Also, in reviewing the patch you'll notice that platform/chromium was parsing the expectations files with is_lint_mode=True, and I've changed it to False. True was almost certainly the wrong value, and the new error propagation was causing things to fail in a way that the old code wouldn't (in the face of non-fatal errors). 316815 4 levin 2010-12-03 07:01:37 -0800 Sounds like the bug title no longer reflects what this bug is about. It would be best to fix it. 316931 5 dpranke 2010-12-03 11:41:01 -0800 good idea. done. 319238 6 dpranke 2010-12-08 20:29:29 -0800 hmm ... this seems to have slipped through the cracks. Can someone please review this? 319742 7 dpranke 2010-12-09 15:22:25 -0800 Committed r73654: <http://trac.webkit.org/changeset/73654> 75241 2010-11-30 18:55:54 -0800 2010-12-09 15:14:01 -0800 Patch bug-50205-20101130185552.patch text/plain 21292 dpranke ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3N2VhMmFmYjJmNDc0NWQ1ZDg4MTZjYzk4OTc1NmQyZGFlOTgwNTQ2Li45ZDNlMmRi ZGYzMGJhNWQyNGIyMTkwMzBkYmI5YjUxODA0YzEzN2RiIDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTAtMTEtMzAgIERpcmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBuZXctcnVuLXdl YmtpdC10ZXN0cyAtLWxpbnQtdGVzdC1maWxlcyBsb2cgc2xpZ2h0bHkgYmV0dGVyCisgICAgICAg IG1lc3NhZ2VzIGFuZCByZXR1cm4gLTEgaWYgbGludCBmYWlscy4gUmVtb3ZlIHRoZQorICAgICAg ICAnc3VwcHJlc3NfZXJyb3JzJyBrZXl3b3JkIHBhcmFtIHRvIHRoZSBUZXN0RXhwZWN0YXRpb25z RmlsZQorICAgICAgICBjbGFzcywgYW5kIGNsZWFuIHVwIGxvZ2dpbmcgYW5kIGV4Y2VwdGlvbiBy YWlzaW5nIGZvciBlcnJvcgorICAgICAgICBoYW5kbGluZy4gQWxzbyBhZGQgbW9yZSB1bml0IHRl c3RzIGFuZCBjbGVhbiB1cCB0aGUgdW5pdCB0ZXN0IGNvZGUgYSBiaXQuCisKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUwMjA1CisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5OgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRl c3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3Bh Y2thZ2UvdGVzdF9leHBlY3RhdGlvbnMucHkKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5weQor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW0ucHk6 CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy90ZXN0X2V4cGVjdGF0 aW9ucy5weToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3Rf ZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5OgorCiAyMDEwLTExLTI5ICBKb2hubnkgRGluZyAgPGpu ZEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZDogQWRkIG15c2VsZiB0byB0aGUg bGlzdCBvZiBDb21taXR0ZXJzLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2UvdGVzdF9leHBlY3RhdGlvbnMucHkgYi9X ZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90 ZXN0X2V4cGVjdGF0aW9ucy5weQppbmRleCA2Nzg3M2E4Y2MwYWIzMTc5YzdkZTM1ZDVjOTgxNmNl MzQwZDM0Y2I5Li43ZTFlNTNhY2RlOWM2YTRmNDk1NWQ3YmEzOTUwMTAwODQyYTk5ZDBlIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRf cGFja2FnZS90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2V4cGVjdGF0aW9ucy5weQpA QCAtMTkwLDYgKzE5MCwxOCBAQCBkZWYgc3RyaXBfY29tbWVudHMobGluZSk6CiAgICAgICAgIHJl dHVybiBsaW5lCiAKIAorY2xhc3MgUGFyc2VFcnJvcihFeGNlcHRpb24pOgorICAgIGRlZiBfX2lu aXRfXyhzZWxmLCBmYXRhbCwgZXJyb3JzKToKKyAgICAgICAgc2VsZi5mYXRhbCA9IGZhdGFsCisg ICAgICAgIHNlbGYuZXJyb3JzID0gZXJyb3JzCisKKyAgICBkZWYgX19zdHJfXyhzZWxmKToKKyAg ICAgICAgcmV0dXJuICdcbicuam9pbihtYXAoc3RyLCBzZWxmLmVycm9ycykpCisKKyAgICBkZWYg X19yZXByX18oc2VsZik6CisgICAgICAgIHJldHVybiAnUGFyc2VFcnJvcihmYXRhbD0lcywgZXJy b3JzPSVzKScgJSAoZmF0YWwsIGVycm9ycykKKworCiBjbGFzcyBNb2RpZmllcnNBbmRFeHBlY3Rh dGlvbnM6CiAgICAgIiIiQSBob2xkZXIgZm9yIG1vZGlmaWVycyBhbmQgZXhwZWN0YXRpb25zIG9u IGEgdGVzdCB0aGF0IHNlcmlhbGl6ZXMgdG8KICAgICBKU09OLiIiIgpAQCAtMjkzLDcgKzMwNSw3 IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNGaWxlOgogICAgICAgICAgICAgICAgICAgICAnZmxh a3knOiBGTEFLWX0KIAogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBwb3J0LCBleHBlY3RhdGlvbnMs IGZ1bGxfdGVzdF9saXN0LCB0ZXN0X3BsYXRmb3JtX25hbWUsCi0gICAgICAgIGlzX2RlYnVnX21v ZGUsIGlzX2xpbnRfbW9kZSwgc3VwcHJlc3NfZXJyb3JzPUZhbHNlLCBvdmVycmlkZXM9Tm9uZSk6 CisgICAgICAgIGlzX2RlYnVnX21vZGUsIGlzX2xpbnRfbW9kZSwgb3ZlcnJpZGVzPU5vbmUpOgog ICAgICAgICAiIiIKICAgICAgICAgZXhwZWN0YXRpb25zOiBDb250ZW50cyBvZiB0aGUgZXhwZWN0 YXRpb25zIGZpbGUKICAgICAgICAgZnVsbF90ZXN0X2xpc3Q6IFRoZSBsaXN0IG9mIGFsbCB0ZXN0 cyB0byBiZSBydW4gcGVuZGluZyBwcm9jZXNzaW5nIG9mCkBAIC0zMDMsNyArMzE1LDYgQEAgY2xh c3MgVGVzdEV4cGVjdGF0aW9uc0ZpbGU6CiAgICAgICAgICAgICBwb3J0LnRlc3RfcGxhdGZvcm1f bmFtZSgpIHdoZW4gaXNfbGludF9tb2RlIGlzIFRydWUuCiAgICAgICAgIGlzX2RlYnVnX21vZGU6 IFdoZXRoZXIgd2UgdGVzdGluZyBhIHRlc3Rfc2hlbGwgYnVpbHQgZGVidWcgbW9kZS4KICAgICAg ICAgaXNfbGludF9tb2RlOiBXaGV0aGVyIHRoaXMgaXMganVzdCBsaW50aW5nIHRlc3RfZXhwZWNh dGF0aW9ucy50eHQuCi0gICAgICAgIHN1cHByZXNzX2Vycm9yczogV2hldGhlciB0byBzdXBwcmVz cyBsaW50IGVycm9ycy4KICAgICAgICAgb3ZlcnJpZGVzOiB0ZXN0IGV4cGVjdGF0aW9ucyB0aGF0 IGFyZSBhbGxvd2VkIHRvIG92ZXJyaWRlIGFueQogICAgICAgICAgICAgZW50cmllcyBpbiB8ZXhw ZWN0YXRpb25zfC4gVGhpcyBpcyB1c2VkIGJ5IGNhbGxlcnMKICAgICAgICAgICAgIHRoYXQgbmVl ZCB0byBtYW5hZ2UgdHdvIHNldHMgb2YgZXhwZWN0YXRpb25zIChlLmcuLCB1cHN0cmVhbQpAQCAt MzE3LDcgKzMyOCw2IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNGaWxlOgogICAgICAgICBzZWxm Ll9pc19kZWJ1Z19tb2RlID0gaXNfZGVidWdfbW9kZQogICAgICAgICBzZWxmLl9pc19saW50X21v ZGUgPSBpc19saW50X21vZGUKICAgICAgICAgc2VsZi5fb3ZlcnJpZGVzID0gb3ZlcnJpZGVzCi0g ICAgICAgIHNlbGYuX3N1cHByZXNzX2Vycm9ycyA9IHN1cHByZXNzX2Vycm9ycwogICAgICAgICBz ZWxmLl9lcnJvcnMgPSBbXQogICAgICAgICBzZWxmLl9ub25fZmF0YWxfZXJyb3JzID0gW10KIApA QCAtMzYyLDggKzM3Miw3IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNGaWxlOgogICAgICAgICBz ZWxmLl9wcm9jZXNzX3Rlc3RzX3dpdGhvdXRfZXhwZWN0YXRpb25zKCkKIAogICAgIGRlZiBfaGFu ZGxlX2FueV9yZWFkX2Vycm9ycyhzZWxmKToKLSAgICAgICAgaWYgbm90IHNlbGYuX3N1cHByZXNz X2Vycm9ycyBhbmQgKAotICAgICAgICAgICAgbGVuKHNlbGYuX2Vycm9ycykgb3IgbGVuKHNlbGYu X25vbl9mYXRhbF9lcnJvcnMpKToKKyAgICAgICAgaWYgbGVuKHNlbGYuX2Vycm9ycykgb3IgbGVu KHNlbGYuX25vbl9mYXRhbF9lcnJvcnMpOgogICAgICAgICAgICAgaWYgc2VsZi5faXNfZGVidWdf bW9kZToKICAgICAgICAgICAgICAgICBidWlsZF90eXBlID0gJ0RFQlVHJwogICAgICAgICAgICAg ZWxzZToKQEAgLTM3MiwxMiArMzgxLDE1IEBAIGNsYXNzIFRlc3RFeHBlY3RhdGlvbnNGaWxlOgog ICAgICAgICAgICAgX2xvZy5lcnJvcigiRkFJTFVSRVMgRk9SIFBMQVRGT1JNOiAlcywgQlVJTERf VFlQRTogJXMiICUKICAgICAgICAgICAgICAgICAgICAgICAgKHNlbGYuX3Rlc3RfcGxhdGZvcm1f bmFtZS51cHBlcigpLCBidWlsZF90eXBlKSkKIAorICAgICAgICAgICAgZm9yIGVycm9yIGluIHNl bGYuX2Vycm9yczoKKyAgICAgICAgICAgICAgICBfbG9nLmVycm9yKGVycm9yKQogICAgICAgICAg ICAgZm9yIGVycm9yIGluIHNlbGYuX25vbl9mYXRhbF9lcnJvcnM6CiAgICAgICAgICAgICAgICAg X2xvZy5lcnJvcihlcnJvcikKLSAgICAgICAgICAgIF9sb2cuZXJyb3IoJycpCiAKICAgICAgICAg ICAgIGlmIGxlbihzZWxmLl9lcnJvcnMpOgotICAgICAgICAgICAgICAgIHJhaXNlIFN5bnRheEVy cm9yKCdcbicuam9pbihtYXAoc3RyLCBzZWxmLl9lcnJvcnMpKSkKKyAgICAgICAgICAgICAgICBy YWlzZSBQYXJzZUVycm9yKGZhdGFsPVRydWUsIGVycm9ycz1zZWxmLl9lcnJvcnMpCisgICAgICAg ICAgICBpZiBsZW4oc2VsZi5fbm9uX2ZhdGFsX2Vycm9ycykgYW5kIHNlbGYuX2lzX2xpbnRfbW9k ZToKKyAgICAgICAgICAgICAgICByYWlzZSBQYXJzZUVycm9yKGZhdGFsPUZhbHNlLCBlcnJvcnM9 c2VsZi5fbm9uX2ZhdGFsX2Vycm9ycykKIAogICAgIGRlZiBfcHJvY2Vzc190ZXN0c193aXRob3V0 X2V4cGVjdGF0aW9ucyhzZWxmKToKICAgICAgICAgZXhwZWN0YXRpb25zID0gc2V0KFtQQVNTXSkK QEAgLTgzNSw3ICs4NDcsNyBAQCBjbGFzcyBUZXN0RXhwZWN0YXRpb25zRmlsZToKICAgICAgICAg IiIiUmVwb3J0cyBhbiBlcnJvciB0aGF0IHdpbGwgcHJldmVudCBydW5uaW5nIHRoZSB0ZXN0cy4g RG9lcyBub3QKICAgICAgICAgaW1tZWRpYXRlbHkgcmFpc2UgYW4gZXhjZXB0aW9uIGJlY2F1c2Ug d2UnZCBsaWtlIHRvIGFnZ3JlZ2F0ZSBhbGwgdGhlCiAgICAgICAgIGVycm9ycyBzbyB0aGV5IGNh biBhbGwgYmUgcHJpbnRlZCBvdXQuIiIiCi0gICAgICAgIHNlbGYuX2Vycm9ycy5hcHBlbmQoJ1xu TGluZTolcyAlcyAlcycgJSAobGluZW5vLCBtc2csIHBhdGgpKQorICAgICAgICBzZWxmLl9lcnJv cnMuYXBwZW5kKCdMaW5lOiVzICVzICVzJyAlIChsaW5lbm8sIG1zZywgcGF0aCkpCiAKICAgICBk ZWYgX2xvZ19ub25fZmF0YWxfZXJyb3Ioc2VsZiwgbGluZW5vLCBtc2csIHBhdGgpOgogICAgICAg ICAiIiJSZXBvcnRzIGFuIGVycm9yIHRoYXQgd2lsbCBub3QgcHJldmVudCBydW5uaW5nIHRoZSB0 ZXN0cy4gVGhlc2UgYXJlCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS90ZXN0X2V4cGVjdGF0aW9uc191bml0dGVzdC5w eSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNr YWdlL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CmluZGV4IDU1ZWFmOTk0YjhkMjU3YzQ4 Yjk5NGMzMDA5NmRiMTA3MmUyNmM5MGQuLmUwNGFjMzE2MWUyYTllZTE4OTg0YmI0YTI3NjlmN2Yz ZDZhM2ZiM2UgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CisrKyBi L1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdl L3Rlc3RfZXhwZWN0YXRpb25zX3VuaXR0ZXN0LnB5CkBAIC0xOTYsMTkgKzE5Niw0MiBAQCBCVUdY IFdPTlRGSVggOiBmYWlsdXJlcy9leHBlY3RlZCA9IElNQUdFCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmNsdWRlX3NraXBzPUZhbHNlKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHMsIHNldChbXSkpCiAKKyAgICBkZWYgdGVzdF9wYXJz ZV9lcnJvcl9mYXRhbChzZWxmKToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5wYXJz ZV9leHAoIiIiRk9PIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sID0gVEVYVAorU0tJUCA6 IGZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlLmh0bWwiIiIpCisgICAgICAgICAgICBzZWxmLmFzc2Vy dEZhbHNlKFRydWUsICJQYXJzZUVycm9yIHdhc24ndCByYWlzZWQiKQorICAgICAgICBleGNlcHQg UGFyc2VFcnJvciwgZToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShlLmZhdGFsKQorICAg ICAgICAgICAgZXhwX2Vycm9ycyA9IFt1J0xpbmU6MSBJbnZhbGlkIG1vZGlmaWVyIGZvciB0ZXN0 OiBmb28gZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1sJywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgdSJMaW5lOjIgTWlzc2luZyBleHBlY3RhdGlvbnMuIFsnIGZhaWx1cmVzL2V4cGVjdGVk L2ltYWdlLmh0bWwnXSJdCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN0cihlKSwgJ1xu Jy5qb2luKG1hcChzdHIsIGV4cF9lcnJvcnMpKSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoZS5lcnJvcnMsIGV4cF9lcnJvcnMpCisKKyAgICBkZWYgdGVzdF9wYXJzZV9lcnJvcl9ub25m YXRhbChzZWxmKToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgc2VsZi5wYXJzZV9leHAoJ1NL SVAgOiBmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwgPSBURVhUJywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlzX2xpbnRfbW9kZT1UcnVlKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRG YWxzZShUcnVlLCAiUGFyc2VFcnJvciB3YXNuJ3QgcmFpc2VkIikKKyAgICAgICAgZXhjZXB0IFBh cnNlRXJyb3IsIGU6CisgICAgICAgICAgICBzZWxmLmFzc2VydEZhbHNlKGUuZmF0YWwpCisgICAg ICAgICAgICBleHBfZXJyb3JzID0gW3UnTGluZToxIFRlc3QgbGFja3MgQlVHIG1vZGlmaWVyLiBm YWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnXQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChzdHIoZSksICdcbicuam9pbihtYXAoc3RyLCBleHBfZXJyb3JzKSkpCisgICAgICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGUuZXJyb3JzLCBleHBfZXJyb3JzKQorCiAgICAgZGVmIHRlc3Rfc3lu dGF4X21pc3NpbmdfZXhwZWN0YXRpb24oc2VsZik6CiAgICAgICAgICMgVGhpcyBpcyBtaXNzaW5n IHRoZSBleHBlY3RhdGlvbi4KLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU3ludGF4RXJyb3Is IHNlbGYucGFyc2VfZXhwLAorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhQYXJzZUVycm9yLCBz ZWxmLnBhcnNlX2V4cCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JVR19URVNUOiBmYWls dXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwnLAogICAgICAgICAgICAgICAgICAgICAgICAgICBpc19k ZWJ1Z19tb2RlPVRydWUpCiAKICAgICBkZWYgdGVzdF9zeW50YXhfaW52YWxpZF9vcHRpb24oc2Vs Zik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFN5bnRheEVycm9yLCBzZWxmLnBhcnNlX2V4 cCwKKyAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoUGFyc2VFcnJvciwgc2VsZi5wYXJzZV9leHAs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICdCVUdfVEVTVCBGT086IGZhaWx1cmVzL2V4cGVj dGVkL3RleHQuaHRtbCA9IFBBU1MnKQogCiAgICAgZGVmIHRlc3Rfc3ludGF4X2ludmFsaWRfZXhw ZWN0YXRpb24oc2VsZik6CiAgICAgICAgICMgVGhpcyBpcyBtaXNzaW5nIHRoZSBleHBlY3RhdGlv bi4KLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU3ludGF4RXJyb3IsIHNlbGYucGFyc2VfZXhw LAorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhQYXJzZUVycm9yLCBzZWxmLnBhcnNlX2V4cCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgJ0JVR19URVNUOiBmYWlsdXJlcy9leHBlY3RlZC90 ZXh0Lmh0bWwgPSBGT08nKQogCiAgICAgZGVmIHRlc3Rfc3ludGF4X21pc3NpbmdfYnVnaWQoc2Vs Zik6CkBAIC0yMTksMjEgKzI0MiwyMSBAQCBCVUdYIFdPTlRGSVggOiBmYWlsdXJlcy9leHBlY3Rl ZCA9IElNQUdFCiAKICAgICBkZWYgdGVzdF9zZW1hbnRpY19zbG93X2FuZF90aW1lb3V0KHNlbGYp OgogICAgICAgICAjIEEgdGVzdCBjYW5ub3QgYmUgU0xPVyBhbmQgZXhwZWN0ZWQgdG8gVElNRU9V VC4KLSAgICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU3ludGF4RXJyb3IsIHNlbGYucGFyc2VfZXhw LAorICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhQYXJzZUVycm9yLCBzZWxmLnBhcnNlX2V4cCwK ICAgICAgICAgICAgICdCVUdfVEVTVCBTTE9XIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGltZW91dC5o dG1sID0gVElNRU9VVCcpCiAKICAgICBkZWYgdGVzdF9zZW1hbnRpY19yZWJhc2VsaW5lKHNlbGYp OgogICAgICAgICAjIENhbid0IGxpbnQgYSBmaWxlIHcvICdSRUJBU0VMSU5FJyBpbiBpdC4KLSAg ICAgICAgc2VsZi5hc3NlcnRSYWlzZXMoU3ludGF4RXJyb3IsIHNlbGYucGFyc2VfZXhwLAorICAg ICAgICBzZWxmLmFzc2VydFJhaXNlcyhQYXJzZUVycm9yLCBzZWxmLnBhcnNlX2V4cCwKICAgICAg ICAgICAgICdCVUdfVEVTVCBSRUJBU0VMSU5FIDogZmFpbHVyZXMvZXhwZWN0ZWQvdGV4dC5odG1s ID0gVEVYVCcsCiAgICAgICAgICAgICBpc19saW50X21vZGU9VHJ1ZSkKIAogICAgIGRlZiB0ZXN0 X3NlbWFudGljX2R1cGxpY2F0ZXMoc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFN5 bnRheEVycm9yLCBzZWxmLnBhcnNlX2V4cCwgIiIiCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2Vz KFBhcnNlRXJyb3IsIHNlbGYucGFyc2VfZXhwLCAiIiIKIEJVR19URVNUIDogZmFpbHVyZXMvZXhw ZWN0ZWQvdGV4dC5odG1sID0gVEVYVAogQlVHX1RFU1QgOiBmYWlsdXJlcy9leHBlY3RlZC90ZXh0 Lmh0bWwgPSBJTUFHRSIiIikKIAotICAgICAgICBzZWxmLmFzc2VydFJhaXNlcyhTeW50YXhFcnJv ciwgc2VsZi5wYXJzZV9leHAsCisgICAgICAgIHNlbGYuYXNzZXJ0UmFpc2VzKFBhcnNlRXJyb3Is IHNlbGYucGFyc2VfZXhwLAogICAgICAgICAgICAgc2VsZi5nZXRfYmFzaWNfZXhwZWN0YXRpb25z KCksICIiIgogQlVHX1RFU1QgOiBmYWlsdXJlcy9leHBlY3RlZC90ZXh0Lmh0bWwgPSBURVhUCiBC VUdfVEVTVCA6IGZhaWx1cmVzL2V4cGVjdGVkL3RleHQuaHRtbCA9IElNQUdFIiIiKQpkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJv bWl1bS5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv Y2hyb21pdW0ucHkKaW5kZXggOGZlNjg1YWYwNjY5ZWIzNGFmZThmOTRjNTZmZTNmZjNjZDk1MzZj Ny4uNDUyMzcwMDMzMTUyNDU2M2JlODRjN2ZhODQ1Y2M1YzBlOWFhZWZlMiAxMDA2NDQKLS0tIGEv V2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bS5w eQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2No cm9taXVtLnB5CkBAIC0yODUsNyArMjg1LDcgQEAgY2xhc3MgQ2hyb21pdW1Qb3J0KGJhc2UuUG9y dCk6CiAKICAgICAgICAgZXhwZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVj dGF0aW9ucygKICAgICAgICAgICAgIHNlbGYsIGFsbF90ZXN0X2ZpbGVzLCBleHBlY3RhdGlvbnNf c3RyLCB0ZXN0X3BsYXRmb3JtX25hbWUsCi0gICAgICAgICAgICBpc19kZWJ1Z19tb2RlLCBpc19s aW50X21vZGU9VHJ1ZSwgb3ZlcnJpZGVzPW92ZXJyaWRlc19zdHIpCisgICAgICAgICAgICBpc19k ZWJ1Z19tb2RlLCBpc19saW50X21vZGU9RmFsc2UsIG92ZXJyaWRlcz1vdmVycmlkZXNfc3RyKQog ICAgICAgICB0ZXN0c19kaXIgPSBzZWxmLmxheW91dF90ZXN0c19kaXIoKQogICAgICAgICByZXR1 cm4gW3NlbGYucmVsYXRpdmVfdGVzdF9maWxlbmFtZSh0ZXN0KQogICAgICAgICAgICAgICAgIGZv ciB0ZXN0IGluIGV4cGVjdGF0aW9ucy5nZXRfdGVzdHNfd2l0aF9yZXN1bHRfdHlwZSh0ZXN0X2V4 cGVjdGF0aW9ucy5TS0lQKV0KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkgYi9XZWJLaXRUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzLnB5CmluZGV4IDY0M2UyMDQ5 M2M4YTNiZjQwYWIwOGVmNDRiOWRlNzA5MTFiNDNlNzkuLjFkMWFjNTBlZmE0ZGY5ZjNkZWFmZjk3 ZWE5NGQxNGRiNTJkNmViYTAgMTAwNzU1Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHMucHkKKysrIGIvV2ViS2l0VG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0cy5weQpAQCAtMjg0LDE1 ICsyODQsMjcgQEAgY2xhc3MgVGVzdFJ1bm5lcjoKICAgICAgICAgcmV0dXJuIHBhdGgKIAogICAg IGRlZiBsaW50KHNlbGYpOgorICAgICAgICBsaW50X2ZhaWxlZCA9IEZhbHNlCisKICAgICAgICAg IyBDcmVhdGluZyB0aGUgZXhwZWNhdGlvbnMgZm9yIGVhY2ggcGxhdGZvcm0vY29uZmlndXJhdGlv biBwYWlyIGRvZXMKICAgICAgICAgIyBhbGwgdGhlIHRlc3QgbGlzdCBwYXJzaW5nIGFuZCBlbnN1 cmVzIGl0J3MgY29ycmVjdCBzeW50YXggKGUuZy4gbm8KICAgICAgICAgIyBkdXBlcykuCiAgICAg ICAgIGZvciBwbGF0Zm9ybV9uYW1lIGluIHNlbGYuX3BvcnQudGVzdF9wbGF0Zm9ybV9uYW1lcygp OgotICAgICAgICAgICAgc2VsZi5wYXJzZV9leHBlY3RhdGlvbnMocGxhdGZvcm1fbmFtZSwgaXNf ZGVidWdfbW9kZT1UcnVlKQotICAgICAgICAgICAgc2VsZi5wYXJzZV9leHBlY3RhdGlvbnMocGxh dGZvcm1fbmFtZSwgaXNfZGVidWdfbW9kZT1GYWxzZSkKKyAgICAgICAgICAgIHRyeToKKyAgICAg ICAgICAgICAgICBzZWxmLnBhcnNlX2V4cGVjdGF0aW9ucyhwbGF0Zm9ybV9uYW1lLCBpc19kZWJ1 Z19tb2RlPVRydWUpCisgICAgICAgICAgICBleGNlcHQgdGVzdF9leHBlY3RhdGlvbnMuUGFyc2VF cnJvcjoKKyAgICAgICAgICAgICAgICBsaW50X2ZhaWxlZCA9IFRydWUKKyAgICAgICAgICAgIHRy eToKKyAgICAgICAgICAgICAgICBzZWxmLnBhcnNlX2V4cGVjdGF0aW9ucyhwbGF0Zm9ybV9uYW1l LCBpc19kZWJ1Z19tb2RlPUZhbHNlKQorICAgICAgICAgICAgZXhjZXB0IHRlc3RfZXhwZWN0YXRp b25zLlBhcnNlRXJyb3I6CisgICAgICAgICAgICAgICAgbGludF9mYWlsZWQgPSBUcnVlCisKICAg ICAgICAgc2VsZi5fcHJpbnRlci53cml0ZSgiIikKLSAgICAgICAgX2xvZy5pbmZvKCJJZiB0aGVy ZSBhcmUgbm8gZmFpbCBtZXNzYWdlcywgZXJyb3JzIG9yIGV4Y2VwdGlvbnMsICIKLSAgICAgICAg ICAgICAgICAgICJ0aGVuIHRoZSBsaW50IHN1Y2NlZWRlZC4iKQorICAgICAgICBpZiBsaW50X2Zh aWxlZDoKKyAgICAgICAgICAgIF9sb2cuZXJyb3IoIkxpbnQgZmFpbGVkLiIpCisgICAgICAgICAg ICByZXR1cm4gLTEKKworICAgICAgICBfbG9nLmluZm8oIkxpbnQgc3VjY2VlZGVkLiIpCiAgICAg ICAgIHJldHVybiAwCiAKICAgICBkZWYgcGFyc2VfZXhwZWN0YXRpb25zKHNlbGYsIHRlc3RfcGxh dGZvcm1fbmFtZSwgaXNfZGVidWdfbW9kZSk6CkBAIC0zMDQsMTkgKzMxNiwxNCBAQCBjbGFzcyBU ZXN0UnVubmVyOgogICAgICAgICBlbHNlOgogICAgICAgICAgICAgdGVzdF9maWxlcyA9IHNlbGYu X3Rlc3RfZmlsZXMKIAotICAgICAgICB0cnk6Ci0gICAgICAgICAgICBleHBlY3RhdGlvbnNfc3Ry ID0gc2VsZi5fcG9ydC50ZXN0X2V4cGVjdGF0aW9ucygpCi0gICAgICAgICAgICBvdmVycmlkZXNf c3RyID0gc2VsZi5fcG9ydC50ZXN0X2V4cGVjdGF0aW9uc19vdmVycmlkZXMoKQotICAgICAgICAg ICAgc2VsZi5fZXhwZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0aW9u cygKLSAgICAgICAgICAgICAgICBzZWxmLl9wb3J0LCB0ZXN0X2ZpbGVzLCBleHBlY3RhdGlvbnNf c3RyLCB0ZXN0X3BsYXRmb3JtX25hbWUsCi0gICAgICAgICAgICAgICAgaXNfZGVidWdfbW9kZSwg c2VsZi5fb3B0aW9ucy5saW50X3Rlc3RfZmlsZXMsCi0gICAgICAgICAgICAgICAgb3ZlcnJpZGVz PW92ZXJyaWRlc19zdHIpCi0gICAgICAgICAgICByZXR1cm4gc2VsZi5fZXhwZWN0YXRpb25zCi0g ICAgICAgIGV4Y2VwdCBTeW50YXhFcnJvciwgZXJyOgotICAgICAgICAgICAgaWYgc2VsZi5fb3B0 aW9ucy5saW50X3Rlc3RfZmlsZXM6Ci0gICAgICAgICAgICAgICAgcHJpbnQgc3RyKGVycikKLSAg ICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgcmFpc2UgZXJyCisgICAgICAgIGV4cGVj dGF0aW9uc19zdHIgPSBzZWxmLl9wb3J0LnRlc3RfZXhwZWN0YXRpb25zKCkKKyAgICAgICAgb3Zl cnJpZGVzX3N0ciA9IHNlbGYuX3BvcnQudGVzdF9leHBlY3RhdGlvbnNfb3ZlcnJpZGVzKCkKKyAg ICAgICAgc2VsZi5fZXhwZWN0YXRpb25zID0gdGVzdF9leHBlY3RhdGlvbnMuVGVzdEV4cGVjdGF0 aW9ucygKKyAgICAgICAgICAgIHNlbGYuX3BvcnQsIHRlc3RfZmlsZXMsIGV4cGVjdGF0aW9uc19z dHIsIHRlc3RfcGxhdGZvcm1fbmFtZSwKKyAgICAgICAgICAgIGlzX2RlYnVnX21vZGUsIHNlbGYu X29wdGlvbnMubGludF90ZXN0X2ZpbGVzLAorICAgICAgICAgICAgb3ZlcnJpZGVzPW92ZXJyaWRl c19zdHIpCisgICAgICAgIHJldHVybiBzZWxmLl9leHBlY3RhdGlvbnMKKwogCiAgICAgZGVmIHBy ZXBhcmVfbGlzdHNfYW5kX3ByaW50X291dHB1dChzZWxmKToKICAgICAgICAgIiIiQ3JlYXRlIGFw cHJvcHJpYXRlIHN1YnNldHMgb2YgdGVzdCBsaXN0cyBhbmQgcmV0dXJucyBhCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rl c3RzX3VuaXR0ZXN0LnB5IGIvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCAyMGE0YWMwZWFkYTc5NTY1MDU5 OWY5MTAwYjFhMzBmMTNmZWE2MjcwLi5hM2M0MDUzZTg4NTA0NGVjYTlmNGJlODRhYTkzNzE0NTA1 MDNhYmU0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CisrKyBiL1dlYktpdFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAg LTY0LDEwICs2NCwxMyBAQCBjbGFzcyBNb2NrVXNlcigpOgogICAgICAgICBzZWxmLnVybCA9IHVy bAogCiAKLWRlZiBwYXNzaW5nX3J1bihleHRyYV9hcmdzPU5vbmUsIHBvcnRfb2JqPU5vbmUsIHJl Y29yZF9yZXN1bHRzPUZhbHNlLAotICAgICAgICAgICAgICAgIHRlc3RzX2luY2x1ZGVkPUZhbHNl KToKK2RlZiBwYXJzZV9hcmdzKGV4dHJhX2FyZ3M9Tm9uZSwgcmVjb3JkX3Jlc3VsdHM9RmFsc2Us IHRlc3RzX2luY2x1ZGVkPUZhbHNlLAorICAgICAgICAgICAgICAgcHJpbnRfbm90aGluZz1UcnVl KToKICAgICBleHRyYV9hcmdzID0gZXh0cmFfYXJncyBvciBbXQotICAgIGFyZ3MgPSBbJy0tcHJp bnQnLCAnbm90aGluZyddCisgICAgaWYgcHJpbnRfbm90aGluZzoKKyAgICAgICAgYXJncyA9IFsn LS1wcmludCcsICdub3RoaW5nJ10KKyAgICBlbHNlOgorICAgICAgICBhcmdzID0gW10KICAgICBp ZiBub3QgJy0tcGxhdGZvcm0nIGluIGV4dHJhX2FyZ3M6CiAgICAgICAgIGFyZ3MuZXh0ZW5kKFsn LS1wbGF0Zm9ybScsICd0ZXN0J10pCiAgICAgaWYgbm90IHJlY29yZF9yZXN1bHRzOgpAQCAtODEs NyArODQsMTMgQEAgZGVmIHBhc3NpbmdfcnVuKGV4dHJhX2FyZ3M9Tm9uZSwgcG9ydF9vYmo9Tm9u ZSwgcmVjb3JkX3Jlc3VsdHM9RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAnaHR0cC90ZXN0 cycsCiAgICAgICAgICAgICAgICAgICAgICAnd2Vic29ja2V0L3Rlc3RzJywKICAgICAgICAgICAg ICAgICAgICAgICdmYWlsdXJlcy9leHBlY3RlZC8qJ10pCi0gICAgb3B0aW9ucywgcGFyc2VkX2Fy Z3MgPSBydW5fd2Via2l0X3Rlc3RzLnBhcnNlX2FyZ3MoYXJncykKKyAgICByZXR1cm4gcnVuX3dl YmtpdF90ZXN0cy5wYXJzZV9hcmdzKGFyZ3MpCisKKworZGVmIHBhc3NpbmdfcnVuKGV4dHJhX2Fy Z3M9Tm9uZSwgcG9ydF9vYmo9Tm9uZSwgcmVjb3JkX3Jlc3VsdHM9RmFsc2UsCisgICAgICAgICAg ICAgICAgdGVzdHNfaW5jbHVkZWQ9RmFsc2UpOgorICAgIG9wdGlvbnMsIHBhcnNlZF9hcmdzID0g cGFyc2VfYXJncyhleHRyYV9hcmdzLCByZWNvcmRfcmVzdWx0cywKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdGVzdHNfaW5jbHVkZWQpCiAgICAgaWYgbm90IHBvcnRfb2Jq OgogICAgICAgICBwb3J0X29iaiA9IHBvcnQuZ2V0KHBvcnRfbmFtZT1vcHRpb25zLnBsYXRmb3Jt LCBvcHRpb25zPW9wdGlvbnMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdXNlcj1Nb2Nr VXNlcigpKQpAQCAtOTAsMjcgKzk5LDI0IEBAIGRlZiBwYXNzaW5nX3J1bihleHRyYV9hcmdzPU5v bmUsIHBvcnRfb2JqPU5vbmUsIHJlY29yZF9yZXN1bHRzPUZhbHNlLAogCiAKIGRlZiBsb2dnaW5n X3J1bihleHRyYV9hcmdzPU5vbmUsIHBvcnRfb2JqPU5vbmUsIHRlc3RzX2luY2x1ZGVkPUZhbHNl KToKLSAgICBleHRyYV9hcmdzID0gZXh0cmFfYXJncyBvciBbXQotICAgIGFyZ3MgPSBbJy0tbm8t cmVjb3JkLXJlc3VsdHMnXQotICAgIGlmIG5vdCAnLS1wbGF0Zm9ybScgaW4gZXh0cmFfYXJnczoK LSAgICAgICAgYXJncy5leHRlbmQoWyctLXBsYXRmb3JtJywgJ3Rlc3QnXSkKLSAgICBpZiBub3Qg Jy0tY2hpbGQtcHJvY2Vzc2VzJyBpbiBleHRyYV9hcmdzOgotICAgICAgICBhcmdzLmV4dGVuZChb Jy0td29ya2VyLW1vZGVsJywgJ2lubGluZSddKQotICAgIGFyZ3MuZXh0ZW5kKGV4dHJhX2FyZ3Mp Ci0gICAgaWYgbm90IHRlc3RzX2luY2x1ZGVkOgotICAgICAgICBhcmdzLmV4dGVuZChbJ3Bhc3Nl cycsCi0gICAgICAgICAgICAgICAgICAgICAnaHR0cC90ZXN0cycsCi0gICAgICAgICAgICAgICAg ICAgICAnd2Vic29ja2V0L3Rlc3RzJywKLSAgICAgICAgICAgICAgICAgICAgICdmYWlsdXJlcy9l eHBlY3RlZC8qJ10pCisgICAgb3B0aW9ucywgcGFyc2VkX2FyZ3MgPSBwYXJzZV9hcmdzKGV4dHJh X2FyZ3M9ZXh0cmFfYXJncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cmVjb3JkX3Jlc3VsdHM9RmFsc2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHRlc3RzX2luY2x1ZGVkPXRlc3RzX2luY2x1ZGVkLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwcmludF9ub3RoaW5nPUZhbHNlKQorICAgIHVzZXIgPSBNb2NrVXNl cigpCisgICAgaWYgbm90IHBvcnRfb2JqOgorICAgICAgICBwb3J0X29iaiA9IHBvcnQuZ2V0KHBv cnRfbmFtZT1vcHRpb25zLnBsYXRmb3JtLCBvcHRpb25zPW9wdGlvbnMsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgdXNlcj11c2VyKQorCisgICAgcmVzLCBidWlsZGJvdF9vdXRwdXQsIHJl Z3VsYXJfb3V0cHV0ID0gcnVuX2FuZF9jYXB0dXJlKHBvcnRfb2JqLCBvcHRpb25zLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXJz ZWRfYXJncykKKyAgICByZXR1cm4gKHJlcywgYnVpbGRib3Rfb3V0cHV0LCByZWd1bGFyX291dHB1 dCwgdXNlcikKIAorCitkZWYgcnVuX2FuZF9jYXB0dXJlKHBvcnRfb2JqLCBvcHRpb25zLCBwYXJz ZWRfYXJncyk6CiAgICAgb2MgPSBvdXRwdXRjYXB0dXJlLk91dHB1dENhcHR1cmUoKQogICAgIHRy eToKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQotICAgICAgICBvcHRpb25zLCBwYXJzZWRf YXJncyA9IHJ1bl93ZWJraXRfdGVzdHMucGFyc2VfYXJncyhhcmdzKQotICAgICAgICB1c2VyID0g TW9ja1VzZXIoKQotICAgICAgICBpZiBub3QgcG9ydF9vYmo6Ci0gICAgICAgICAgICBwb3J0X29i aiA9IHBvcnQuZ2V0KHBvcnRfbmFtZT1vcHRpb25zLnBsYXRmb3JtLCBvcHRpb25zPW9wdGlvbnMs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVzZXI9dXNlcikKICAgICAgICAgYnVp bGRib3Rfb3V0cHV0ID0gYXJyYXlfc3RyZWFtLkFycmF5U3RyZWFtKCkKICAgICAgICAgcmVndWxh cl9vdXRwdXQgPSBhcnJheV9zdHJlYW0uQXJyYXlTdHJlYW0oKQogICAgICAgICByZXMgPSBydW5f d2Via2l0X3Rlc3RzLnJ1bihwb3J0X29iaiwgb3B0aW9ucywgcGFyc2VkX2FyZ3MsCkBAIC0xMTgs MjIgKzEyNCwxNyBAQCBkZWYgbG9nZ2luZ19ydW4oZXh0cmFfYXJncz1Ob25lLCBwb3J0X29iaj1O b25lLCB0ZXN0c19pbmNsdWRlZD1GYWxzZSk6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJlZ3VsYXJfb3V0cHV0PXJlZ3VsYXJfb3V0cHV0KQogICAgIGZpbmFsbHk6CiAgICAg ICAgIG9jLnJlc3RvcmVfb3V0cHV0KCkKLSAgICByZXR1cm4gKHJlcywgYnVpbGRib3Rfb3V0cHV0 LCByZWd1bGFyX291dHB1dCwgdXNlcikKKyAgICByZXR1cm4gKHJlcywgYnVpbGRib3Rfb3V0cHV0 LCByZWd1bGFyX291dHB1dCkKIAogCiBkZWYgZ2V0X3Rlc3RzX3J1bihleHRyYV9hcmdzPU5vbmUs IHRlc3RzX2luY2x1ZGVkPUZhbHNlLCBmbGF0dGVuX2JhdGNoZXM9RmFsc2UpOgogICAgIGV4dHJh X2FyZ3MgPSBleHRyYV9hcmdzIG9yIFtdCi0gICAgYXJncyA9IFsKLSAgICAgICAgJy0tcHJpbnQn LCAnbm90aGluZycsCi0gICAgICAgICctLXBsYXRmb3JtJywgJ3Rlc3QnLAotICAgICAgICAnLS1u by1yZWNvcmQtcmVzdWx0cycsCi0gICAgICAgICctLXdvcmtlci1tb2RlbCcsICdpbmxpbmUnXQot ICAgIGFyZ3MuZXh0ZW5kKGV4dHJhX2FyZ3MpCiAgICAgaWYgbm90IHRlc3RzX2luY2x1ZGVkOgog ICAgICAgICAjIE5vdCBpbmNsdWRpbmcgaHR0cCB0ZXN0cyBzaW5jZSB0aGV5IGdldCBydW4gb3V0 IG9mIG9yZGVyICh0aGF0CiAgICAgICAgICMgYmVoYXZpb3IgaGFzIGl0cyBvd24gdGVzdCwgc2Vl IHRlc3RfZ2V0X3Rlc3RfZmlsZV9xdWV1ZSkKLSAgICAgICAgYXJncy5leHRlbmQoWydwYXNzZXMn LCAnZmFpbHVyZXMnXSkKLSAgICBvcHRpb25zLCBwYXJzZWRfYXJncyA9IHJ1bl93ZWJraXRfdGVz dHMucGFyc2VfYXJncyhhcmdzKQorICAgICAgICBleHRyYV9hcmdzID0gWydwYXNzZXMnLCAnZmFp bHVyZXMnXSArIGV4dHJhX2FyZ3MKKyAgICBvcHRpb25zLCBwYXJzZWRfYXJncyA9IHBhcnNlX2Fy Z3MoZXh0cmFfYXJncywgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSkKKwogICAgIHVzZXIgPSBNb2NrVXNl cigpCiAKICAgICB0ZXN0X2JhdGNoZXMgPSBbXQpAQCAtMTYzLDEzICsxNjQsMTQgQEAgZGVmIGdl dF90ZXN0c19ydW4oZXh0cmFfYXJncz1Ob25lLCB0ZXN0c19pbmNsdWRlZD1GYWxzZSwgZmxhdHRl bl9iYXRjaGVzPUZhbHNlKToKICAgICAgICAgICAgIHJldHVybiBSZWNvcmRpbmdUZXN0RHJpdmVy KHNlbGYsIHdvcmtlcl9udW1iZXIpCiAKICAgICByZWNvcmRpbmdfcG9ydCA9IFJlY29yZGluZ1Rl c3RQb3J0KG9wdGlvbnM9b3B0aW9ucywgdXNlcj11c2VyKQotICAgIGxvZ2dpbmdfcnVuKGV4dHJh X2FyZ3M9YXJncywgcG9ydF9vYmo9cmVjb3JkaW5nX3BvcnQsIHRlc3RzX2luY2x1ZGVkPVRydWUp CisgICAgcnVuX2FuZF9jYXB0dXJlKHJlY29yZGluZ19wb3J0LCBvcHRpb25zLCBwYXJzZWRfYXJn cykKIAogICAgIGlmIGZsYXR0ZW5fYmF0Y2hlczoKICAgICAgICAgcmV0dXJuIGxpc3QoaXRlcnRv b2xzLmNoYWluKCp0ZXN0X2JhdGNoZXMpKQogCiAgICAgcmV0dXJuIHRlc3RfYmF0Y2hlcwogCisK IGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9hY2NlbGVy YXRlZF9jb21wb3NpdGluZyhzZWxmKToKICAgICAgICAgIyBUaGlzIGp1c3QgdGVzdHMgdGhhdCB3 ZSByZWNvZ25pemUgdGhlIGNvbW1hbmQgbGluZSBhcmdzCkBAIC0yMzcsMTIgKzIzOSwyMSBAQCBj bGFzcyBNYWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoYnVpbGRib3Rfb3V0cHV0LmdldCgpLCBbXSkKIAogICAgIGRlZiB0ZXN0X2xpbnRfdGVzdF9m aWxlcyhzZWxmKToKLSAgICAgICAgIyBGSVhNRTogIGFkZCBlcnJvcnM/Ci0gICAgICAgIHJlcywg b3V0LCBlcnIsIHVzZXIgPSBsb2dnaW5nX3J1bihbJy0tbGludC10ZXN0LWZpbGVzJ10sCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0c19pbmNsdWRlZD1UcnVl KQorICAgICAgICByZXMsIG91dCwgZXJyLCB1c2VyID0gbG9nZ2luZ19ydW4oWyctLWxpbnQtdGVz dC1maWxlcyddKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcywgMCkKICAgICAgICAgc2Vs Zi5hc3NlcnRUcnVlKG91dC5lbXB0eSgpKQotICAgICAgICBzZWxmLmFzc2VydFRydWUoYW55KFsn bGludCBzdWNjZWVkZWQnIGluIG1zZyBmb3IgbXNnIGluIGVyci5nZXQoKV0pKQorICAgICAgICBz ZWxmLmFzc2VydFRydWUoYW55KFsnTGludCBzdWNjZWVkZWQnIGluIG1zZyBmb3IgbXNnIGluIGVy ci5nZXQoKV0pKQorCisgICAgZGVmIHRlc3RfbGludF90ZXN0X2ZpbGVzX19lcnJvcnMoc2VsZik6 CisgICAgICAgIG9wdGlvbnMsIHBhcnNlZF9hcmdzID0gcGFyc2VfYXJncyhbJy0tbGludC10ZXN0 LWZpbGVzJ10pCisgICAgICAgIHVzZXIgPSBNb2NrVXNlcigpCisgICAgICAgIHBvcnRfb2JqID0g cG9ydC5nZXQob3B0aW9ucy5wbGF0Zm9ybSwgb3B0aW9ucz1vcHRpb25zLCB1c2VyPXVzZXIpCisg ICAgICAgIHBvcnRfb2JqLnRlc3RfZXhwZWN0YXRpb25zID0gbGFtYmRhOiAiIyBzeW50YXggZXJy b3IiCisgICAgICAgIHJlcywgb3V0LCBlcnIgPSBydW5fYW5kX2NhcHR1cmUocG9ydF9vYmosIG9w dGlvbnMsIHBhcnNlZF9hcmdzKQorCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocmVzLCAtMSkK KyAgICAgICAgc2VsZi5hc3NlcnRUcnVlKG91dC5lbXB0eSgpKQorICAgICAgICBzZWxmLmFzc2Vy dFRydWUoYW55KFsnTGludCBmYWlsZWQnIGluIG1zZyBmb3IgbXNnIGluIGVyci5nZXQoKV0pKQog CiAgICAgZGVmIHRlc3Rfbm9fdGVzdHNfZm91bmQoc2VsZik6CiAgICAgICAgIHJlcywgb3V0LCBl cnIsIHVzZXIgPSBsb2dnaW5nX3J1bihbJ3Jlc291cmNlcyddLCB0ZXN0c19pbmNsdWRlZD1UcnVl KQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vy cy90ZXN0X2V4cGVjdGF0aW9ucy5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcnMvdGVzdF9leHBlY3RhdGlvbnMucHkKaW5kZXggZDJkNjdmMzU3NTVkY2Q0MmM4 NjEwOTg3MWIzNDJmZjYzYmQ0OTlkOS4uMmYxMDU3YWMyZmI1MDJiN2RiMGEzZjNjMTRhZGZhODM3 ZDY0ZmEyNiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2Vycy90ZXN0X2V4cGVjdGF0aW9ucy5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dl YmtpdHB5L3N0eWxlL2NoZWNrZXJzL3Rlc3RfZXhwZWN0YXRpb25zLnB5CkBAIC04NywyOCArODcs MjYgQEAgY2xhc3MgVGVzdEV4cGVjdGF0aW9uc0NoZWNrZXIob2JqZWN0KToKICAgICAgICAgcGFz cwogCiAgICAgZGVmIGNoZWNrX3Rlc3RfZXhwZWN0YXRpb25zKHNlbGYsIGV4cGVjdGF0aW9uc19z dHIsIHRlc3RzPU5vbmUsIG92ZXJyaWRlcz1Ob25lKToKLSAgICAgICAgZXJyb3JzID0gW10KKyAg ICAgICAgZXJyID0gTm9uZQogICAgICAgICBleHBlY3RhdGlvbnMgPSBOb25lCiAgICAgICAgIHRy eToKICAgICAgICAgICAgIGV4cGVjdGF0aW9ucyA9IHRlc3RfZXhwZWN0YXRpb25zLlRlc3RFeHBl Y3RhdGlvbnNGaWxlKAogICAgICAgICAgICAgICAgIHBvcnQ9c2VsZi5fcG9ydF9vYmosIGV4cGVj dGF0aW9ucz1leHBlY3RhdGlvbnNfc3RyLCBmdWxsX3Rlc3RfbGlzdD10ZXN0cywKICAgICAgICAg ICAgICAgICB0ZXN0X3BsYXRmb3JtX25hbWU9c2VsZi5fcG9ydF90b19jaGVjaywgaXNfZGVidWdf bW9kZT1GYWxzZSwKLSAgICAgICAgICAgICAgICBpc19saW50X21vZGU9VHJ1ZSwgc3VwcHJlc3Nf ZXJyb3JzPUZhbHNlLCBvdmVycmlkZXM9b3ZlcnJpZGVzKQotICAgICAgICBleGNlcHQgU3ludGF4 RXJyb3IsIGVycm9yOgotICAgICAgICAgICAgZXJyb3JzID0gc3RyKGVycm9yKS5zcGxpdGxpbmVz KCkKLQotICAgICAgICBmb3IgZXJyb3IgaW4gZXJyb3JzOgotICAgICAgICAgICAgbWF0Y2hlZCA9 IHNlbGYuX291dHB1dF9yZWdleC5tYXRjaChlcnJvcikKLSAgICAgICAgICAgIGlmIG1hdGNoZWQ6 Ci0gICAgICAgICAgICAgICAgbGluZW5vLCBtZXNzYWdlID0gbWF0Y2hlZC5ncm91cCgnbGluZScs ICdtZXNzYWdlJykKLSAgICAgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IoaW50 KGxpbmVubyksICd0ZXN0L2V4cGVjdGF0aW9ucycsIDUsIG1lc3NhZ2UpCi0KLSAgICAgICAgaWYg ZXhwZWN0YXRpb25zOgotICAgICAgICAgICAgZm9yIGVycm9yIGluIGV4cGVjdGF0aW9ucy5nZXRf bm9uX2ZhdGFsX2Vycm9ycygpOgorICAgICAgICAgICAgICAgIGlzX2xpbnRfbW9kZT1UcnVlLCBv dmVycmlkZXM9b3ZlcnJpZGVzKQorICAgICAgICBleGNlcHQgdGVzdF9leHBlY3RhdGlvbnMuUGFy c2VFcnJvciwgZXJyb3I6CisgICAgICAgICAgICBlcnIgPSBlcnJvcgorCisgICAgICAgIGlmIGVy cjoKKyAgICAgICAgICAgIGxldmVsID0gMgorICAgICAgICAgICAgaWYgZXJyLmZhdGFsOgorICAg ICAgICAgICAgICAgIGxldmVsID0gNQorICAgICAgICAgICAgZm9yIGVycm9yIGluIGVyci5lcnJv cnM6CiAgICAgICAgICAgICAgICAgbWF0Y2hlZCA9IHNlbGYuX291dHB1dF9yZWdleC5tYXRjaChl cnJvcikKICAgICAgICAgICAgICAgICBpZiBtYXRjaGVkOgogICAgICAgICAgICAgICAgICAgICBs aW5lbm8sIG1lc3NhZ2UgPSBtYXRjaGVkLmdyb3VwKCdsaW5lJywgJ21lc3NhZ2UnKQotICAgICAg ICAgICAgICAgICAgICBzZWxmLl9oYW5kbGVfc3R5bGVfZXJyb3IoaW50KGxpbmVubyksICd0ZXN0 L2V4cGVjdGF0aW9ucycsIDIsIG1lc3NhZ2UpCisgICAgICAgICAgICAgICAgICAgIHNlbGYuX2hh bmRsZV9zdHlsZV9lcnJvcihpbnQobGluZW5vKSwgJ3Rlc3QvZXhwZWN0YXRpb25zJywgbGV2ZWws IG1lc3NhZ2UpCisKIAogICAgIGRlZiBjaGVja190YWJzKHNlbGYsIGxpbmVzKToKICAgICAgICAg c2VsZi5fdGFiX2NoZWNrZXIuY2hlY2sobGluZXMpCg==