119159 2013-07-26 14:03:00 -0700 W3C Test Import script reformats test HTML 2013-09-18 17:54:45 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bjonesbe bjonesbe commit-queue dpranke glenn rhauck zan oldest_to_newest 912091 0 bjonesbe 2013-07-26 14:03:00 -0700 When importing a W3C test, the import script reformats the HTML, which adds new lines and indentation. In some cases, this can break tests. The importer should not change the formatting of tests that it imports. 913556 1 bjonesbe 2013-07-31 17:17:09 -0700 It looks like it may also break inline styles, so that should be tested for along with this fix, 921205 2 209685 bjonesbe 2013-08-26 15:55:01 -0700 Created attachment 209685 Patch Rewrite test conversion to miminimize reformatting when rewriting tests. 921210 3 dpranke 2013-08-26 16:07:11 -0700 Hm, I was hoping this would be a simple patch, but it isn't, and so I'm gonna need more than a couple minutes to review it. I will try to look at this as soon as I get the time ... 921214 4 bjonesbe 2013-08-26 16:12:37 -0700 (In reply to comment #3) > Hm, I was hoping this would be a simple patch, but it isn't, and so I'm gonna need more than a couple minutes to review it. I will try to look at this as soon as I get the time ... Unfortunately, I couldn't come up with a simple way to do it. Happy to wait until you have time, I'm not blocked on it. 930789 5 209685 dpranke 2013-09-18 16:42:22 -0700 Comment on attachment 209685 Patch looks plausible. Sorry for the long delay. 930800 6 209685 commit-queue 2013-09-18 17:54:43 -0700 Comment on attachment 209685 Patch Clearing flags on attachment: 209685 Committed r156074: <http://trac.webkit.org/changeset/156074> 930801 7 commit-queue 2013-09-18 17:54:45 -0700 All reviewed patches have been landed. Closing bug. 209685 2013-08-26 15:55:01 -0700 2013-09-18 17:54:43 -0700 Patch bug-119159-20130826155500.patch text/plain 21522 bjonesbe U3VidmVyc2lvbiBSZXZpc2lvbjogMTU0NjI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2I1NWEyOWIxMmZkZjZiOGI4Y2NhN2YwNWEzMzliNmNi NzJmNzAzNy4uMmM5MTg5YmQzNGMzZDczY2Y3MDY0MDFlMGM5ZTBjYmM5ZmFlZWU0YSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3 IEBACisyMDEzLTA4LTI2ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgorCisg ICAgICAgIFczQyBUZXN0IEltcG9ydCBzY3JpcHQgcmVmb3JtYXRzIHRlc3QgSFRNTAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5MTU5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29tcGxldGVseSByZXdy aXRlIHRoZSB0ZXN0IGNvbnZlcnNpb24gcHJvY2VzcyB0byBtaW5pbWl6ZQorICAgICAgICByZWZv cm1hdHRpbmcgd2hlbiBhZGRpbmcgcHJlZml4ZXMsIGV0Yy4gVGhpcyBpc24ndCAxMDAlIHBlcmZl Y3QsIHRoZXJlCisgICAgICAgIGFyZSBzdGlsbCBwbGFjZXMgd2hlcmUgaXQgd2lsbCBlbmQgdXAg Y2hhbmdpbmcgdGhlIGZvcm1hdHRpbmcsIGJ1dCBpdAorICAgICAgICBpcyBtdWNoIGJldHRlciB0 aGFuIGJlZm9yZS4gTW9zdCBub3RhYmx5LCB0aGUgcHVibGljIGludGVyZmFjZSB0byB0aGUKKyAg ICAgICAgdGVzdCBjb252ZXJ0ZXIgaGFzIGNoYW5nZWQ6IG5vdyBvbmUgY2FsbHMgYSBtZXRob2Qg aW5zdGVhZCBvZiBjcmVhdGluZworICAgICAgICBhbiBpbnN0YW5jZSBvZiB0aGUgdGVzdCBjb252 ZXJ0ZXIgY2xhc3MuIFRoaXMgaXMgYmVjYXVzZSB0aGUgdGVzdAorICAgICAgICBjb252ZXJ0ZXIg Y2xhc3Mgbm93IGhhcyBzdGF0ZSwgc28gb25lIHJlYWxseSBuZWVkcyBhIG5ldyBpbnN0YW5jZSBm b3IKKyAgICAgICAgZWFjaCB0ZXN0LgorCisgICAgICAgIE5vdGUgdGhhdCB0aGlzIGFsc28gbGF5 cyBzb21lIHNpbXBsZSBncm91bmR3b3JrIGZvciBiZWluZyBhYmxlIHRvIHVzZQorICAgICAgICBh IE1vY2tIb3N0IGluIHRoZSB0ZXN0cy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNj L3Rlc3RfY29udmVydGVyLnB5OgorICAgICAgICAoY29udmVydF9mb3Jfd2Via2l0KToKKyAgICAg ICAgKF9XM0NUZXN0Q29udmVydGVyKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLl9faW5p dF9fKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLm91dHB1dCk6CisgICAgICAgIChfVzND VGVzdENvbnZlcnRlci5hZGRfd2Via2l0X3ByZWZpeF90b191bnByZWZpeGVkX3Byb3BlcnRpZXMp OgorICAgICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIuY29udmVydF9zdHlsZV9kYXRhKToKKyAgICAg ICAgKF9XM0NUZXN0Q29udmVydGVyLmNvbnZlcnRfYXR0cmlidXRlc19pZl9uZWVkZWQpOgorICAg ICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIuaGFuZGxlX3N0YXJ0dGFnKToKKyAgICAgICAgKF9XM0NU ZXN0Q29udmVydGVyLmhhbmRsZV9lbmR0YWcpOgorICAgICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIu aGFuZGxlX3N0YXJ0ZW5kdGFnKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmhhbmRsZV9k YXRhKToKKyAgICAgICAgKF9XM0NUZXN0Q29udmVydGVyLmhhbmRsZV9lbnRpdHlyZWYpOgorICAg ICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIuaGFuZGxlX2NoYXJyZWYpOgorICAgICAgICAoX1czQ1Rl c3RDb252ZXJ0ZXIuaGFuZGxlX2NvbW1lbnQpOgorICAgICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIu aGFuZGxlX2RlY2wpOgorICAgICAgICAoX1czQ1Rlc3RDb252ZXJ0ZXIuaGFuZGxlX3BpKToKKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZlcnRlcl91bml0dGVzdC5weToK KyAgICAgICAgKFczQ1Rlc3RDb252ZXJ0ZXJUZXN0KToKKyAgICAgICAgKFczQ1Rlc3RDb252ZXJ0 ZXJUZXN0LmZha2VfZGlyX3BhdGgpOgorICAgICAgICAoVzNDVGVzdENvbnZlcnRlclRlc3QudGVz dF9yZWFkX3ByZWZpeGVkX3Byb3BlcnR5X2xpc3QpOgorICAgICAgICAodmVyaWZ5X25vX2NvbnZl cnNpb25faGFwcGVuZWQpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1w b3J0ZXIucHk6CisgICAgICAgIChUZXN0SW1wb3J0ZXIuaW1wb3J0X3Rlc3RzKToKKwogMjAxMy0w OC0yNiAgWmFuIERvYmVyc2VrICA8emRvYmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dU S10gSW5jbHVkZSBtb3N0IG9mIHRoZSBXZWJLaXQyIHVuaXQgdGVzdHMgaW50byB0aGUgYnVpbGQg YW5kIHRlc3RpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3Rf Y29udmVydGVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIu cHkKaW5kZXggODExNDY5NzJiMGViZWI1NWQ3NzEwMzlkMzFjZjIzZmQyMmNlMDMzMC4uMmJiMDQ1 NmYzNGI3ZWVkOGQwZWYxMjVlMGE0NTVkZjkwMjE5YTk5NyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS93M2MvdGVzdF9jb252ZXJ0ZXIucHkKQEAgLTMyLDI4ICszMiw1NiBAQCBpbXBvcnQg cmUKIAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAogZnJvbSB3ZWJraXRw eS5jb21tb24ud2Via2l0X2ZpbmRlciBpbXBvcnQgV2ViS2l0RmluZGVyCi1mcm9tIHdlYmtpdHB5 LnRoaXJkcGFydHkuQmVhdXRpZnVsU291cCBpbXBvcnQgQmVhdXRpZnVsU291cCwgVGFnCi0KK2Zy b20gSFRNTFBhcnNlciBpbXBvcnQgSFRNTFBhcnNlcgogCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dn ZXIoX19uYW1lX18pCiAKIAotY2xhc3MgVzNDVGVzdENvbnZlcnRlcihvYmplY3QpOgorZGVmIGNv bnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWUsIGhvc3Q9SG9zdCgpKToKKyAgICAi IiIgQ29udmVydHMgYSBmaWxlJ3MgfGNvbnRlbnRzfCBzbyBpdCB3aWxsIGZ1bmN0aW9uIGNvcnJl Y3RseSBpbiBpdHMgfG5ld19wYXRofCBpbiBXZWJraXQuCisKKyAgICBSZXR1cm5zIHRoZSBsaXN0 IG9mIG1vZGlmaWVkIHByb3BlcnRpZXMgYW5kIHRoZSBtb2RpZmllZCB0ZXh0IGlmIHRoZSBmaWxl IHdhcyBtb2RpZmVkLCBOb25lIG90aGVyd2lzZS4iIiIKKyAgICBjb250ZW50cyA9IGhvc3QuZmls ZXN5c3RlbS5yZWFkX2JpbmFyeV9maWxlKGZpbGVuYW1lKQorICAgIGNvbnZlcnRlciA9IF9XM0NU ZXN0Q29udmVydGVyKG5ld19wYXRoLCBmaWxlbmFtZSwgaG9zdCkKKyAgICBpZiBmaWxlbmFtZS5l bmRzd2l0aCgnLmNzcycpOgorICAgICAgICByZXR1cm4gY29udmVydGVyLmFkZF93ZWJraXRfcHJl Zml4X3RvX3VucHJlZml4ZWRfcHJvcGVydGllcyhjb250ZW50cykKKyAgICBlbHNlOgorICAgICAg ICBjb252ZXJ0ZXIuZmVlZChjb250ZW50cykKKyAgICAgICAgY29udmVydGVyLmNsb3NlKCkKKyAg ICAgICAgcmV0dXJuIGNvbnZlcnRlci5vdXRwdXQoKQorCiAKLSAgICBkZWYgX19pbml0X18oc2Vs Zik6Ci0gICAgICAgIHNlbGYuX2hvc3QgPSBIb3N0KCkKK2NsYXNzIF9XM0NUZXN0Q29udmVydGVy KEhUTUxQYXJzZXIpOgorICAgIGRlZiBfX2luaXRfXyhzZWxmLCBuZXdfcGF0aCwgZmlsZW5hbWUs IGhvc3Q9SG9zdCgpKToKKyAgICAgICAgSFRNTFBhcnNlci5fX2luaXRfXyhzZWxmKQorCisgICAg ICAgIHNlbGYuX2hvc3QgPSBob3N0CiAgICAgICAgIHNlbGYuX2ZpbGVzeXN0ZW0gPSBzZWxmLl9o b3N0LmZpbGVzeXN0ZW0KICAgICAgICAgc2VsZi5fd2Via2l0X3Jvb3QgPSBXZWJLaXRGaW5kZXIo c2VsZi5fZmlsZXN5c3RlbSkud2Via2l0X2Jhc2UoKQogCisgICAgICAgIHNlbGYuY29udmVydGVk X2RhdGEgPSBbXQorICAgICAgICBzZWxmLmNvbnZlcnRlZF9wcm9wZXJ0aWVzID0gW10KKyAgICAg ICAgc2VsZi5pbl9zdHlsZV90YWcgPSBGYWxzZQorICAgICAgICBzZWxmLnN0eWxlX2RhdGEgPSBb XQorICAgICAgICBzZWxmLmZpbGVuYW1lID0gZmlsZW5hbWUKKworICAgICAgICByZXNvdXJjZXNf cGF0aCA9IHNlbGYucGF0aF9mcm9tX3dlYmtpdF9yb290KCdMYXlvdXRUZXN0cycsICdyZXNvdXJj ZXMnKQorICAgICAgICByZXNvdXJjZXNfcmVscGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVscGF0 aChyZXNvdXJjZXNfcGF0aCwgbmV3X3BhdGgpCisgICAgICAgIHNlbGYubmV3X3Rlc3RfaGFybmVz c19wYXRoID0gcmVzb3VyY2VzX3JlbHBhdGgKKwogICAgICAgICAjIFRoZXNlIHNldHRpbmdzIG1p Z2h0IHZhcnkgYmV0d2VlbiBXZWJLaXQgYW5kIEJsaW5rCiAgICAgICAgIHNlbGYuX2Nzc19wcm9w ZXJ0eV9maWxlID0gc2VsZi5wYXRoX2Zyb21fd2Via2l0X3Jvb3QoJ1NvdXJjZScsICdXZWJDb3Jl JywgJ2NzcycsICdDU1NQcm9wZXJ0eU5hbWVzLmluJykKICAgICAgICAgc2VsZi5fY3NzX3Byb3Bl cnR5X3NwbGl0X3N0cmluZyA9ICc9JwogCi0gICAgICAgIHNlbGYucHJlZml4ZWRfcHJvcGVydGll cyA9IHNlbGYucmVhZF93ZWJraXRfcHJlZml4ZWRfY3NzX3Byb3BlcnR5X2xpc3QoKQorICAgICAg ICBzZWxmLnRlc3RfaGFybmVzc19yZSA9IHJlLmNvbXBpbGUoJy9yZXNvdXJjZXMvdGVzdGhhcm5l c3MnKQogCisgICAgICAgIHNlbGYucHJlZml4ZWRfcHJvcGVydGllcyA9IHNlbGYucmVhZF93ZWJr aXRfcHJlZml4ZWRfY3NzX3Byb3BlcnR5X2xpc3QoKQogICAgICAgICBwcm9wX3JlZ2V4ID0gJyhb XHN7XXxeKSgnICsgInwiLmpvaW4ocHJvcC5yZXBsYWNlKCctd2Via2l0LScsICcnKSBmb3IgcHJv cCBpbiBzZWxmLnByZWZpeGVkX3Byb3BlcnRpZXMpICsgJykoXHMrOnw6KScKICAgICAgICAgc2Vs Zi5wcm9wX3JlID0gcmUuY29tcGlsZShwcm9wX3JlZ2V4KQogCisgICAgZGVmIG91dHB1dChzZWxm KToKKyAgICAgICAgcmV0dXJuIChzZWxmLmNvbnZlcnRlZF9wcm9wZXJ0aWVzLCAnJy5qb2luKHNl bGYuY29udmVydGVkX2RhdGEpKQorCiAgICAgZGVmIHBhdGhfZnJvbV93ZWJraXRfcm9vdChzZWxm LCAqY29tcHMpOgogICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5hYnNwYXRoKHNlbGYu X2ZpbGVzeXN0ZW0uam9pbihzZWxmLl93ZWJraXRfcm9vdCwgKmNvbXBzKSkKIApAQCAtNzgsMTA0 ICsxMDYsNyBAQCBjbGFzcyBXM0NUZXN0Q29udmVydGVyKG9iamVjdCk6CiAgICAgICAgICMgSWdu b3JlIGFueSBwcmVmaXhlZCBwcm9wZXJ0aWVzIGZvciB3aGljaCBhbiB1bnByZWZpeGVkIHZlcnNp b24gaXMgc3VwcG9ydGVkCiAgICAgICAgIHJldHVybiBbcHJvcCBmb3IgcHJvcCBpbiBwcmVmaXhl ZF9wcm9wZXJ0aWVzIGlmIHByb3Agbm90IGluIHVucHJlZml4ZWRfcHJvcGVydGllc10KIAotICAg IGRlZiBjb252ZXJ0X2Zvcl93ZWJraXQoc2VsZiwgbmV3X3BhdGgsIGZpbGVuYW1lKToKLSAgICAg ICAgIiIiIENvbnZlcnRzIGEgZmlsZSdzIHxjb250ZW50c3wgc28gaXQgd2lsbCBmdW5jdGlvbiBj b3JyZWN0bHkgaW4gaXRzIHxuZXdfcGF0aHwgaW4gV2Via2l0LgotCi0gICAgICAgIFJldHVybnMg dGhlIGxpc3Qgb2YgbW9kaWZpZWQgcHJvcGVydGllcyBhbmQgdGhlIG1vZGlmaWVkIHRleHQgaWYg dGhlIGZpbGUgd2FzIG1vZGlmZWQsIE5vbmUgb3RoZXJ3aXNlLiIiIgotICAgICAgICBjb250ZW50 cyA9IHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmlsZShmaWxlbmFtZSkKLSAgICAgICAg aWYgZmlsZW5hbWUuZW5kc3dpdGgoJy5jc3MnKToKLSAgICAgICAgICAgIHJldHVybiBzZWxmLmNv bnZlcnRfY3NzKGNvbnRlbnRzLCBmaWxlbmFtZSkKLSAgICAgICAgcmV0dXJuIHNlbGYuY29udmVy dF9odG1sKG5ld19wYXRoLCBjb250ZW50cywgZmlsZW5hbWUpCi0KLSAgICBkZWYgY29udmVydF9j c3Moc2VsZiwgY29udGVudHMsIGZpbGVuYW1lKToKLSAgICAgICAgcmV0dXJuIHNlbGYuYWRkX3dl YmtpdF9wcmVmaXhfdG9fdW5wcmVmaXhlZF9wcm9wZXJ0aWVzKGNvbnRlbnRzLCBmaWxlbmFtZSkK LQotICAgIGRlZiBjb252ZXJ0X2h0bWwoc2VsZiwgbmV3X3BhdGgsIGNvbnRlbnRzLCBmaWxlbmFt ZSk6Ci0gICAgICAgIGRvYyA9IEJlYXV0aWZ1bFNvdXAoY29udGVudHMpCi0gICAgICAgIGRpZF9t b2RpZnlfcGF0aHMgPSBzZWxmLmNvbnZlcnRfdGVzdGhhcm5lc3NfcGF0aHMoZG9jLCBuZXdfcGF0 aCwgZmlsZW5hbWUpCi0gICAgICAgIGNvbnZlcnRlZF9wcm9wZXJ0aWVzX2FuZF9jb250ZW50ID0g c2VsZi5jb252ZXJ0X3ByZWZpeGVkX3Byb3BlcnRpZXMoZG9jLCBmaWxlbmFtZSkKLSAgICAgICAg cmV0dXJuIGNvbnZlcnRlZF9wcm9wZXJ0aWVzX2FuZF9jb250ZW50IGlmIChkaWRfbW9kaWZ5X3Bh dGhzIG9yIGNvbnZlcnRlZF9wcm9wZXJ0aWVzX2FuZF9jb250ZW50WzBdKSBlbHNlIE5vbmUKLQot ICAgIGRlZiBjb252ZXJ0X3Rlc3RoYXJuZXNzX3BhdGhzKHNlbGYsIGRvYywgbmV3X3BhdGgsIGZp bGVuYW1lKToKLSAgICAgICAgIiIiIFVwZGF0ZSBsaW5rcyB0byB0ZXN0aGFybmVzcy5qcyBpbiB0 aGUgQmVhdXRpZnVsU291cCB8ZG9jfCB0byBwb2ludCB0byB0aGUgY29weSBpbiB8bmV3X3BhdGh8 LgotCi0gICAgICAgIFJldHVybnMgd2hldGhlciB0aGUgZG9jdW1lbnQgd2FzIG1vZGlmaWVkLiIi IgotCi0gICAgICAgICMgTG9vayBmb3IgdGhlIFczQy1zdHlsZSBwYXRoIHRvIGFueSB0ZXN0aGFy bmVzcyBmaWxlcyAtIHNjcmlwdHMgKC5qcykgb3IgbGlua3MgKC5jc3MpCi0gICAgICAgIHBhdHRl cm4gPSByZS5jb21waWxlKCcvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzJykKLSAgICAgICAgc2NyaXB0 X3RhZ3MgPSBkb2MuZmluZEFsbChzcmM9cGF0dGVybikKLSAgICAgICAgbGlua190YWdzID0gZG9j LmZpbmRBbGwoaHJlZj1wYXR0ZXJuKQotICAgICAgICB0ZXN0aGFybmVzc190YWdzID0gc2NyaXB0 X3RhZ3MgKyBsaW5rX3RhZ3MKLQotICAgICAgICBpZiBub3QgdGVzdGhhcm5lc3NfdGFnczoKLSAg ICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAgICAgIHJlc291cmNlc19wYXRoID0gc2VsZi5w YXRoX2Zyb21fd2Via2l0X3Jvb3QoJ0xheW91dFRlc3RzJywgJ3Jlc291cmNlcycpCi0gICAgICAg IHJlc291cmNlc19yZWxwYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5yZWxwYXRoKHJlc291cmNlc19w YXRoLCBuZXdfcGF0aCkKLQotICAgICAgICBmb3IgdGFnIGluIHRlc3RoYXJuZXNzX3RhZ3M6Ci0g ICAgICAgICAgICAjIEZJWE1FOiBXZSBuZWVkIHRvIGhhbmRsZSBpbWcsIGF1ZGlvLCB2aWRlbyB0 YWdzIGFsc28uCi0gICAgICAgICAgICBhdHRyID0gJ3NyYycKLSAgICAgICAgICAgIGlmIHRhZy5u YW1lICE9ICdzY3JpcHQnOgotICAgICAgICAgICAgICAgIGF0dHIgPSAnaHJlZicKLQotICAgICAg ICAgICAgaWYgbm90IGF0dHIgaW4gdGFnLmF0dHJNYXA6Ci0gICAgICAgICAgICAgICAgIyBGSVhN RTogRmlndXJlIG91dCB3aGF0IHRvIGRvIHcvIGludmFsaWQgdGFncy4gRm9yIG5vdywgd2UgcmV0 dXJuIEZhbHNlCi0gICAgICAgICAgICAgICAgIyBhbmQgbGVhdmUgdGhlIGRvY3VtZW50IHVubW9k aWZpZWQsIHdoaWNoIG1lYW5zIHRoYXQgaXQnbGwgcHJvYmFibHkgZmFpbCB0byBydW4uCi0gICAg ICAgICAgICAgICAgX2xvZy5lcnJvcigiTWlzc2luZyBhbiBhdHRyIGluICVzIiAlIGZpbGVuYW1l KQotICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAgICAgICAgICBvbGRfcGF0aCA9 IHRhZ1thdHRyXQotICAgICAgICAgICAgbmV3X3RhZyA9IFRhZyhkb2MsIHRhZy5uYW1lLCB0YWcu YXR0cnMpCi0gICAgICAgICAgICBuZXdfdGFnW2F0dHJdID0gcmUuc3ViKHBhdHRlcm4sIHJlc291 cmNlc19yZWxwYXRoICsgJy90ZXN0aGFybmVzcycsIG9sZF9wYXRoKQotCi0gICAgICAgICAgICBz ZWxmLnJlcGxhY2VfdGFnKHRhZywgbmV3X3RhZykKLQotICAgICAgICByZXR1cm4gVHJ1ZQotCi0g ICAgZGVmIGNvbnZlcnRfcHJlZml4ZWRfcHJvcGVydGllcyhzZWxmLCBkb2MsIGZpbGVuYW1lKToK LSAgICAgICAgIiIiIFNlYXJjaGVzIGEgQmVhdXRpZnVsU291cCB8ZG9jfCBmb3IgYW55IENTUyBw cm9wZXJ0aWVzIHJlcXVpcmluZyB0aGUgLXdlYmtpdC0gcHJlZml4IGFuZCBjb252ZXJ0cyB0aGVt LgotCi0gICAgICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgY29udmVydGVkIHByb3BlcnRpZXMgYW5k IHRoZSBtb2RpZmllZCBkb2N1bWVudCBhcyBhIHN0cmluZyAiIiIKLQotICAgICAgICBjb252ZXJ0 ZWRfcHJvcGVydGllcyA9IFtdCi0KLSAgICAgICAgIyBMb29rIGZvciBpbmxpbmUgYW5kIGRvY3Vt ZW50IHN0eWxlcy4KLSAgICAgICAgaW5saW5lX3N0eWxlcyA9IGRvYy5maW5kQWxsKHN0eWxlPXJl LmNvbXBpbGUoJy4qJykpCi0gICAgICAgIHN0eWxlX3RhZ3MgPSBkb2MuZmluZEFsbCgnc3R5bGUn KQotICAgICAgICBhbGxfc3R5bGVzID0gaW5saW5lX3N0eWxlcyArIHN0eWxlX3RhZ3MKLQotICAg ICAgICBmb3IgdGFnIGluIGFsbF9zdHlsZXM6Ci0KLSAgICAgICAgICAgICMgR2V0IHRoZSB0ZXh0 IHdoZXRoZXIgaW4gYSBzdHlsZSB0YWcgb3Igc3R5bGUgYXR0cmlidXRlLgotICAgICAgICAgICAg c3R5bGVfdGV4dCA9ICcnCi0gICAgICAgICAgICBpZiB0YWcubmFtZSA9PSAnc3R5bGUnOgotICAg ICAgICAgICAgICAgIGlmIG5vdCB0YWcuY29udGVudHM6Ci0gICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlCi0gICAgICAgICAgICAgICAgc3R5bGVfdGV4dCA9IHRhZy5jb250ZW50c1swXQotICAg ICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBzdHlsZV90ZXh0ID0gdGFnWydzdHlsZSdd Ci0KLSAgICAgICAgICAgIHVwZGF0ZWRfc3R5bGVfdGV4dCA9IHNlbGYuYWRkX3dlYmtpdF9wcmVm aXhfdG9fdW5wcmVmaXhlZF9wcm9wZXJ0aWVzKHN0eWxlX3RleHQsIGZpbGVuYW1lKQotCi0gICAg ICAgICAgICAjIFJld3JpdGUgdGFnIG9ubHkgaWYgY2hhbmdlcyB3ZXJlIG1hZGUuCi0gICAgICAg ICAgICBpZiB1cGRhdGVkX3N0eWxlX3RleHRbMF06Ci0gICAgICAgICAgICAgICAgY29udmVydGVk X3Byb3BlcnRpZXMuZXh0ZW5kKGxpc3QodXBkYXRlZF9zdHlsZV90ZXh0WzBdKSkKLQotICAgICAg ICAgICAgICAgIG5ld190YWcgPSBUYWcoZG9jLCB0YWcubmFtZSwgdGFnLmF0dHJzKQotICAgICAg ICAgICAgICAgIG5ld190YWcuaW5zZXJ0KDAsIHVwZGF0ZWRfc3R5bGVfdGV4dFsxXSkKLQotICAg ICAgICAgICAgICAgIHNlbGYucmVwbGFjZV90YWcodGFnLCBuZXdfdGFnKQotCi0gICAgICAgICMg RklYTUU6IERvaW5nIHRoZSByZXBsYWNlIGluIHRoZSBwYXJzZWQgZG9jdW1lbnQgYW5kIHRoZW4g d3JpdGluZyBpdCBiYWNrIG91dAotICAgICAgICAjIGlzIG5vcm1hbGl6aW5nIHRoZSBIVE1MLCB3 aGljaCBtYXkgaW4gZmFjdCBhbHRlciB0aGUgaW50ZW50IG9mIHNvbWUgdGVzdHMuCi0gICAgICAg ICMgV2Ugc2hvdWxkIHByb2JhYmx5IGVpdGhlciBqdXN0IGRvIGJhc2ljIHN0cmluZy1yZXBsYWNl cywgb3IgaGF2ZSBzb21lIG90aGVyCi0gICAgICAgICMgd2F5IG9mIGZsYWdnaW5nIHRlc3RzIHRo YXQgYXJlIHNlbnNpdGl2ZSB0byBiZWluZyByZXdyaXR0ZW4uCi0gICAgICAgICMgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExOTE1OQotCi0gICAgICAgIHJldHVybiAo Y29udmVydGVkX3Byb3BlcnRpZXMsIGRvYy5wcmV0dGlmeSgpKQotCi0gICAgZGVmIGFkZF93ZWJr aXRfcHJlZml4X3RvX3VucHJlZml4ZWRfcHJvcGVydGllcyhzZWxmLCB0ZXh0LCBmaWxlbmFtZSk6 CisgICAgZGVmIGFkZF93ZWJraXRfcHJlZml4X3RvX3VucHJlZml4ZWRfcHJvcGVydGllcyhzZWxm LCB0ZXh0KToKICAgICAgICAgIiIiIFNlYXJjaGVzIHx0ZXh0fCBmb3IgaW5zdGFuY2VzIG9mIHBy b3BlcnRpZXMgcmVxdWlyaW5nIHRoZSAtd2Via2l0LSBwcmVmaXggYW5kIGFkZHMgdGhlIHByZWZp eCB0byB0aGVtLgogCiAgICAgICAgIFJldHVybnMgdGhlIGxpc3Qgb2YgY29udmVydGVkIHByb3Bl cnRpZXMgYW5kIHRoZSBtb2RpZmllZCB0ZXh0LiIiIgpAQCAtMTkzLDkgKzEyNCw2NSBAQCBjbGFz cyBXM0NUZXN0Q29udmVydGVyKG9iamVjdCk6CiAgICAgICAgICAgICBfbG9nLmluZm8oJyAgY29u dmVydGluZyAlcycsIHByb3ApCiAKICAgICAgICAgIyBGSVhNRTogSGFuZGxlIHRoZSBKUyB2ZXJz aW9ucyBvZiB0aGVzZSBwcm9wZXJ0aWVzIGFuZCBHZXRDb21wdXRlZFN0eWxlLCB0b28uCi0gICAg ICAgIHJldHVybiAoY29udmVydGVkX3Byb3BlcnRpZXMsIHRleHQpCisgICAgICAgIHJldHVybiAo Y29udmVydGVkX3Byb3BlcnRpZXMsICcnLmpvaW4odGV4dF9jaHVua3MpKQorCisgICAgZGVmIGNv bnZlcnRfc3R5bGVfZGF0YShzZWxmLCBkYXRhKToKKyAgICAgICAgY29udmVydGVkID0gc2VsZi5h ZGRfd2Via2l0X3ByZWZpeF90b191bnByZWZpeGVkX3Byb3BlcnRpZXMoZGF0YSkKKyAgICAgICAg aWYgY29udmVydGVkWzBdOgorICAgICAgICAgICAgc2VsZi5jb252ZXJ0ZWRfcHJvcGVydGllcy5l eHRlbmQobGlzdChjb252ZXJ0ZWRbMF0pKQorICAgICAgICByZXR1cm4gY29udmVydGVkWzFdCisK KyAgICBkZWYgY29udmVydF9hdHRyaWJ1dGVzX2lmX25lZWRlZChzZWxmLCB0YWcsIGF0dHJzKToK KyAgICAgICAgY29udmVydGVkID0gc2VsZi5nZXRfc3RhcnR0YWdfdGV4dCgpCisgICAgICAgIGlm IHRhZyBpbiAoJ3NjcmlwdCcsICdsaW5rJyk6CisgICAgICAgICAgICBhdHRyX25hbWUgPSAnc3Jj JworICAgICAgICAgICAgaWYgdGFnICE9ICdzY3JpcHQnOgorICAgICAgICAgICAgICAgIGF0dHJf bmFtZSA9ICdocmVmJworICAgICAgICAgICAgZm9yIGF0dHIgaW4gYXR0cnM6CisgICAgICAgICAg ICAgICAgaWYgYXR0clswXSA9PSBhdHRyX25hbWU6CisgICAgICAgICAgICAgICAgICAgIG5ld19w YXRoID0gcmUuc3ViKHNlbGYudGVzdF9oYXJuZXNzX3JlLCBzZWxmLm5ld190ZXN0X2hhcm5lc3Nf cGF0aCArICcvdGVzdGhhcm5lc3MnLCBhdHRyWzFdKQorICAgICAgICAgICAgICAgICAgICBjb252 ZXJ0ZWQgPSByZS5zdWIoYXR0clsxXSwgbmV3X3BhdGgsIGNvbnZlcnRlZCkKKworICAgICAgICBm b3IgYXR0ciBpbiBhdHRyczoKKyAgICAgICAgICAgIGlmIGF0dHJbMF0gPT0gJ3N0eWxlJzoKKyAg ICAgICAgICAgICAgICBuZXdfc3R5bGUgPSBzZWxmLmNvbnZlcnRfc3R5bGVfZGF0YShhdHRyWzFd KQorICAgICAgICAgICAgICAgIGNvbnZlcnRlZCA9IHJlLnN1YihhdHRyWzFdLCBuZXdfc3R5bGUs IGNvbnZlcnRlZCkKKworICAgICAgICBzZWxmLmNvbnZlcnRlZF9kYXRhLmFwcGVuZChjb252ZXJ0 ZWQpCisKKyAgICBkZWYgaGFuZGxlX3N0YXJ0dGFnKHNlbGYsIHRhZywgYXR0cnMpOgorICAgICAg ICBpZiB0YWcgPT0gJ3N0eWxlJzoKKyAgICAgICAgICAgIHNlbGYuaW5fc3R5bGVfdGFnID0gVHJ1 ZQorICAgICAgICBzZWxmLmNvbnZlcnRfYXR0cmlidXRlc19pZl9uZWVkZWQodGFnLCBhdHRycykK KworICAgIGRlZiBoYW5kbGVfZW5kdGFnKHNlbGYsIHRhZyk6CisgICAgICAgIGlmIHRhZyA9PSAn c3R5bGUnOgorICAgICAgICAgICAgc2VsZi5jb252ZXJ0ZWRfZGF0YS5hcHBlbmQoc2VsZi5jb252 ZXJ0X3N0eWxlX2RhdGEoJycuam9pbihzZWxmLnN0eWxlX2RhdGEpKSkKKyAgICAgICAgICAgIHNl bGYuaW5fc3R5bGVfdGFnID0gRmFsc2UKKyAgICAgICAgICAgIHNlbGYuc3R5bGVfZGF0YSA9IFtd CisgICAgICAgIHNlbGYuY29udmVydGVkX2RhdGEuZXh0ZW5kKFsnPC8nLCB0YWcsICc+J10pCisK KyAgICBkZWYgaGFuZGxlX3N0YXJ0ZW5kdGFnKHNlbGYsIHRhZywgYXR0cnMpOgorICAgICAgICBz ZWxmLmNvbnZlcnRfYXR0cmlidXRlc19pZl9uZWVkZWQodGFnLCBhdHRycykKKworICAgIGRlZiBo YW5kbGVfZGF0YShzZWxmLCBkYXRhKToKKyAgICAgICAgaWYgc2VsZi5pbl9zdHlsZV90YWc6Cisg ICAgICAgICAgICBzZWxmLnN0eWxlX2RhdGEuYXBwZW5kKGRhdGEpCisgICAgICAgIGVsc2U6Cisg ICAgICAgICAgICBzZWxmLmNvbnZlcnRlZF9kYXRhLmFwcGVuZChkYXRhKQorCisgICAgZGVmIGhh bmRsZV9lbnRpdHlyZWYoc2VsZiwgbmFtZSk6CisgICAgICAgIHNlbGYuY29udmVydGVkX2RhdGEu ZXh0ZW5kKFsnJicsIG5hbWUsICc7J10pCisKKyAgICBkZWYgaGFuZGxlX2NoYXJyZWYoc2VsZiwg bmFtZSk6CisgICAgICAgIHNlbGYuY29udmVydGVkX2RhdGEuZXh0ZW5kKFsnJiMnLCBuYW1lLCAn OyddKQorCisgICAgZGVmIGhhbmRsZV9jb21tZW50KHNlbGYsIGRhdGEpOgorICAgICAgICBzZWxm LmNvbnZlcnRlZF9kYXRhLmV4dGVuZChbJzwhLS0gJywgZGF0YSwgJyAtLT4nXSkKKworICAgIGRl ZiBoYW5kbGVfZGVjbChzZWxmLCBkZWNsKToKKyAgICAgICAgc2VsZi5jb252ZXJ0ZWRfZGF0YS5l eHRlbmQoWyc8IScsIGRlY2wsICc+J10pCisKKyAgICBkZWYgaGFuZGxlX3BpKHNlbGYsIGRhdGEp OgorICAgICAgICBzZWxmLmNvbnZlcnRlZF9kYXRhLmV4dGVuZChbJzw/JywgZGF0YSwgJz4nXSkK IAotICAgIGRlZiByZXBsYWNlX3RhZyhzZWxmLCBvbGRfdGFnLCBuZXdfdGFnKToKLSAgICAgICAg aW5kZXggPSBvbGRfdGFnLnBhcmVudC5jb250ZW50cy5pbmRleChvbGRfdGFnKQotICAgICAgICBv bGRfdGFnLnBhcmVudC5pbnNlcnQoaW5kZXgsIG5ld190YWcpCi0gICAgICAgIG9sZF90YWcuZXh0 cmFjdCgpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2NvbnZl cnRlcl91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVy dGVyX3VuaXR0ZXN0LnB5CmluZGV4IDVlNzRjMmE3MmNjZmVkMzRmZDMxZGJjNDIyYWUwNDBhYzdh MGNhY2MuLmQyMGUxODljMWE5OTc0ZDgzOTU3MTMyYzhlYzgxNGY1ODNmOTlkYjggMTAwNjQ0Ci0t LSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0ZXN0LnB5 CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfY29udmVydGVyX3VuaXR0ZXN0 LnB5CkBAIC0zMSwyMyArMzEsMjkgQEAgaW1wb3J0IG9zCiBpbXBvcnQgcmUKIGltcG9ydCB1bml0 dGVzdDIgYXMgdW5pdHRlc3QKIAorZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9z dAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLm91dHB1dGNhcHR1cmUgaW1wb3J0IE91dHB1 dENhcHR1cmUKK2Zyb20gd2Via2l0cHkuY29tbW9uLndlYmtpdF9maW5kZXIgaW1wb3J0IFdlYktp dEZpbmRlcgogZnJvbSB3ZWJraXRweS50aGlyZHBhcnR5LkJlYXV0aWZ1bFNvdXAgaW1wb3J0IEJl YXV0aWZ1bFNvdXAKLWZyb20gd2Via2l0cHkudzNjLnRlc3RfY29udmVydGVyIGltcG9ydCBXM0NU ZXN0Q29udmVydGVyCi0KK2Zyb20gd2Via2l0cHkudzNjLnRlc3RfY29udmVydGVyIGltcG9ydCBf VzNDVGVzdENvbnZlcnRlcgogCiBEVU1NWV9GSUxFTkFNRSA9ICdkdW1teS5odG1sJworRFVNTVlf UEFUSCA9ICdkdW1teS90ZXN0aGFybmVzcy9wYXRoJwogCiBjbGFzcyBXM0NUZXN0Q29udmVydGVy VGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAKLSAgICBkZWYgZmFrZV9kaXJfcGF0aChzZWxmLCBj b252ZXJ0ZXIsIGRpcm5hbWUpOgotICAgICAgICByZXR1cm4gY29udmVydGVyLnBhdGhfZnJvbV93 ZWJraXRfcm9vdCgiTGF5b3V0VGVzdHMiLCAiY3NzIiwgZGlybmFtZSkKKyAgICAjIEZJWE1FOiBX aGVuIHdlIG1vdmUgdG8gdXNpbmcgYSBNb2NrSG9zdCwgdGhpcyBtZXRob2Qgc2hvdWxkIGJlIHJl bW92ZWQsIHNpbmNlCisgICAgIyAgICAgICAgdGhlbiB3ZSBjYW4ganVzdCBwYXNzIGluIGEgZHVt bXkgZGlyIHBhdGgKKyAgICBkZWYgZmFrZV9kaXJfcGF0aChzZWxmLCBkaXJuYW1lKToKKyAgICAg ICAgZmlsZXN5c3RlbSA9IEhvc3QoKS5maWxlc3lzdGVtCisgICAgICAgIHdlYmtpdF9yb290ID0g V2ViS2l0RmluZGVyKGZpbGVzeXN0ZW0pLndlYmtpdF9iYXNlKCkKKyAgICAgICAgcmV0dXJuIGZp bGVzeXN0ZW0uYWJzcGF0aChmaWxlc3lzdGVtLmpvaW4od2Via2l0X3Jvb3QsICJMYXlvdXRUZXN0 cyIsICJjc3MiLCBkaXJuYW1lKSkKIAogICAgIGRlZiB0ZXN0X3JlYWRfcHJlZml4ZWRfcHJvcGVy dHlfbGlzdChzZWxmKToKICAgICAgICAgIiIiIFRlc3RzIHRoYXQgdGhlIGN1cnJlbnQgbGlzdCBv ZiBwcm9wZXJ0aWVzIHJlcXVpcmluZyB0aGUgLXdlYmtpdC0gcHJlZml4IGxvYWQgY29ycmVjdGx5 ICIiIgogCiAgICAgICAgICMgRklYTUU6IFdlIHNob3VsZCBiZSBwYXNzaW5nIGluIGEgTW9ja0hv c3QgaGVyZSAuLi4KLSAgICAgICAgY29udmVydGVyID0gVzNDVGVzdENvbnZlcnRlcigpCisgICAg ICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVyKERVTU1ZX1BBVEgsIERVTU1ZX0ZJTEVO QU1FKQogICAgICAgICBwcm9wX2xpc3QgPSBjb252ZXJ0ZXIucHJlZml4ZWRfcHJvcGVydGllcwog ICAgICAgICBzZWxmLmFzc2VydFRydWUocHJvcF9saXN0LCAnTm8gcHJlZml4ZWQgcHJvcGVydGll cyBmb3VuZCcpCiAKQEAgLTcyLDE2ICs3OCwxOCBAQCBDT05URU5UIE9GIFRFU1QKIDwvYm9keT4K IDwvaHRtbD4KICIiIgotICAgICAgICBjb252ZXJ0ZXIgPSBXM0NUZXN0Q29udmVydGVyKCkKKyAg ICAgICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIoRFVNTVlfUEFUSCwgRFVNTVlfRklM RU5BTUUpCiAKICAgICAgICAgb2MgPSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgb2MuY2FwdHVy ZV9vdXRwdXQoKQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBjb252ZXJ0ZWQgPSBjb252ZXJ0 ZXIuY29udmVydF9odG1sKCcvbm90aGluZy90by9jb252ZXJ0JywgdGVzdF9odG1sLCBEVU1NWV9G SUxFTkFNRSkKKyAgICAgICAgICAgIGNvbnZlcnRlci5mZWVkKHRlc3RfaHRtbCkKKyAgICAgICAg ICAgIGNvbnZlcnRlci5jbG9zZSgpCisgICAgICAgICAgICBjb252ZXJ0ZWQgPSBjb252ZXJ0ZXIu b3V0cHV0KCkKICAgICAgICAgZmluYWxseToKICAgICAgICAgICAgIG9jLnJlc3RvcmVfb3V0cHV0 KCkKIAotICAgICAgICBzZWxmLnZlcmlmeV9ub19jb252ZXJzaW9uX2hhcHBlbmVkKGNvbnZlcnRl ZCkKKyAgICAgICAgc2VsZi52ZXJpZnlfbm9fY29udmVyc2lvbl9oYXBwZW5lZChjb252ZXJ0ZWQs IHRlc3RfaHRtbCkKIAogICAgIGRlZiB0ZXN0X2NvbnZlcnRfZm9yX3dlYmtpdF9oYXJuZXNzX29u bHkoc2VsZik6CiAgICAgICAgICIiIiBUZXN0cyBjb252ZXJ0X2Zvcl93ZWJraXQoKSB1c2luZyBh IGJhc2ljIEpTIHRlc3QgdGhhdCB1c2VzIHRlc3RoYXJuZXNzLmpzIG9ubHkgYW5kIGhhcyBubyBw cmVmaXhlZCBwcm9wZXJ0aWVzICIiIgpAQCAtOTEsMTAgKzk5LDExIEBAIENPTlRFTlQgT0YgVEVT VAogPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgogPC9o ZWFkPgogIiIiCi0gICAgICAgIGNvbnZlcnRlciA9IFczQ1Rlc3RDb252ZXJ0ZXIoKQotICAgICAg ICBmYWtlX2Rpcl9wYXRoID0gc2VsZi5mYWtlX2Rpcl9wYXRoKGNvbnZlcnRlciwgImhhcm5lc3Nv bmx5IikKLQotICAgICAgICBjb252ZXJ0ZWQgPSBjb252ZXJ0ZXIuY29udmVydF9odG1sKGZha2Vf ZGlyX3BhdGgsIHRlc3RfaHRtbCwgRFVNTVlfRklMRU5BTUUpCisgICAgICAgIGZha2VfZGlyX3Bh dGggPSBzZWxmLmZha2VfZGlyX3BhdGgoImhhcm5lc3Nvbmx5IikKKyAgICAgICAgY29udmVydGVy ID0gX1czQ1Rlc3RDb252ZXJ0ZXIoZmFrZV9kaXJfcGF0aCwgRFVNTVlfRklMRU5BTUUpCisgICAg ICAgIGNvbnZlcnRlci5mZWVkKHRlc3RfaHRtbCkKKyAgICAgICAgY29udmVydGVyLmNsb3NlKCkK KyAgICAgICAgY29udmVydGVkID0gY29udmVydGVyLm91dHB1dCgpCiAKICAgICAgICAgc2VsZi52 ZXJpZnlfY29udmVyc2lvbl9oYXBwZW5lZChjb252ZXJ0ZWQpCiAgICAgICAgIHNlbGYudmVyaWZ5 X3Rlc3RfaGFybmVzc19wYXRocyhjb252ZXJ0ZXIsIGNvbnZlcnRlZFsxXSwgZmFrZV9kaXJfcGF0 aCwgMSwgMSkKQEAgLTExOCwxNCArMTI3LDE2IEBAIENPTlRFTlQgT0YgVEVTVAogPC9ib2R5Pgog PC9odG1sPgogIiIiCi0gICAgICAgIGNvbnZlcnRlciA9IFczQ1Rlc3RDb252ZXJ0ZXIoKQotICAg ICAgICBmYWtlX2Rpcl9wYXRoID0gc2VsZi5mYWtlX2Rpcl9wYXRoKGNvbnZlcnRlciwgJ2hhcm5l c3NhbmRwcm9wcycpCisgICAgICAgIGZha2VfZGlyX3BhdGggPSBzZWxmLmZha2VfZGlyX3BhdGgo J2hhcm5lc3NhbmRwcm9wcycpCisgICAgICAgIGNvbnZlcnRlciA9IF9XM0NUZXN0Q29udmVydGVy KGZha2VfZGlyX3BhdGgsIERVTU1ZX0ZJTEVOQU1FKQogICAgICAgICB0ZXN0X2NvbnRlbnQgPSBz ZWxmLmdlbmVyYXRlX3Rlc3RfY29udGVudChjb252ZXJ0ZXIucHJlZml4ZWRfcHJvcGVydGllcywg MSwgdGVzdF9odG1sKQogCiAgICAgICAgIG9jID0gT3V0cHV0Q2FwdHVyZSgpCiAgICAgICAgIG9j LmNhcHR1cmVfb3V0cHV0KCkKICAgICAgICAgdHJ5OgotICAgICAgICAgICAgY29udmVydGVkID0g Y29udmVydGVyLmNvbnZlcnRfaHRtbChmYWtlX2Rpcl9wYXRoLCB0ZXN0X2NvbnRlbnRbMV0sIERV TU1ZX0ZJTEVOQU1FKQorICAgICAgICAgICAgY29udmVydGVyLmZlZWQodGVzdF9jb250ZW50WzFd KQorICAgICAgICAgICAgY29udmVydGVyLmNsb3NlKCkKKyAgICAgICAgICAgIGNvbnZlcnRlZCA9 IGNvbnZlcnRlci5vdXRwdXQoKQogICAgICAgICBmaW5hbGx5OgogICAgICAgICAgICAgb2MucmVz dG9yZV9vdXRwdXQoKQogCkBAIC0xNTMsMTQgKzE2NCwxNiBAQCBDT05URU5UIE9GIFRFU1QKIDwv Ym9keT4KIDwvaHRtbD4KICIiIgotICAgICAgICBjb252ZXJ0ZXIgPSBXM0NUZXN0Q29udmVydGVy KCkKLSAgICAgICAgZmFrZV9kaXJfcGF0aCA9IHNlbGYuZmFrZV9kaXJfcGF0aChjb252ZXJ0ZXIs ICdoYXJuZXNzYW5kcHJvcHMnKQorICAgICAgICBmYWtlX2Rpcl9wYXRoID0gc2VsZi5mYWtlX2Rp cl9wYXRoKCdoYXJuZXNzYW5kcHJvcHMnKQorICAgICAgICBjb252ZXJ0ZXIgPSBfVzNDVGVzdENv bnZlcnRlcihmYWtlX2Rpcl9wYXRoLCBEVU1NWV9GSUxFTkFNRSkKIAogICAgICAgICBvYyA9IE91 dHB1dENhcHR1cmUoKQogICAgICAgICBvYy5jYXB0dXJlX291dHB1dCgpCiAgICAgICAgIHRyeToK ICAgICAgICAgICAgIHRlc3RfY29udGVudCA9IHNlbGYuZ2VuZXJhdGVfdGVzdF9jb250ZW50KGNv bnZlcnRlci5wcmVmaXhlZF9wcm9wZXJ0aWVzLCAyLCB0ZXN0X2h0bWwpCi0gICAgICAgICAgICBj b252ZXJ0ZWQgPSBjb252ZXJ0ZXIuY29udmVydF9odG1sKGZha2VfZGlyX3BhdGgsIHRlc3RfY29u dGVudFsxXSwgRFVNTVlfRklMRU5BTUUpCisgICAgICAgICAgICBjb252ZXJ0ZXIuZmVlZCh0ZXN0 X2NvbnRlbnRbMV0pCisgICAgICAgICAgICBjb252ZXJ0ZXIuY2xvc2UoKQorICAgICAgICAgICAg Y29udmVydGVkID0gY29udmVydGVyLm91dHB1dCgpCiAgICAgICAgIGZpbmFsbHk6CiAgICAgICAg ICAgICBvYy5yZXN0b3JlX291dHB1dCgpCiAKQEAgLTE3NywyMCArMTkwLDIwIEBAIENPTlRFTlQg T0YgVEVTVAogPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVzdGhhcm5lc3NyZXBvcnQuanMiPjwv c2NyaXB0PgogPC9oZWFkPgogIiIiCi0gICAgICAgIGNvbnZlcnRlciA9IFczQ1Rlc3RDb252ZXJ0 ZXIoKQorICAgICAgICBmYWtlX2Rpcl9wYXRoID0gc2VsZi5mYWtlX2Rpcl9wYXRoKCd0ZXN0aGFy bmVzc3BhdGhzJykKKyAgICAgICAgY29udmVydGVyID0gX1czQ1Rlc3RDb252ZXJ0ZXIoZmFrZV9k aXJfcGF0aCwgRFVNTVlfRklMRU5BTUUpCiAKLSAgICAgICAgZmFrZV9kaXJfcGF0aCA9IHNlbGYu ZmFrZV9kaXJfcGF0aChjb252ZXJ0ZXIsICd0ZXN0aGFybmVzc3BhdGhzJykKLQotICAgICAgICBk b2MgPSBCZWF1dGlmdWxTb3VwKHRlc3RfaHRtbCkKICAgICAgICAgb2MgPSBPdXRwdXRDYXB0dXJl KCkKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQogICAgICAgICB0cnk6Ci0gICAgICAgICAg ICBjb252ZXJ0ZWQgPSBjb252ZXJ0ZXIuY29udmVydF90ZXN0aGFybmVzc19wYXRocyhkb2MsIGZh a2VfZGlyX3BhdGgsIERVTU1ZX0ZJTEVOQU1FKQorICAgICAgICAgICAgY29udmVydGVyLmZlZWQo dGVzdF9odG1sKQorICAgICAgICAgICAgY29udmVydGVyLmNsb3NlKCkKKyAgICAgICAgICAgIGNv bnZlcnRlZCA9IGNvbnZlcnRlci5vdXRwdXQoKQogICAgICAgICBmaW5hbGx5OgogICAgICAgICAg ICAgb2MucmVzdG9yZV9vdXRwdXQoKQogCiAgICAgICAgIHNlbGYudmVyaWZ5X2NvbnZlcnNpb25f aGFwcGVuZWQoY29udmVydGVkKQotICAgICAgICBzZWxmLnZlcmlmeV90ZXN0X2hhcm5lc3NfcGF0 aHMoY29udmVydGVyLCBkb2MsIGZha2VfZGlyX3BhdGgsIDIsIDEpCisgICAgICAgIHNlbGYudmVy aWZ5X3Rlc3RfaGFybmVzc19wYXRocyhjb252ZXJ0ZXIsIGNvbnZlcnRlZFsxXSwgZmFrZV9kaXJf cGF0aCwgMiwgMSkKIAogICAgIGRlZiB0ZXN0X2NvbnZlcnRfcHJlZml4ZWRfcHJvcGVydGllcyhz ZWxmKToKICAgICAgICAgIiIiIFRlc3RzIGNvbnZlcnRfcHJlZml4ZWRfcHJvcGVydGllcygpIGZp bGUgdGhhdCBoYXMgMjAgcHJvcGVydGllcyByZXF1aXJpbmcgdGhlIC13ZWJraXQtIHByZWZpeDoK QEAgLTI1NSwxNCArMjY4LDE1IEBAIENPTlRFTlQgT0YgVEVTVAogXV0+PC9zdHlsZT4KIDwvaHRt bD4KICIiIgotICAgICAgICBjb252ZXJ0ZXIgPSBXM0NUZXN0Q29udmVydGVyKCkKLQorICAgICAg ICBjb252ZXJ0ZXIgPSBfVzNDVGVzdENvbnZlcnRlcihEVU1NWV9QQVRILCBEVU1NWV9GSUxFTkFN RSkKICAgICAgICAgdGVzdF9jb250ZW50ID0gc2VsZi5nZW5lcmF0ZV90ZXN0X2NvbnRlbnQoY29u dmVydGVyLnByZWZpeGVkX3Byb3BlcnRpZXMsIDIwLCB0ZXN0X2h0bWwpCiAKICAgICAgICAgb2Mg PSBPdXRwdXRDYXB0dXJlKCkKICAgICAgICAgb2MuY2FwdHVyZV9vdXRwdXQoKQogICAgICAgICB0 cnk6Ci0gICAgICAgICAgICBjb252ZXJ0ZWQgPSBjb252ZXJ0ZXIuY29udmVydF9wcmVmaXhlZF9w cm9wZXJ0aWVzKEJlYXV0aWZ1bFNvdXAodGVzdF9jb250ZW50WzFdKSwgRFVNTVlfRklMRU5BTUUp CisgICAgICAgICAgICBjb252ZXJ0ZXIuZmVlZCh0ZXN0X2NvbnRlbnRbMV0pCisgICAgICAgICAg ICBjb252ZXJ0ZXIuY2xvc2UoKQorICAgICAgICAgICAgY29udmVydGVkID0gY29udmVydGVyLm91 dHB1dCgpCiAgICAgICAgIGZpbmFsbHk6CiAgICAgICAgICAgICBvYy5yZXN0b3JlX291dHB1dCgp CiAKQEAgLTI3Miw4ICsyODYsOCBAQCBDT05URU5UIE9GIFRFU1QKICAgICBkZWYgdmVyaWZ5X2Nv bnZlcnNpb25faGFwcGVuZWQoc2VsZiwgY29udmVydGVkKToKICAgICAgICAgc2VsZi5hc3NlcnRU cnVlKGNvbnZlcnRlZCwgImNvbnZlcnNpb24gZGlkbid0IGhhcHBlbiIpCiAKLSAgICBkZWYgdmVy aWZ5X25vX2NvbnZlcnNpb25faGFwcGVuZWQoc2VsZiwgY29udmVydGVkKToKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb252ZXJ0ZWQsIE5vbmUsICd0ZXN0IHNob3VsZCBub3QgaGF2ZSBiZWVu IGNvbnZlcnRlZCcpCisgICAgZGVmIHZlcmlmeV9ub19jb252ZXJzaW9uX2hhcHBlbmVkKHNlbGYs IGNvbnZlcnRlZCwgb3JpZ2luYWwpOgorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNvbnZlcnRl ZFsxXSwgb3JpZ2luYWwsICd0ZXN0IHNob3VsZCBub3QgaGF2ZSBiZWVuIGNvbnZlcnRlZCcpCiAK ICAgICBkZWYgdmVyaWZ5X3Rlc3RfaGFybmVzc19wYXRocyhzZWxmLCBjb252ZXJ0ZXIsIGNvbnZl cnRlZCwgdGVzdF9wYXRoLCBudW1fc3JjX3BhdGhzLCBudW1faHJlZl9wYXRocyk6CiAgICAgICAg IGlmIGlzaW5zdGFuY2UoY29udmVydGVkLCBiYXNlc3RyaW5nKToKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIucHkgYi9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3czYy90ZXN0X2ltcG9ydGVyLnB5CmluZGV4IDFmNGUzZDgxYWY2OTFlNTRjYzlkNDU0 NzlkNDRiNGQ0ZmU1MGVhY2YuLjY2OGEwMWJhY2E3YWQyZTVlODViNGJmMWY4ZjQ5ZDIyMDQxOTI2 NjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfaW1wb3J0ZXIu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9pbXBvcnRlci5weQpAQCAt OTYsNyArOTYsNyBAQCBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0IGltcG9ydCBIb3N0CiBmcm9t IHdlYmtpdHB5LmNvbW1vbi53ZWJraXRfZmluZGVyIGltcG9ydCBXZWJLaXRGaW5kZXIKIGZyb20g d2Via2l0cHkuY29tbW9uLnN5c3RlbS5leGVjdXRpdmUgaW1wb3J0IFNjcmlwdEVycm9yCiBmcm9t IHdlYmtpdHB5LnczYy50ZXN0X3BhcnNlciBpbXBvcnQgVGVzdFBhcnNlcgotZnJvbSB3ZWJraXRw eS53M2MudGVzdF9jb252ZXJ0ZXIgaW1wb3J0IFczQ1Rlc3RDb252ZXJ0ZXIKK2Zyb20gd2Via2l0 cHkudzNjLnRlc3RfY29udmVydGVyIGltcG9ydCBjb252ZXJ0X2Zvcl93ZWJraXQKIAogCiBURVNU X1NUQVRVU19VTktOT1dOID0gJ3Vua25vd24nCkBAIC0yODYsNyArMjg2LDYgQEAgY2xhc3MgVGVz dEltcG9ydGVyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgICdyZWZ0ZXN0cyc6IHJlZnRl c3RzLCAnanN0ZXN0cyc6IGpzdGVzdHMsICd0b3RhbF90ZXN0cyc6IHRvdGFsX3Rlc3RzfSkKIAog ICAgIGRlZiBpbXBvcnRfdGVzdHMoc2VsZik6Ci0gICAgICAgIGNvbnZlcnRlciA9IFczQ1Rlc3RD b252ZXJ0ZXIoKQogICAgICAgICB0b3RhbF9pbXBvcnRlZF90ZXN0cyA9IDAKICAgICAgICAgdG90 YWxfaW1wb3J0ZWRfcmVmdGVzdHMgPSAwCiAgICAgICAgIHRvdGFsX2ltcG9ydGVkX2pzdGVzdHMg PSAwCkBAIC0zNDMsNyArMzQyLDcgQEAgY2xhc3MgVGVzdEltcG9ydGVyKG9iamVjdCk6CiAgICAg ICAgICAgICAgICAgIyBGSVhNRTogRXZlbnR1YWxseSwgc28gc2hvdWxkIGpzIHdoZW4gc3VwcG9y dCBpcyBhZGRlZCBmb3IgdGhpcyB0eXBlIG9mIGNvbnZlcnNpb24KICAgICAgICAgICAgICAgICBt aW1ldHlwZSA9IG1pbWV0eXBlcy5ndWVzc190eXBlKG9yaWdfZmlsZXBhdGgpCiAgICAgICAgICAg ICAgICAgaWYgJ2h0bWwnIGluIHN0cihtaW1ldHlwZVswXSkgb3IgJ3htbCcgaW4gc3RyKG1pbWV0 eXBlWzBdKSAgb3IgJ2NzcycgaW4gc3RyKG1pbWV0eXBlWzBdKToKLSAgICAgICAgICAgICAgICAg ICAgY29udmVydGVkX2ZpbGUgPSBjb252ZXJ0ZXIuY29udmVydF9mb3Jfd2Via2l0KG5ld19wYXRo LCBmaWxlbmFtZT1vcmlnX2ZpbGVwYXRoKQorICAgICAgICAgICAgICAgICAgICBjb252ZXJ0ZWRf ZmlsZSA9IGNvbnZlcnRfZm9yX3dlYmtpdChuZXdfcGF0aCwgZmlsZW5hbWU9b3JpZ19maWxlcGF0 aCkKIAogICAgICAgICAgICAgICAgICAgICBpZiBub3QgY29udmVydGVkX2ZpbGU6CiAgICAgICAg ICAgICAgICAgICAgICAgICBzaHV0aWwuY29weWZpbGUob3JpZ19maWxlcGF0aCwgbmV3X2ZpbGVw YXRoKSAgIyBUaGUgZmlsZSB3YXMgdW5tb2RpZmllZC4K