88281 2012-06-04 20:19:45 -0700 webkitpy: clean up win-specific path handling and tests 2012-06-05 13:47:52 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88020 1 dpranke dpranke abarth eric jberlin ojan rakuco rniwa tony oldest_to_newest 641135 0 dpranke 2012-06-04 20:19:45 -0700 webkitpy: clean up win-specific path handling and tests 641137 1 145683 dpranke 2012-06-04 20:22:33 -0700 Created attachment 145683 Patch 641142 2 145683 abarth 2012-06-04 20:30:46 -0700 Comment on attachment 145683 Patch Nice cleanup. 641861 3 dpranke 2012-06-05 13:47:52 -0700 Committed r119520: <http://trac.webkit.org/changeset/119520> 145683 2012-06-04 20:22:33 -0700 2012-06-04 20:30:46 -0700 Patch bug-88281-20120604202232.patch text/plain 21569 dpranke U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5NDQ1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDJlMTJhNWViNTYxMzQyNjQ4Yzc3NWI5YWM2ODAwNjU1 M2ZhY2JjNC4uOGM1YTU3NWI0MmFhZGMyNDczN2JlYTEyNTY3OWEzNTVlZTIwZGI0NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYw IEBACiAyMDEyLTA2LTA0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgogCisg ICAgICAgIHdlYmtpdHB5OiBjbGVhbiB1cCB3aW4tc3BlY2lmaWMgcGF0aCBoYW5kbGluZyBhbmQg dGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4 MjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl cmUgd2FzIGEgYnVuY2ggb2YgaW5jb25zaXN0ZW50IGxvZ2ljIGZvciBoYW5kbGluZyBwYXRoCisg ICAgICAgIGNvbnZlcnNpb25zIGZvciB3aW4zMiBhbmQgY3lnd2luIHBhdGhzIGR1ZSB0byB1cyBz b21ldGltZXMKKyAgICAgICAgbG9va2luZyBhdCBzeXMucGxhdGZvcm0gYW5kIHNvbWV0aW1lcyB1 c2luZyBtb2NrIGhvc3RzLiBUaGlzCisgICAgICAgIHBhdGNoIGNsZWFucyBldmVyeXRoaW5nIHVw IHNvIHRoYXQgd2UgYXJlIHJlcXVpcmVkIHRvIHBhc3MKKyAgICAgICAgUGxhdGZvcm1JbmZvIG9i amVjdHMgdG8gdGhlIHBhdGggbW9kdWxlIGFuZCBzdG9wIHRyeWluZyB0byBkbworICAgICAgICBk aWZmZXJlbnQgdGhpbmdzIHdoZW4gcnVubmluZyBvbiBjeWd3aW4gb3Igd2luMzIgaG9zdHMgKGV4 Y2VwdAorICAgICAgICBpbiB0aGUgcGF0aF91bml0dGVzdCBtb2R1bGUgaXRzZWxmKS4KKworICAg ICAgICBUaGlzIG1heSBzbGlnaHRseSByZWR1Y2UgdGVzdCBjb3ZlcmFnZSBmb3IgdGhlIHdpbjMy IGNvZGUgcGF0aHMKKyAgICAgICAgYnV0IHdpbGwgYmUgYSBsb3QgZWFzaWVyIHRvIGZvbGxvdyBh bmQgbWFpbnRhaW4uCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0v cGF0aC5weToKKyAgICAgICAgKGFic3BhdGhfdG9fdXJpKToKKyAgICAgICAgKF9jb252ZXJ0X3Bh dGgpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wYXRoX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoQWJzcGF0aFRlc3QucGxhdGZvcm1pbmZvKToKKyAgICAgICAgKEFi c3BhdGhUZXN0LnRlc3RfYWJzcGF0aF90b191cmlfY3lnd2luKToKKyAgICAgICAgKEFic3BhdGhU ZXN0LnRlc3RfYWJzcGF0aF90b191cmlfdW5peHkpOgorICAgICAgICAoQWJzcGF0aFRlc3QudGVz dF9hYnNwYXRoX3RvX3VyaV93aW4pOgorICAgICAgICAoQWJzcGF0aFRlc3QudGVzdF9hYnNwYXRo X3RvX3VyaV9lc2NhcGluZ191bml4eSk6CisgICAgICAgIChBYnNwYXRoVGVzdC50ZXN0X2Fic3Bh dGhfdG9fdXJpX2VzY2FwaW5nX2N5Z3dpbik6CisgICAgICAgIChBYnNwYXRoVGVzdC50ZXN0X3N0 b3BfY3lncGF0aF9zdWJwcm9jZXNzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5OgorICAgICAgICAoUGxhdGZvcm1JbmZvLl9faW5pdF9f KToKKyAgICAgICAgKFBsYXRmb3JtSW5mby5pc19jeWd3aW4pOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fbW9jay5weToKKyAgICAgICAgKE1v Y2tQbGF0Zm9ybUluZm8uaXNfY3lnd2luKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Jhc2UucHk6CisgICAgICAgIChQb3J0LnRvLnNob3dfcmVzdWx0c19o dG1sX2ZpbGUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv ZHJpdmVyLnB5OgorICAgICAgICAoRHJpdmVyLnRlc3RfdG9fdXJpKToKKyAgICAgICAgKERyaXZl ci51cmlfdG9fdGVzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9kcml2ZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChEcml2ZXJUZXN0LnRlc3RfdGVzdF90 b191cmkpOgorICAgICAgICAoRHJpdmVyVGVzdC50ZXN0X3VyaV90b190ZXN0KToKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0X3VuaXR0ZXN0LnB5 OgorICAgICAgICAoTW9ja0RSVFBvcnRUZXN0Lm1ha2VfcG9ydCk6CisgICAgICAgIChNb2NrRFJU VGVzdC5pbnB1dF9saW5lKToKKyAgICAgICAgKE1vY2tDaHJvbWl1bURSVFRlc3QudGVzdF9waXhl bHRlc3RfX2ZhaWxzKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3Rlc3QucHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC93aW4ucHk6CisgICAgICAgIChXaW5Qb3J0LnNob3dfcmVzdWx0c19odG1sX2ZpbGUpOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfaW50 ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoTWFpblRlc3QudGVzdF91bmV4cGVjdGVkX2ZhaWx1 cmVzKToKKyAgICAgICAgKE1haW5UZXN0LnRlc3RfcmVzdWx0c19kaXJlY3RvcnlfYWJzb2x1dGUp OgorICAgICAgICAoTWFpblRlc3QudGVzdF9yZXN1bHRzX2RpcmVjdG9yeV9kZWZhdWx0KToKKyAg ICAgICAgKE1haW5UZXN0LnRlc3RfcmVzdWx0c19kaXJlY3RvcnlfcmVsYXRpdmUpOgorCisyMDEy LTA2LTA0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hyb21pdW0ub3JnPgorCiAgICAgICAgIHRl c3Qtd2Via2l0cHkgaXMgaGFuZ2luZyB1bmRlciBjeWd3aW4KICAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4MjY5CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wYXRoLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL3BhdGgucHkKaW5kZXggYjdhZDM3MjNhMzA2MDA2NDk3MDY0ZWQ3 ZWY4Zjk0ZDRlMTA4ZWE3NC4uZTVhNjZiZjg3Y2NmZmY2MGYzYzkxY2RiYWMyODFhMDk4ZTRlNmU4 YyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BhdGgu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BhdGgucHkKQEAg LTM1LDExICszNSw5IEBAIGltcG9ydCB0aHJlYWRpbmcKIGltcG9ydCB1cmxsaWIKIAogCi1kZWYg YWJzcGF0aF90b191cmkocGF0aCwgcGxhdGZvcm09Tm9uZSk6CitkZWYgYWJzcGF0aF90b191cmko cGxhdGZvcm0sIHBhdGgpOgogICAgICIiIkNvbnZlcnRzIGEgcGxhdGZvcm0tc3BlY2lmaWMgYWJz b2x1dGUgcGF0aCB0byBhIGZpbGU6IFVSTC4iIiIKLSAgICBpZiBwbGF0Zm9ybSBpcyBOb25lOgot ICAgICAgICBwbGF0Zm9ybSA9IHN5cy5wbGF0Zm9ybQotICAgIHJldHVybiAiZmlsZToiICsgX2Vz Y2FwZShfY29udmVydF9wYXRoKHBhdGgsIHBsYXRmb3JtKSkKKyAgICByZXR1cm4gImZpbGU6IiAr IF9lc2NhcGUoX2NvbnZlcnRfcGF0aChwbGF0Zm9ybSwgcGF0aCkpCiAKIAogZGVmIGN5Z3BhdGgo cGF0aCk6CkBAIC0xMTgsMTIgKzExNiwxMiBAQCBkZWYgX2VzY2FwZShwYXRoKToKICAgICByZXR1 cm4gdXJsbGliLnF1b3RlKHBhdGgsIHNhZmU9Jy8rOicpCiAKIAotZGVmIF9jb252ZXJ0X3BhdGgo cGF0aCwgcGxhdGZvcm0pOgorZGVmIF9jb252ZXJ0X3BhdGgocGxhdGZvcm0sIHBhdGgpOgogICAg ICIiIkhhbmRsZXMgYW55IG9zLXNwZWNpZmljIHBhdGggc2VwYXJhdG9ycywgbWFwcGluZ3MsIGV0 Yy4iIiIKLSAgICBpZiBwbGF0Zm9ybSA9PSAnd2luMzInOgotICAgICAgICByZXR1cm4gX3dpbnBh dGhfdG9fdXJpKHBhdGgpCi0gICAgaWYgcGxhdGZvcm0gPT0gJ2N5Z3dpbic6CisgICAgaWYgcGxh dGZvcm0uaXNfY3lnd2luKCk6CiAgICAgICAgIHJldHVybiBfd2lucGF0aF90b191cmkoY3lncGF0 aChwYXRoKSkKKyAgICBpZiBwbGF0Zm9ybS5pc193aW4oKToKKyAgICAgICAgcmV0dXJuIF93aW5w YXRoX3RvX3VyaShwYXRoKQogICAgIHJldHVybiBfdW5peHlwYXRoX3RvX3VyaShwYXRoKQogCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wYXRoX3Vu aXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BhdGhfdW5p dHRlc3QucHkKaW5kZXggZTA4MjEyYTJjODg4YzY0YTNlMTllNTE5OWYwOTkwNDUzNzI0OGUzMy4u OTU0ZDMyZDcxZjEzNTNhYjJjZmE5Yzg0YmRhMDRlZGIwNzRjYjAzNSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BhdGhfdW5pdHRlc3QucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BhdGhfdW5pdHRlc3QucHkKQEAg LTI5LDY5ICsyOSw0MSBAQAogaW1wb3J0IHVuaXR0ZXN0CiBpbXBvcnQgc3lzCiAKLWltcG9ydCBw YXRoCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdCBpbXBvcnQgU3lzdGVt SG9zdAorZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLnBsYXRmb3JtaW5mbyBpbXBvcnQgUGxh dGZvcm1JbmZvCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0ucGxhdGZvcm1pbmZvX21vY2sg aW1wb3J0IE1vY2tQbGF0Zm9ybUluZm8KK2Zyb20gd2Via2l0cHkuY29tbW9uLnN5c3RlbSBpbXBv cnQgcGF0aAogCiBjbGFzcyBBYnNwYXRoVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0gICAgZGVm IGFzc2VydE1hdGNoKHNlbGYsIHRlc3RfcGF0aCwgZXhwZWN0ZWRfdXJpLAotICAgICAgICAgICAg ICAgICAgICBwbGF0Zm9ybT1Ob25lKToKLSAgICAgICAgaWYgcGxhdGZvcm0gPT0gJ2N5Z3dpbicg YW5kIHN5cy5wbGF0Zm9ybSAhPSAnY3lnd2luJzoKLSAgICAgICAgICAgIHJldHVybgotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHBhdGguYWJzcGF0aF90b191cmkodGVzdF9wYXRoLCBwbGF0Zm9y bT1wbGF0Zm9ybSksCi0gICAgICAgICAgICAgICAgICAgICAgICAgZXhwZWN0ZWRfdXJpKQorICAg IGRlZiBwbGF0Zm9ybWluZm8oc2VsZik6CisgICAgICAgIHJldHVybiBTeXN0ZW1Ib3N0KCkucGxh dGZvcm0KIAogICAgIGRlZiB0ZXN0X2Fic3BhdGhfdG9fdXJpX2N5Z3dpbihzZWxmKToKICAgICAg ICAgaWYgc3lzLnBsYXRmb3JtICE9ICdjeWd3aW4nOgogICAgICAgICAgICAgcmV0dXJuCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBhdGguYWJzcGF0aF90b191cmkoc2VsZi5wbGF0Zm9ybWlu Zm8oKSwgJy9jeWdkcml2ZS9jL2Zvby9iYXIuaHRtbCcpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAnZmlsZTovLy9DOi9mb28vYmFyLmh0bWwnKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0TWF0 Y2goJy9jeWdkcml2ZS9jL2Zvby9iYXIuaHRtbCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAg J2ZpbGU6Ly8vQzovZm9vL2Jhci5odG1sJywKLSAgICAgICAgICAgICAgICAgICAgICAgICBwbGF0 Zm9ybT0nY3lnd2luJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwYXRoLmFic3BhdGhfdG9f dXJpKCcvY3lnZHJpdmUvYy9mb28vYmFyLmh0bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcGxhdGZvcm09J2N5Z3dpbicpLAotICAgICAgICAgICAgICAg ICAgICAgICAgICdmaWxlOi8vL0M6L2Zvby9iYXIuaHRtbCcpCi0KLSAgICBkZWYgdGVzdF9hYnNw YXRoX3RvX3VyaV9kYXJ3aW4oc2VsZik6Ci0gICAgICAgIHNlbGYuYXNzZXJ0TWF0Y2goJy9mb28v YmFyLmh0bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAgICdmaWxlOi8vL2Zvby9iYXIuaHRt bCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgcGxhdGZvcm09J2RhcndpbicpCi0gICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwocGF0aC5hYnNwYXRoX3RvX3VyaSgiL2Zvby9iYXIuaHRtbCIsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybT0nZGFy d2luJyksCi0gICAgICAgICAgICAgICAgICAgICAgICAgImZpbGU6Ly8vZm9vL2Jhci5odG1sIikK LQotICAgIGRlZiB0ZXN0X2Fic3BhdGhfdG9fdXJpX2xpbnV4MihzZWxmKToKLSAgICAgICAgc2Vs Zi5hc3NlcnRNYXRjaCgnL2Zvby9iYXIuaHRtbCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAg J2ZpbGU6Ly8vZm9vL2Jhci5odG1sJywKLSAgICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9y bT0nZGFyd2luJykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwYXRoLmFic3BhdGhfdG9fdXJp KCIvZm9vL2Jhci5odG1sIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHBsYXRmb3JtPSdsaW51eDInKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAiZmls ZTovLy9mb28vYmFyLmh0bWwiKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBhdGguYWJzcGF0 aF90b191cmkoIi9mb28vYmFyLmh0bWwiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcGxhdGZvcm09J2xpbnV4MycpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICJmaWxlOi8vL2Zvby9iYXIuaHRtbCIpCisgICAgZGVmIHRlc3RfYWJzcGF0aF90b191cmlf dW5peHkoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBhdGguYWJzcGF0aF90b191 cmkoTW9ja1BsYXRmb3JtSW5mbygpLCAiL2Zvby9iYXIuaHRtbCIpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAnZmlsZTovLy9mb28vYmFyLmh0bWwnKQogCiAgICAgZGVmIHRlc3RfYWJzcGF0 aF90b191cmlfd2luKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydE1hdGNoKCdjOlxcZm9vXFxi YXIuaHRtbCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgJ2ZpbGU6Ly8vYzovZm9vL2Jhci5o dG1sJywKLSAgICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybT0nd2luMzInKQotICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHBhdGguYWJzcGF0aF90b191cmkoImM6XFxmb29cXGJhci5odG1s IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3Jt PSd3aW4zMicpLAotICAgICAgICAgICAgICAgICAgICAgICAgICJmaWxlOi8vL2M6L2Zvby9iYXIu aHRtbCIpCisgICAgICAgIGlmIHN5cy5wbGF0Zm9ybSAhPSAnd2luMzInOgorICAgICAgICAgICAg cmV0dXJuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxzKHBhdGguYWJzcGF0aF90b191cmkoc2Vs Zi5wbGF0Zm9ybWluZm8oKSwgJ2M6XFxmb29cXGJhci5odG1sJyksCisgICAgICAgICAgICAgICAg ICAgICAgICAgJ2ZpbGU6Ly8vYzovZm9vL2Jhci5odG1sJykKIAotICAgIGRlZiB0ZXN0X2Fic3Bh dGhfdG9fdXJpX2VzY2FwaW5nKHNlbGYpOgotICAgICAgICBzZWxmLmFzc2VydE1hdGNoKCcvZm9v L2JhciArIGJheiU/Lmh0bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAgICdmaWxlOi8vL2Zv by9iYXIlMjArJTIwYmF6JTI1JTNGLmh0bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAgIHBs YXRmb3JtPSdkYXJ3aW4nKQotICAgICAgICBzZWxmLmFzc2VydE1hdGNoKCcvZm9vL2JhciArIGJh eiU/Lmh0bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAgICdmaWxlOi8vL2Zvby9iYXIlMjAr JTIwYmF6JTI1JTNGLmh0bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtPSds aW51eDInKQotICAgICAgICBzZWxmLmFzc2VydE1hdGNoKCcvZm9vL2JhciArIGJheiU/Lmh0bWwn LAotICAgICAgICAgICAgICAgICAgICAgICAgICdmaWxlOi8vL2Zvby9iYXIlMjArJTIwYmF6JTI1 JTNGLmh0bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtPSdsaW51eDMnKQor ICAgIGRlZiB0ZXN0X2Fic3BhdGhfdG9fdXJpX2VzY2FwaW5nX3VuaXh5KHNlbGYpOgorICAgICAg ICBzZWxmLmFzc2VydEVxdWFscyhwYXRoLmFic3BhdGhfdG9fdXJpKE1vY2tQbGF0Zm9ybUluZm8o KSwgJy9mb28vYmFyICsgYmF6JT8uaHRtbCcpLAorICAgICAgICAgICAgICAgICAgICAgICAgICdm aWxlOi8vL2Zvby9iYXIlMjArJTIwYmF6JTI1JTNGLmh0bWwnKQogCiAgICAgICAgICMgTm90ZSB0 aGF0IHlvdSBjYW4ndCBoYXZlICc/JyBpbiBhIGZpbGVuYW1lIG9uIHdpbmRvd3MuCi0gICAgICAg IHNlbGYuYXNzZXJ0TWF0Y2goJy9jeWdkcml2ZS9jL2Zvby9iYXIgKyBiYXolLmh0bWwnLAotICAg ICAgICAgICAgICAgICAgICAgICAgICdmaWxlOi8vL0M6L2Zvby9iYXIlMjArJTIwYmF6JTI1Lmh0 bWwnLAotICAgICAgICAgICAgICAgICAgICAgICAgIHBsYXRmb3JtPSdjeWd3aW4nKQorICAgIGRl ZiB0ZXN0X2Fic3BhdGhfdG9fdXJpX2VzY2FwaW5nX2N5Z3dpbihzZWxmKToKKyAgICAgICAgaWYg c3lzLnBsYXRmb3JtICE9ICdjeWd3aW4nOgorICAgICAgICAgICAgcmV0dXJuCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWxzKHBhdGguYWJzcGF0aF90b191cmkoc2VsZi5wbGF0Zm9ybWluZm8oKSwg Jy9jeWdkcml2ZS9jL2Zvby9iYXIgKyBiYXolLmh0bWwnKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgJ2ZpbGU6Ly8vQzovZm9vL2JhciUyMCslMjBiYXolMjUuaHRtbCcpCiAKICAgICBkZWYg dGVzdF9zdG9wX2N5Z3BhdGhfc3VicHJvY2VzcyhzZWxmKToKICAgICAgICAgaWYgc3lzLnBsYXRm b3JtICE9ICdjeWd3aW4nOgpAQCAtMTA2LDYgKzc4LDMgQEAgY2xhc3MgQWJzcGF0aFRlc3QodW5p dHRlc3QuVGVzdENhc2UpOgogCiAgICAgICAgICMgRW5zdXJlIHRoYXQgaXQgaXMgc3RvcHBlZC4K ICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShwYXRoLl9DeWdQYXRoLl9zaW5nbGV0b24uaXNfcnVu bmluZygpKQotCi1pZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgotICAgIHVuaXR0ZXN0Lm1haW4o KQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRm b3JtaW5mby5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm8ucHkKaW5kZXggMjJjYWZiYmVlZjJkNmYyMTE3NDhhYmRhOGQ5YmE4ZTk0OTE0MzAxZi4u MzZhZjRmN2ZkNWU2OGYxMDQyZjNhZTUyMjQzYjk4ZTdmYmQ0YWQxZSAxMDA2NDQKLS0tIGEvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQorKysgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CkBAIC01 NCw2ICs1NCw3IEBAIGNsYXNzIFBsYXRmb3JtSW5mbyhvYmplY3QpOgogICAgICAgICAgICAgc2Vs Zi5vc192ZXJzaW9uID0gc2VsZi5fZGV0ZXJtaW5lX21hY192ZXJzaW9uKHBsYXRmb3JtX21vZHVs ZS5tYWNfdmVyKClbMF0pCiAgICAgICAgIGlmIHNlbGYub3NfbmFtZS5zdGFydHN3aXRoKCd3aW4n KToKICAgICAgICAgICAgIHNlbGYub3NfdmVyc2lvbiA9IHNlbGYuX2RldGVybWluZV93aW5fdmVy c2lvbihzZWxmLl93aW5fdmVyc2lvbl90dXBsZShzeXNfbW9kdWxlKSkKKyAgICAgICAgc2VsZi5f aXNfY3lnd2luID0gc3lzX21vZHVsZS5wbGF0Zm9ybSA9PSAnY3lnd2luJwogCiAgICAgZGVmIGlz X21hYyhzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYub3NfbmFtZSA9PSAnbWFjJwpAQCAtNjEs NiArNjIsOSBAQCBjbGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICBkZWYgaXNfd2luKHNl bGYpOgogICAgICAgICByZXR1cm4gc2VsZi5vc19uYW1lID09ICd3aW4nCiAKKyAgICBkZWYgaXNf Y3lnd2luKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5faXNfY3lnd2luCisKICAgICBkZWYg aXNfbGludXgoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLm9zX25hbWUgPT0gJ2xpbnV4Jwog CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZv cm1pbmZvX21vY2sucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxh dGZvcm1pbmZvX21vY2sucHkKaW5kZXggYzk1M2FhMTg1NTFmZGJiYThlNGViZjljNzVlNDBlMTJm MGVlODYwOS4uZDllNmMwODlhZTJmY2U0NjliYzgzYzUyN2FlMTczZjZjOGFlNzJlZSAxMDA2NDQK LS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb19t b2NrLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm9fbW9jay5weQpAQCAtNDEsNiArNDEsOSBAQCBjbGFzcyBNb2NrUGxhdGZvcm1JbmZvKG9i amVjdCk6CiAgICAgZGVmIGlzX3dpbihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYub3NfbmFt ZSA9PSAnd2luJwogCisgICAgZGVmIGlzX2N5Z3dpbihzZWxmKToKKyAgICAgICAgcmV0dXJuIEZh bHNlCisKICAgICBkZWYgaXNfZnJlZWJzZChzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYub3Nf bmFtZSA9PSAnZnJlZWJzZCcKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CmluZGV4IDA2NDIwNzJjMjg2MzkwYTBjY2FhMDFhM2U0MmE3NzUz NjM0MDRhNTAuLjIzZTA0ZDgzNWM1NmU2NWYzNjRkNzAzZmJhOWM2Yzg3YzBkZjdkOGIgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKQEAg LTc3Niw3ICs3NzYsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgZGVmIHNob3dfcmVzdWx0 c19odG1sX2ZpbGUoc2VsZiwgcmVzdWx0c19maWxlbmFtZSk6CiAgICAgICAgICIiIlRoaXMgcm91 dGluZSBzaG91bGQgZGlzcGxheSB0aGUgSFRNTCBmaWxlIHBvaW50ZWQgYXQgYnkKICAgICAgICAg cmVzdWx0c19maWxlbmFtZSBpbiBhIHVzZXJzJyBicm93c2VyLiIiIgotICAgICAgICByZXR1cm4g c2VsZi5ob3N0LnVzZXIub3Blbl91cmwocGF0aC5hYnNwYXRoX3RvX3VyaShyZXN1bHRzX2ZpbGVu YW1lKSkKKyAgICAgICAgcmV0dXJuIHNlbGYuaG9zdC51c2VyLm9wZW5fdXJsKHBhdGguYWJzcGF0 aF90b191cmkoc2VsZi5ob3N0LnBsYXRmb3JtLCByZXN1bHRzX2ZpbGVuYW1lKSkKIAogICAgIGRl ZiBjcmVhdGVfZHJpdmVyKHNlbGYsIHdvcmtlcl9udW1iZXIsIG5vX3RpbWVvdXQ9RmFsc2UpOgog ICAgICAgICAiIiJSZXR1cm4gYSBuZXdseSBjcmVhdGVkIERyaXZlciBzdWJjbGFzcyBmb3Igc3Rh cnRpbmcvc3RvcHBpbmcgdGhlIHRlc3QgZHJpdmVyLiIiIgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9kcml2ZXIucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlci5weQppbmRleCBhMTEzZGEzYThjYjdj MWVlMWM5Nzk0ZjFkMDA1ZWUwYmZhOTE0NGJjLi4xNjEwYjJmN2Q5YTFiMjMzMzUxN2I4ZWI2OTVl ZDdiNDBlZDhiOTcwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2RyaXZlci5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90 ZXN0cy9wb3J0L2RyaXZlci5weQpAQCAtMTMyLDcgKzEzMiw3IEBAIGNsYXNzIERyaXZlcihvYmpl Y3QpOgogICAgIGRlZiB0ZXN0X3RvX3VyaShzZWxmLCB0ZXN0X25hbWUpOgogICAgICAgICAiIiJD b252ZXJ0IGEgdGVzdCBuYW1lIHRvIGEgVVJJLiIiIgogICAgICAgICBpZiBub3Qgc2VsZi5pc19o dHRwX3Rlc3QodGVzdF9uYW1lKToKLSAgICAgICAgICAgIHJldHVybiBwYXRoLmFic3BhdGhfdG9f dXJpKHNlbGYuX3BvcnQuYWJzcGF0aF9mb3JfdGVzdCh0ZXN0X25hbWUpKQorICAgICAgICAgICAg cmV0dXJuIHBhdGguYWJzcGF0aF90b191cmkoc2VsZi5fcG9ydC5ob3N0LnBsYXRmb3JtLCBzZWxm Ll9wb3J0LmFic3BhdGhfZm9yX3Rlc3QodGVzdF9uYW1lKSkKIAogICAgICAgICByZWxhdGl2ZV9w YXRoID0gdGVzdF9uYW1lW2xlbihzZWxmLkhUVFBfRElSKTpdCiAKQEAgLTE1MCw3ICsxNTAsNyBA QCBjbGFzcyBEcml2ZXIob2JqZWN0KToKIAogICAgICAgICAiIiIKICAgICAgICAgaWYgdXJpLnN0 YXJ0c3dpdGgoImZpbGU6Ly8vIik6Ci0gICAgICAgICAgICByZXR1cm4gdXJpW2xlbihwYXRoLmFi c3BhdGhfdG9fdXJpKHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpKSArICIvIik6XQorICAg ICAgICAgICAgcmV0dXJuIHVyaVtsZW4ocGF0aC5hYnNwYXRoX3RvX3VyaShzZWxmLl9wb3J0Lmhv c3QucGxhdGZvcm0sIHNlbGYuX3BvcnQubGF5b3V0X3Rlc3RzX2RpcigpKSArICIvIik6XQogICAg ICAgICBpZiB1cmkuc3RhcnRzd2l0aCgiaHR0cDovLyIpOgogICAgICAgICAgICAgcmV0dXJuIHVy aS5yZXBsYWNlKCdodHRwOi8vMTI3LjAuMC4xOjgwMDAvJywgc2VsZi5IVFRQX0RJUikKICAgICAg ICAgaWYgdXJpLnN0YXJ0c3dpdGgoImh0dHBzOi8vIik6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2RyaXZlcl91bml0dGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5Cmlu ZGV4IDA4ZDRkOTg4MjIwMjY3MDYxMDNhMTEyNzllMjgzMWFjOTFmZWNkYTIuLjAwYTQyZjQyZmU1 ZmEwNDYzZDQxMDZmOGZlMGI0N2NiYTY5MGU1MjIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvZHJpdmVyX3VuaXR0ZXN0LnB5CkBA IC0yOSw3ICsyOSw2IEBACiBpbXBvcnQgc3lzCiBpbXBvcnQgdW5pdHRlc3QKIAotZnJvbSB3ZWJr aXRweS5jb21tb24uc3lzdGVtLnBhdGggaW1wb3J0IGFic3BhdGhfdG9fdXJpCiBmcm9tIHdlYmtp dHB5LmNvbW1vbi5zeXN0ZW0uc3lzdGVtaG9zdF9tb2NrIGltcG9ydCBNb2NrU3lzdGVtSG9zdAog CiBmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0cy5wb3J0IGltcG9ydCBQb3J0LCBEcml2ZXIsIERy aXZlck91dHB1dApAQCAtMTA1LDIwICsxMDQsMTQgQEAgY2xhc3MgRHJpdmVyVGVzdCh1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfdGVzdF90b191cmkoc2VsZik6CiAgICAgICAgIHBv cnQgPSBzZWxmLm1ha2VfcG9ydCgpCiAgICAgICAgIGRyaXZlciA9IERyaXZlcihwb3J0LCBOb25l LCBwaXhlbF90ZXN0cz1GYWxzZSkKLSAgICAgICAgaWYgc3lzLnBsYXRmb3JtIGluICgnY3lnd2lu JywgJ3dpbjMyJyk6Ci0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRyaXZlci50ZXN0X3Rv X3VyaSgnZm9vL2Jhci5odG1sJyksICdmaWxlOi8vLyVzL2Zvby9iYXIuaHRtbCcgJSBwb3J0Lmxh eW91dF90ZXN0c19kaXIoKSkKLSAgICAgICAgZWxzZToKLSAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoZHJpdmVyLnRlc3RfdG9fdXJpKCdmb28vYmFyLmh0bWwnKSwgJ2ZpbGU6Ly8lcy9mb28v YmFyLmh0bWwnICUgcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkpCisgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoZHJpdmVyLnRlc3RfdG9fdXJpKCdmb28vYmFyLmh0bWwnKSwgJ2ZpbGU6Ly8lcy9mb28v YmFyLmh0bWwnICUgcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoZHJpdmVyLnRlc3RfdG9fdXJpKCdodHRwL3Rlc3RzL2Zvby5odG1sJyksICdodHRwOi8v MTI3LjAuMC4xOjgwMDAvZm9vLmh0bWwnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRyaXZl ci50ZXN0X3RvX3VyaSgnaHR0cC90ZXN0cy9zc2wvYmFyLmh0bWwnKSwgJ2h0dHBzOi8vMTI3LjAu MC4xOjg0NDMvc3NsL2Jhci5odG1sJykKIAogICAgIGRlZiB0ZXN0X3VyaV90b190ZXN0KHNlbGYp OgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQoKQogICAgICAgICBkcml2ZXIgPSBEcml2 ZXIocG9ydCwgTm9uZSwgcGl4ZWxfdGVzdHM9RmFsc2UpCi0gICAgICAgIGlmIHN5cy5wbGF0Zm9y bSBpbiAoJ2N5Z3dpbicsICd3aW4zMicpOgotICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChk cml2ZXIudXJpX3RvX3Rlc3QoJ2ZpbGU6Ly8vJXMvZm9vL2Jhci5odG1sJyAlIHBvcnQubGF5b3V0 X3Rlc3RzX2RpcigpKSwgJ2Zvby9iYXIuaHRtbCcpCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGRyaXZlci51cmlfdG9fdGVzdCgnZmlsZTovLyVzL2Zvby9iYXIu aHRtbCcgJSBwb3J0LmxheW91dF90ZXN0c19kaXIoKSksICdmb28vYmFyLmh0bWwnKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGRyaXZlci51cmlfdG9fdGVzdCgnZmlsZTovLyVzL2Zvby9iYXIu aHRtbCcgJSBwb3J0LmxheW91dF90ZXN0c19kaXIoKSksICdmb28vYmFyLmh0bWwnKQogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGRyaXZlci51cmlfdG9fdGVzdCgnaHR0cDovLzEyNy4wLjAuMTo4 MDAwL2Zvby5odG1sJyksICdodHRwL3Rlc3RzL2Zvby5odG1sJykKICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChkcml2ZXIudXJpX3RvX3Rlc3QoJ2h0dHBzOi8vMTI3LjAuMC4xOjg0NDMvc3NsL2Jh ci5odG1sJyksICdodHRwL3Rlc3RzL3NzbC9iYXIuaHRtbCcpCiAKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0X3VuaXR0 ZXN0LnB5CmluZGV4IDYwNTA3MTgwNWQ4ODY2MGIzYmExODRlMTY0MjAyZmNkMzlmOGI4MmQuLjU3 MGE5ZTRhZDY3NTRhNzFlOTQyNmQzYTQwMTc0ZWVjZTE2ZDQ4MDYgMTAwNzU1Ci0tLSBhL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydF91 bml0dGVzdC5weQpAQCAtNDksMTEgKzQ5LDYgQEAgY2xhc3MgTW9ja0RSVFBvcnRUZXN0KHBvcnRf dGVzdGNhc2UuUG9ydFRlc3RDYXNlKToKICAgICBkZWYgbWFrZV9wb3J0KHNlbGYsIG9wdGlvbnM9 bW9ja19vcHRpb25zKToKICAgICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0KCkKICAgICAgICAg dGVzdC5hZGRfdW5pdF90ZXN0c190b19tb2NrX2ZpbGVzeXN0ZW0oaG9zdC5maWxlc3lzdGVtKQot ICAgICAgICBpZiBzeXMucGxhdGZvcm0gPT0gJ3dpbjMyJzoKLSAgICAgICAgICAgICMgV2UgdXNl IHRoaXMgYmVjYXVzZSB0aGUgJ3dpbicgcG9ydCBkb2Vzbid0IHdvcmsgeWV0LgotICAgICAgICAg ICAgaG9zdC5wbGF0Zm9ybS5vc19uYW1lID0gJ3dpbicKLSAgICAgICAgICAgIGhvc3QucGxhdGZv cm0ub3NfdmVyc2lvbiA9ICd4cCcKLSAgICAgICAgICAgIHJldHVybiBtb2NrX2RydC5Nb2NrRFJU UG9ydChob3N0LCBwb3J0X25hbWU9J21vY2stY2hyb21pdW0td2luJywgb3B0aW9ucz1vcHRpb25z KQogICAgICAgICByZXR1cm4gbW9ja19kcnQuTW9ja0RSVFBvcnQoaG9zdCwgcG9ydF9uYW1lPSdt b2NrLW1hYycsIG9wdGlvbnM9b3B0aW9ucykKIAogICAgIGRlZiB0ZXN0X3BvcnRfbmFtZV9pbl9j b25zdHJ1Y3RvcihzZWxmKToKQEAgLTkzLDEwICs4OCw3IEBAIGNsYXNzIE1vY2tEUlRUZXN0KHVu aXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgaW5wdXRfbGluZShzZWxmLCBwb3J0LCB0ZXN0X25h bWUsIGNoZWNrc3VtPU5vbmUpOgogICAgICAgICB1cmwgPSBwb3J0LmNyZWF0ZV9kcml2ZXIoMCku dGVzdF90b191cmkodGVzdF9uYW1lKQogICAgICAgICBpZiB1cmwuc3RhcnRzd2l0aCgnZmlsZTov LycpOgotICAgICAgICAgICAgaWYgc3lzLnBsYXRmb3JtID09ICd3aW4zMic6Ci0gICAgICAgICAg ICAgICAgdXJsID0gdXJsW2xlbignZmlsZTovLy8nKTpdCi0gICAgICAgICAgICBlbHNlOgotICAg ICAgICAgICAgICAgIHVybCA9IHVybFtsZW4oJ2ZpbGU6Ly8nKTpdCisgICAgICAgICAgICB1cmwg PSB1cmxbbGVuKCdmaWxlOi8vJyk6XQogCiAgICAgICAgIGlmIGNoZWNrc3VtOgogICAgICAgICAg ICAgcmV0dXJuIHVybCArICInIiArIGNoZWNrc3VtICsgJ1xuJwpAQCAtMjQ3LDkgKzIzOSw2IEBA IGNsYXNzIE1vY2tDaHJvbWl1bURSVFRlc3QoTW9ja0RSVFRlc3QpOgogICAgIGRlZiB0ZXN0X3Bp eGVsdGVzdF9fZmFpbHMoc2VsZik6CiAgICAgICAgIGhvc3QgPSBNb2NrU3lzdGVtSG9zdCgpCiAg ICAgICAgIHVybCA9ICcjVVJMOmZpbGU6Ly8nCi0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybSA9PSAn d2luMzInOgotICAgICAgICAgICAgaG9zdCA9IE1vY2tTeXN0ZW1Ib3N0KG9zX25hbWU9J3dpbics IG9zX3ZlcnNpb249J3hwJykKLSAgICAgICAgICAgIHVybCA9ICcjVVJMOmZpbGU6Ly8vJwogICAg ICAgICB1cmwgPSB1cmwgKyAnJXMvZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0uaHRt bCcgJSBQb3J0RmFjdG9yeShob3N0KS5nZXQoJ3Rlc3QnKS5sYXlvdXRfdGVzdHNfZGlyKCkKICAg ICAgICAgc2VsZi5hc3NlcnRUZXN0KCdmYWlsdXJlcy9leHBlY3RlZC9pbWFnZV9jaGVja3N1bS5o dG1sJywgcGl4ZWxfdGVzdHM9VHJ1ZSwKICAgICAgICAgICAgIGV4cGVjdGVkX2NoZWNrc3VtPSdp bWFnZV9jaGVja3N1bScsCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L3Rlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9wb3J0L3Rlc3QucHkKaW5kZXggM2I2ZWQ4NTkyMWNjNjI0NDZmZjNiZDNlZGU5MjA4YmY0YWVh Mjk4Mi4uYjQ3NzJlMGU1YWU0MWE0NzNkYzU5ZGI2ZWQ0MTQ5M2RiNDJkNGE1OCAxMDA2NDQKLS0t IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQpAQCAtMjMz LDEyICsyMzMsOCBAQCBsYXllciBhdCAoMCwwKSBzaXplIDgwMHgzNAogIyB0aGlzIHdvcmtzLiBU aGUgcGF0aCBjb250YWlucyBhICcuJyBpbiB0aGUgbmFtZSBiZWNhdXNlIHdlJ3ZlIHNlZW4gYnVn cwogIyByZWxhdGVkIHRvIHRoaXMgYmVmb3JlLgogCi1pZiBzeXMucGxhdGZvcm0gPT0gJ3dpbjMy JzoKLSAgICBMQVlPVVRfVEVTVF9ESVIgPSAnYzovdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cycK LSAgICBQRVJGX1RFU1RfRElSID0gJ2M6L3Rlc3QuY2hlY2tvdXQvUGVyZm9ybWFuY2VUZXN0cycK LWVsc2U6Ci0gICAgTEFZT1VUX1RFU1RfRElSID0gJy90ZXN0LmNoZWNrb3V0L0xheW91dFRlc3Rz JwotICAgIFBFUkZfVEVTVF9ESVIgPSAnL3Rlc3QuY2hlY2tvdXQvUGVyZm9ybWFuY2VUZXN0cycK K0xBWU9VVF9URVNUX0RJUiA9ICcvdGVzdC5jaGVja291dC9MYXlvdXRUZXN0cycKK1BFUkZfVEVT VF9ESVIgPSAnL3Rlc3QuY2hlY2tvdXQvUGVyZm9ybWFuY2VUZXN0cycKIAogCiAjIEhlcmUgd2Ug c3ludGhlc2l6ZSBhbiBpbi1tZW1vcnkgZmlsZXN5c3RlbSBmcm9tIHRoZSB0ZXN0IGxpc3QKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2luLnB5 IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKaW5kZXgg ZGEzMjA5ZWFkNjBjM2UwYzk1OTgzMGE1YzdiODM1MWJjMjk3MzgyNS4uZThkMTBiYzdiN2NlZmFk YWY4ODdiMmIzMjMyNWFiZjFmOWE0MDdlNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC93aW4ucHkKQEAgLTMwLDYgKzMwLDcgQEAgaW1wb3J0IGxvZ2dp bmcKIGltcG9ydCByZQogaW1wb3J0IHN5cwogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0u c3lzdGVtaG9zdCBpbXBvcnQgU3lzdGVtSG9zdAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVt LmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IsIEV4ZWN1dGl2ZQogZnJvbSB3ZWJraXRweS5j b21tb24uc3lzdGVtLnBhdGggaW1wb3J0IGFic3BhdGhfdG9fdXJpCiBmcm9tIHdlYmtpdHB5Lmxh eW91dF90ZXN0cy5wb3J0LmFwcGxlIGltcG9ydCBBcHBsZVBvcnQKQEAgLTc1LDcgKzc2LDcgQEAg Y2xhc3MgV2luUG9ydChBcHBsZVBvcnQpOgogICAgICAgICByZXR1cm4gJ3dpbicKIAogICAgIGRl ZiBzaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYsIHJlc3VsdHNfZmlsZW5hbWUpOgotICAgICAg ICBzZWxmLl9ydW5fc2NyaXB0KCdydW4tc2FmYXJpJywgW2Fic3BhdGhfdG9fdXJpKHJlc3VsdHNf ZmlsZW5hbWUpXSkKKyAgICAgICAgc2VsZi5fcnVuX3NjcmlwdCgncnVuLXNhZmFyaScsIFthYnNw YXRoX3RvX3VyaShTeXN0ZW1Ib3N0KCkucGxhdGZvcm0sIHJlc3VsdHNfZmlsZW5hbWUpXSkKIAog ICAgICMgRklYTUU6IHdlYmtpdHBlcmwvaHR0cGQucG0gaW5zdGFsbHMgL3Vzci9saWIvYXBhY2hl L2xpYnBocDQuZGxsIG9uIGN5Y3dpbiBhdXRvbWF0aWNhbGx5CiAgICAgIyBhcyBwYXJ0IG9mIHJ1 bm5pbmcgb2xkLXJ1bi13ZWJraXQtdGVzdHMuICBUaGF0J3MgYmFkIGRlc2lnbiwgYnV0IHdlIG1h eSBuZWVkIHNvbWUgc2ltaWxhciBoYWNrLgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVn cmF0aW9udGVzdC5weQppbmRleCA5NmZiNjg1M2Q5OTFhZjkxNGY3MDE4NWY1YzIyYWU2ZDk3OWZm ODAyLi44ZmNhMjlhMmUxNGJmNWU0NGJlZDVhNDYwZDg1ZjZmYjk4ODhhZmViIDEwMDc1NQotLS0g YS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX2lu dGVncmF0aW9udGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX2ludGVncmF0aW9udGVzdC5weQpAQCAtNTM3LDcgKzUzNyw3IEBA IGNsYXNzIE1haW5UZXN0KHVuaXR0ZXN0LlRlc3RDYXNlLCBTdHJlYW1UZXN0aW5nTWl4aW4pOgog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJlcywgdW5leHBlY3RlZF90ZXN0c19jb3VudCkKICAg ICAgICAgc2VsZi5hc3NlcnROb3RFbXB0eShvdXQpCiAgICAgICAgIHNlbGYuYXNzZXJ0Tm90RW1w dHkoZXJyKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHVzZXIub3BlbmVkX3VybHMsIFtwYXRo LmFic3BhdGhfdG9fdXJpKCcvdG1wL2xheW91dC10ZXN0LXJlc3VsdHMvcmVzdWx0cy5odG1sJyld KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHVzZXIub3BlbmVkX3VybHMsIFtwYXRoLmFic3Bh dGhfdG9fdXJpKE1vY2tIb3N0KCkucGxhdGZvcm0sICcvdG1wL2xheW91dC10ZXN0LXJlc3VsdHMv cmVzdWx0cy5odG1sJyldKQogCiAgICAgZGVmIHRlc3RfbWlzc2luZ19hbmRfdW5leHBlY3RlZF9y ZXN1bHRzKHNlbGYpOgogICAgICAgICAjIFRlc3QgdGhhdCB3ZSB1cGRhdGUgZXhwZWN0YXRpb25z IGluIHBsYWNlLiBJZiB0aGUgZXhwZWN0YXRpb24KQEAgLTcxNSw3ICs3MTUsNyBAQCBjbGFzcyBN YWluVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSwgU3RyZWFtVGVzdGluZ01peGluKToKICAgICAgICAg d2l0aCBob3N0LmZpbGVzeXN0ZW0ubWtkdGVtcCgpIGFzIHRtcGRpcjoKICAgICAgICAgICAgIHJl cywgb3V0LCBlcnIsIHVzZXIgPSBsb2dnaW5nX3J1bihbJy0tcmVzdWx0cy1kaXJlY3Rvcnk9JyAr IHN0cih0bXBkaXIpXSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB0ZXN0c19pbmNsdWRlZD1UcnVlLCBob3N0PWhvc3QpCi0gICAgICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHVzZXIub3BlbmVkX3VybHMsIFtwYXRoLmFic3BhdGhfdG9fdXJpKGhvc3QuZmls ZXN5c3RlbS5qb2luKHRtcGRpciwgJ3Jlc3VsdHMuaHRtbCcpKV0pCisgICAgICAgICAgICBzZWxm LmFzc2VydEVxdWFsKHVzZXIub3BlbmVkX3VybHMsIFtwYXRoLmFic3BhdGhfdG9fdXJpKGhvc3Qu cGxhdGZvcm0sIGhvc3QuZmlsZXN5c3RlbS5qb2luKHRtcGRpciwgJ3Jlc3VsdHMuaHRtbCcpKV0p CiAKICAgICBkZWYgdGVzdF9yZXN1bHRzX2RpcmVjdG9yeV9kZWZhdWx0KHNlbGYpOgogICAgICAg ICAjIFdlIHJ1biBhIGNvbmZpZ3VyYXRpb24gdGhhdCBzaG91bGQgZmFpbCwgdG8gZ2VuZXJhdGUg b3V0cHV0LCB0aGVuCkBAIC03MjMsNyArNzIzLDcgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3Qu VGVzdENhc2UsIFN0cmVhbVRlc3RpbmdNaXhpbik6CiAKICAgICAgICAgIyBUaGlzIGlzIHRoZSBk ZWZhdWx0IGxvY2F0aW9uLgogICAgICAgICByZXMsIG91dCwgZXJyLCB1c2VyID0gbG9nZ2luZ19y dW4odGVzdHNfaW5jbHVkZWQ9VHJ1ZSkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh1c2VyLm9w ZW5lZF91cmxzLCBbcGF0aC5hYnNwYXRoX3RvX3VyaSgnL3RtcC9sYXlvdXQtdGVzdC1yZXN1bHRz L3Jlc3VsdHMuaHRtbCcpXSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCh1c2VyLm9wZW5lZF91 cmxzLCBbcGF0aC5hYnNwYXRoX3RvX3VyaShNb2NrSG9zdCgpLnBsYXRmb3JtLCAnL3RtcC9sYXlv dXQtdGVzdC1yZXN1bHRzL3Jlc3VsdHMuaHRtbCcpXSkKIAogICAgIGRlZiB0ZXN0X3Jlc3VsdHNf ZGlyZWN0b3J5X3JlbGF0aXZlKHNlbGYpOgogICAgICAgICAjIFdlIHJ1biBhIGNvbmZpZ3VyYXRp b24gdGhhdCBzaG91bGQgZmFpbCwgdG8gZ2VuZXJhdGUgb3V0cHV0LCB0aGVuCkBAIC03MzMsNyAr NzMzLDcgQEAgY2xhc3MgTWFpblRlc3QodW5pdHRlc3QuVGVzdENhc2UsIFN0cmVhbVRlc3RpbmdN aXhpbik6CiAgICAgICAgIGhvc3QuZmlsZXN5c3RlbS5jaGRpcignL3RtcC9jd2QnKQogICAgICAg ICByZXMsIG91dCwgZXJyLCB1c2VyID0gbG9nZ2luZ19ydW4oWyctLXJlc3VsdHMtZGlyZWN0b3J5 PWZvbyddLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdGVzdHNf aW5jbHVkZWQ9VHJ1ZSwgaG9zdD1ob3N0KQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHVzZXIu b3BlbmVkX3VybHMsIFtwYXRoLmFic3BhdGhfdG9fdXJpKCcvdG1wL2N3ZC9mb28vcmVzdWx0cy5o dG1sJyldKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHVzZXIub3BlbmVkX3VybHMsIFtwYXRo LmFic3BhdGhfdG9fdXJpKGhvc3QucGxhdGZvcm0sICcvdG1wL2N3ZC9mb28vcmVzdWx0cy5odG1s JyldKQogCiAgICAgZGVmIHRlc3RfcmV0cnlpbmdfYW5kX2ZsYWt5X3Rlc3RzKHNlbGYpOgogICAg ICAgICBob3N0ID0gTW9ja0hvc3QoKQo=