58402 2011-04-12 17:21:38 -0700 old-run-webkit-tests/new-run-webkit-tests shouldn't read or write .checksum files 2011-04-21 14:10:26 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 56286 1 tony tony aroben dpranke ojan oldest_to_newest 384540 0 tony 2011-04-12 17:21:38 -0700 old-run-webkit-tests shouldn't write .checksum files 384542 1 89313 tony 2011-04-12 17:24:10 -0700 Created attachment 89313 Patch 384543 2 tony 2011-04-12 17:24:44 -0700 I'll send a note to webkit-dev before landing this. 385362 3 tony 2011-04-13 16:58:12 -0700 Feel free to suggest other reviewers. 385699 4 89313 aroben 2011-04-14 06:16:15 -0700 Comment on attachment 89313 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89313&action=review > Tools/Scripts/old-run-webkit-tests:936 > + if (-f $expectedChecksumPath) { > + unlink $expectedChecksumPath; > + } This seems strange. People are going to have files disappearing from their working trees without any explanation. I think it would be a lot better to just do a one-time delete of all .checksum files in the WebKit tree and commit that separately. 385841 5 tony 2011-04-14 10:13:51 -0700 (In reply to comment #4) > This seems strange. People are going to have files disappearing from their working trees without any explanation. I think it would be a lot better to just do a one-time delete of all .checksum files in the WebKit tree and commit that separately. I said I would send a note to webkit-dev before landing this :) But if you prefer, I can update the existing pngs and remove the .checksum files first. The downside is there will be a window of time between the patches (or patches created before the .checksum delete and landed after) where people will be checking in .checksums after I've deleted all of them. I guess I can just do a second pass a week later. 385864 6 aroben 2011-04-14 10:47:58 -0700 Seems like the steps could be: 1) Embed checksums in all existing PNGs 2) Change ORWT not to read or write .checksum files 3) Delete all .checksum files These could each be done separately. 385875 7 tony 2011-04-14 10:56:00 -0700 (In reply to comment #6) > Seems like the steps could be: > > 1) Embed checksums in all existing PNGs > 2) Change ORWT not to read or write .checksum files > 3) Delete all .checksum files > > These could each be done separately. That sounds fine to me. This is part of step 2 (the read part is done). I'll come back and r? this once step 1 is done. 390158 8 tony 2011-04-21 10:53:53 -0700 *** Bug 57575 has been marked as a duplicate of this bug. *** 390209 9 90566 tony 2011-04-21 11:49:13 -0700 Created attachment 90566 Patch 390212 10 90566 aroben 2011-04-21 11:50:36 -0700 Comment on attachment 90566 Patch The ORWT changes look good to me. Someone more familiar with NRWT should review that part. 390213 11 tony 2011-04-21 11:50:50 -0700 (In reply to comment #6) > 1) Embed checksums in all existing PNGs > 2) Change ORWT not to read or write .checksum files > 3) Delete all .checksum files (1) is done. This is (2). I'll send a note to webkit-dev after landing this. It'll be harmless if people continue to check in .checksum files for a few days. They'll just be ignored. 390216 12 90567 tony 2011-04-21 11:53:26 -0700 Created attachment 90567 add comment back to ORWT 390219 13 90567 ojan 2011-04-21 11:58:30 -0700 Comment on attachment 90567 add comment back to ORWT View in context: https://bugs.webkit.org/attachment.cgi?id=90567&action=review > Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:149 > if self._options.pixel_tests and driver_output.image_hash: maybe this check should be driver_output.image instead of driver_output.image_hash now? 390315 14 tony 2011-04-21 14:09:14 -0700 Committed r84544: <http://trac.webkit.org/changeset/84544> 390320 15 tony 2011-04-21 14:10:26 -0700 (In reply to comment #13) > (From update of attachment 90567 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=90567&action=review > > > Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:149 > > if self._options.pixel_tests and driver_output.image_hash: > > maybe this check should be driver_output.image instead of driver_output.image_hash now? I switched this before committing. There's a lot of code in NRWT that we can update/delete now, but I'll do that in a follow up patch. 89313 2011-04-12 17:24:10 -0700 2011-04-21 11:49:10 -0700 Patch bug-58402-20110412172409.patch text/plain 2869 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODM2NTcKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA0YTM4YWYyNDQ1ODdmOGM2ODMyZjZhYmExYTM3ODhmZmQx NWQ2NDlhLi5mYTNhZTZhMjEyZTU0ZWM0YzdjZGM4MTdlMmViMGNjMWEyYzQxNzg1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDQtMTIgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBvbGQtcnVuLXdlYmtpdC10 ZXN0cyBzaG91bGRuJ3Qgd3JpdGUgLmNoZWNrc3VtIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODQwMgorCisgICAgICAgIFNpbmNlIGFsbCB0 aGUgcG9ydHMgd3JpdGUgdGhlIGNoZWNrc3VtIGluIHRoZSBwbmcgZmlsZSBhbmQKKyAgICAgICAg b2xkLXJ1bi13ZWJraXQtdGVzdHMgYW5kIG5ldy1ydW4td2Via2l0LXRlc3RzIGtub3cgaG93IHRv CisgICAgICAgIHJlYWQgdGhlc2UsIHN0b3Agd3JpdGluZyB0aGUgLmNoZWNrc3VtIGZpbGVzIGZv ciBuZXcgdGVzdHMsCisgICAgICAgIC0tcmVzZXQtcmVzdWx0cywgYW5kIC0tYWRkLXBsYXRmb3Jt LWV4Y2VwdGlvbnMuICBJZiB0aGVyZSdzCisgICAgICAgIGFscmVhZHkgYSAuY2hlY2tzdW0gZmls ZSwgZGVsZXRlIGl0LgorCisgICAgICAgICogU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0czoK KwogMjAxMS0wNC0xMiAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgVW5yZXZpZXdlZCBidWlsZCBjb3JyZWN0aW9uIGZvciBXaW5DYWlybyBib3QgYWZ0ZXIg cjgzNjM5LgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0cyBi L1Rvb2xzL1NjcmlwdHMvb2xkLXJ1bi13ZWJraXQtdGVzdHMKaW5kZXggNTFmMDgzZjNhMTQ2MzQy ODkwZjc2MDUzMWU1OTEyMDY1MTY4M2ZlNy4uNGNhMzI0ZjNlODU2ZjBkMWVhYjkzYWYxNTNkMTQx NTAxYmYwY2Y1ZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10ZXN0 cworKysgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCkBAIC05MjksMTEgKzky OSwxMSBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewogICAgICAgICBpZiAoJHJlc2V0UmVzdWx0 cyB8fCAhLWYgJGV4cGVjdGVkUE5HUGF0aCkgewogICAgICAgICAgICAgbWtwYXRoIGNhdGZpbGUo JGV4cGVjdGVkUGl4ZWxEaXIsIGRpcm5hbWUoJGJhc2UpKSBpZiAkdGVzdERpcmVjdG9yeSBuZSAk ZXhwZWN0ZWRQaXhlbERpcjsKICAgICAgICAgICAgIHdyaXRlVG9GaWxlKCRleHBlY3RlZFBOR1Bh dGgsICRhY3R1YWxQTkcpOwotICAgICAgICB9CiAKLSAgICAgICAgbXkgJGV4cGVjdGVkQ2hlY2tz dW1QYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgkZXhwZWN0ZWRQaXhlbERpciwgIiRiYXNlLSRl eHBlY3RlZFRhZy5jaGVja3N1bSIpOwotICAgICAgICBpZiAoJGFjdHVhbEhhc2ggbmUgIiIgJiYg KCRyZXNldFJlc3VsdHMgfHwgIS1mICRleHBlY3RlZENoZWNrc3VtUGF0aCkpIHsKLSAgICAgICAg ICAgIHdyaXRlVG9GaWxlKCRleHBlY3RlZENoZWNrc3VtUGF0aCwgJGFjdHVhbEhhc2gpOworICAg ICAgICAgICAgbXkgJGV4cGVjdGVkQ2hlY2tzdW1QYXRoID0gRmlsZTo6U3BlYy0+Y2F0ZmlsZSgk ZXhwZWN0ZWRQaXhlbERpciwgIiRiYXNlLSRleHBlY3RlZFRhZy5jaGVja3N1bSIpOworICAgICAg ICAgICAgaWYgKC1mICRleHBlY3RlZENoZWNrc3VtUGF0aCkgeworICAgICAgICAgICAgICAgIHVu bGluayAkZXhwZWN0ZWRDaGVja3N1bVBhdGg7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAg ICB9CiAKQEAgLTk5NiwxMSArOTk2LDEzIEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAg ICAgICAgICAgICAgICAgIHdyaXRlVG9GaWxlKCIkZXhwZWN0ZWRGaWxlIiwgJGFjdHVhbCk7CiAg ICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIGlmICgkcGl4ZWxUZXN0RmFpbGVkKSB7 Ci0gICAgICAgICAgICAgICAgICAgIG15ICRleHBlY3RlZEZpbGUgPSBjYXRmaWxlKCRwbGF0Zm9y bVRlc3REaXJlY3RvcnksICIkYmFzZS0kZXhwZWN0ZWRUYWcuY2hlY2tzdW0iKTsKLSAgICAgICAg ICAgICAgICAgICAgd3JpdGVUb0ZpbGUoIiRleHBlY3RlZEZpbGUiLCAkYWN0dWFsSGFzaCk7Ci0K LSAgICAgICAgICAgICAgICAgICAgJGV4cGVjdGVkRmlsZSA9IGNhdGZpbGUoJHBsYXRmb3JtVGVz dERpcmVjdG9yeSwgIiRiYXNlLSRleHBlY3RlZFRhZy5wbmciKTsKKyAgICAgICAgICAgICAgICAg ICAgbXkgJGV4cGVjdGVkRmlsZSA9IGNhdGZpbGUoJHBsYXRmb3JtVGVzdERpcmVjdG9yeSwgIiRi YXNlLSRleHBlY3RlZFRhZy5wbmciKTsKICAgICAgICAgICAgICAgICAgICAgd3JpdGVUb0ZpbGUo IiRleHBlY3RlZEZpbGUiLCAkYWN0dWFsUE5HKTsKKworICAgICAgICAgICAgICAgICAgICAkZXhw ZWN0ZWRGaWxlID0gY2F0ZmlsZSgkcGxhdGZvcm1UZXN0RGlyZWN0b3J5LCAiJGJhc2UtJGV4cGVj dGVkVGFnLmNoZWNrc3VtIik7CisgICAgICAgICAgICAgICAgICAgIGlmICgtZiAkZXhwZWN0ZWRG aWxlKSB7CisgICAgICAgICAgICAgICAgICAgICAgICB1bmxpbmsgJGV4cGVjdGVkRmlsZTsKKyAg ICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAk bWVzc2FnZSAuPSAiIChyZXN1bHRzIGdlbmVyYXRlZCBpbiAkcGxhdGZvcm1UZXN0RGlyZWN0b3J5 KSI7CiAgICAgICAgICAgICB9Cg== 90566 2011-04-21 11:49:13 -0700 2011-04-21 11:53:23 -0700 Patch bug-58402-20110421114911.patch text/plain 10884 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODQ1MjEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMGVhYThmOGM2NjEwZTg0ZDYwNzZhZDM2MmFkMjI2ZGYx YTBlZWRmLi44ZGRmYWMyNWRhOGUyMTMzYjQ5OWE3NDEzMGQ1ZjM5NmI4MzljYTI0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDQtMjEgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBvbGQtcnVuLXdlYmtpdC10 ZXN0cy9uZXctcnVuLXdlYmtpdC10ZXN0cyBzaG91bGRuJ3QgcmVhZCBvciB3cml0ZSAuY2hlY2tz dW0gZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU4NDAyCisKKyAgICAgICAgKiBTY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzOiBEb24ndCBy ZWFkIG9yIHdyaXRlIC5jaGVja3N1bSBmaWxlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHk6IERvbid0 IHdyaXRlIC5jaGVja3N1bSBmaWxlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Jhc2UucHk6IERvbid0IHJlYWQgLmNoZWNrc3VtIGZpbGVzLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3Qu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5 OiBVcGRhdGUgcGFzc2luZyBwbmdzIHRvIGluY2x1ZGUgYSBjaGVja3N1bS4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5 OgorCiAyMDExLTA0LTIwICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvb2xk LXJ1bi13ZWJraXQtdGVzdHMgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCmlu ZGV4IDFkYzY5YmQxMmY1Nzk5MmFjMjg1ZGM3ZTM4MmEzNDIzZTRjZWVjOTMuLjZjYzRkYmNiNDU5 NzZhZmQ0MmUyNTAzZmEyNjMxYjc3YmM2MDg2NjYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv b2xkLXJ1bi13ZWJraXQtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10 ZXN0cwpAQCAtNzUyLDE0ICs3NTIsNyBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewogICAgIG15 ICRzdWZmaXhFeHBlY3RlZEhhc2ggPSAiIjsKICAgICBpZiAoJHBpeGVsVGVzdHMgJiYgISRyZXNl dFJlc3VsdHMpIHsKICAgICAgICAgbXkgJGV4cGVjdGVkUGl4ZWxEaXIgPSBleHBlY3RlZERpcmVj dG9yeUZvclRlc3QoJGJhc2UsIDAsICJwbmciKTsKLSAgICAgICAgaWYgKG9wZW4gRVhQRUNURURI QVNILCBGaWxlOjpTcGVjLT5jYXRmaWxlKCRleHBlY3RlZFBpeGVsRGlyLCAiJGJhc2UtJGV4cGVj dGVkVGFnLmNoZWNrc3VtIikpIHsKLSAgICAgICAgICAgIG15ICRleHBlY3RlZEhhc2ggPSA8RVhQ RUNURURIQVNIPjsKLSAgICAgICAgICAgIGNob21wKCRleHBlY3RlZEhhc2gpOwotICAgICAgICAg ICAgY2xvc2UgRVhQRUNURURIQVNIOwotICAgICAgICAgICAgCi0gICAgICAgICAgICAjIEZvcm1h dCBleHBlY3RlZCBoYXNoIGludG8gYSBzdWZmaXggc3RyaW5nIHRoYXQgaXMgYXBwZW5kZWQgdG8g dGhlIHBhdGggLyBVUkwgcGFzc2VkIHRvIERSVAotICAgICAgICAgICAgJHN1ZmZpeEV4cGVjdGVk SGFzaCA9ICInJGV4cGVjdGVkSGFzaCI7Ci0gICAgICAgIH0gZWxzaWYgKG15ICRleHBlY3RlZEhh c2ggPSByZWFkQ2hlY2tzdW1Gcm9tUG5nKEZpbGU6OlNwZWMtPmNhdGZpbGUoJGV4cGVjdGVkUGl4 ZWxEaXIsICIkYmFzZS0kZXhwZWN0ZWRUYWcucG5nIikpKSB7CisgICAgICAgIGlmIChteSAkZXhw ZWN0ZWRIYXNoID0gcmVhZENoZWNrc3VtRnJvbVBuZyhGaWxlOjpTcGVjLT5jYXRmaWxlKCRleHBl Y3RlZFBpeGVsRGlyLCAiJGJhc2UtJGV4cGVjdGVkVGFnLnBuZyIpKSkgewogICAgICAgICAgICAg JHN1ZmZpeEV4cGVjdGVkSGFzaCA9ICInJGV4cGVjdGVkSGFzaCI7CiAgICAgICAgIH0KICAgICB9 CkBAIC05NDIsMTEgKzkzNSw2IEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgICAgICAg ICBta3BhdGggY2F0ZmlsZSgkZXhwZWN0ZWRQaXhlbERpciwgZGlybmFtZSgkYmFzZSkpIGlmICR0 ZXN0RGlyZWN0b3J5IG5lICRleHBlY3RlZFBpeGVsRGlyOwogICAgICAgICAgICAgd3JpdGVUb0Zp bGUoJGV4cGVjdGVkUE5HUGF0aCwgJGFjdHVhbFBORyk7CiAgICAgICAgIH0KLQotICAgICAgICBt eSAkZXhwZWN0ZWRDaGVja3N1bVBhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKCRleHBlY3RlZFBp eGVsRGlyLCAiJGJhc2UtJGV4cGVjdGVkVGFnLmNoZWNrc3VtIik7Ci0gICAgICAgIGlmICgkYWN0 dWFsSGFzaCBuZSAiIiAmJiAoJHJlc2V0UmVzdWx0cyB8fCAhLWYgJGV4cGVjdGVkQ2hlY2tzdW1Q YXRoKSkgewotICAgICAgICAgICAgd3JpdGVUb0ZpbGUoJGV4cGVjdGVkQ2hlY2tzdW1QYXRoLCAk YWN0dWFsSGFzaCk7Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoZHVtcFRvb2xEaWRDcmFz aCgpKSB7CkBAIC0xMDA4LDEwICs5OTYsNyBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewogICAg ICAgICAgICAgICAgICAgICB3cml0ZVRvRmlsZSgiJGV4cGVjdGVkRmlsZSIsICRhY3R1YWwpOwog ICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBpZiAoJHBpeGVsVGVzdEZhaWxlZCkg ewotICAgICAgICAgICAgICAgICAgICBteSAkZXhwZWN0ZWRGaWxlID0gY2F0ZmlsZSgkcGxhdGZv cm1UZXN0RGlyZWN0b3J5LCAiJGJhc2UtJGV4cGVjdGVkVGFnLmNoZWNrc3VtIik7Ci0gICAgICAg ICAgICAgICAgICAgIHdyaXRlVG9GaWxlKCIkZXhwZWN0ZWRGaWxlIiwgJGFjdHVhbEhhc2gpOwot Ci0gICAgICAgICAgICAgICAgICAgICRleHBlY3RlZEZpbGUgPSBjYXRmaWxlKCRwbGF0Zm9ybVRl c3REaXJlY3RvcnksICIkYmFzZS0kZXhwZWN0ZWRUYWcucG5nIik7CisgICAgICAgICAgICAgICAg ICAgIG15ICRleHBlY3RlZEZpbGUgPSBjYXRmaWxlKCRwbGF0Zm9ybVRlc3REaXJlY3RvcnksICIk YmFzZS0kZXhwZWN0ZWRUYWcucG5nIik7CiAgICAgICAgICAgICAgICAgICAgIHdyaXRlVG9GaWxl KCIkZXhwZWN0ZWRGaWxlIiwgJGFjdHVhbFBORyk7CiAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgICRtZXNzYWdlIC49ICIgKHJlc3VsdHMgZ2VuZXJhdGVkIGluICRwbGF0Zm9ybVRl c3REaXJlY3RvcnkpIjsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0 X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5lci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5l ci5weQppbmRleCBjMzhjYjhmODdlZDUxN2RjMGRhNTZjMTIxNzI2YWMxNWYzZTQ0N2M3Li41OTMw ZjVlMmIwMmVkYzdhODZhNGQzM2Y3M2RkYmNkZDUwMGI0NmM3IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9y dW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0 X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CkBAIC0xNDksOCArMTQ5LDYgQEAgY2xhc3Mg U2luZ2xlVGVzdFJ1bm5lcjoKICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5waXhlbF90ZXN0cyBh bmQgZHJpdmVyX291dHB1dC5pbWFnZV9oYXNoOgogICAgICAgICAgICAgc2VsZi5fc2F2ZV9iYXNl bGluZV9kYXRhKGRyaXZlcl9vdXRwdXQuaW1hZ2UsICIucG5nIiwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBnZW5lcmF0ZV9uZXdfYmFzZWxpbmU9c2VsZi5fb3B0aW9ucy5u ZXdfYmFzZWxpbmUpCi0gICAgICAgICAgICBzZWxmLl9zYXZlX2Jhc2VsaW5lX2RhdGEoZHJpdmVy X291dHB1dC5pbWFnZV9oYXNoLCAiLmNoZWNrc3VtIiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBnZW5lcmF0ZV9uZXdfYmFzZWxpbmU9c2VsZi5fb3B0aW9ucy5uZXdfYmFz ZWxpbmUpCiAKICAgICBkZWYgX3NhdmVfYmFzZWxpbmVfZGF0YShzZWxmLCBkYXRhLCBtb2RpZmll ciwgZ2VuZXJhdGVfbmV3X2Jhc2VsaW5lPVRydWUpOgogICAgICAgICAiIiJTYXZlcyBhIG5ldyBi YXNlbGluZSBmaWxlIGludG8gdGhlIHBvcnQncyBiYXNlbGluZSBkaXJlY3RvcnkuCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Jhc2UucHkKaW5kZXggYzJl NTY1ZWExNTI1NDc1MWQyZTJkYmMwZWQ0NmY2ODQ4ZWM5MzU0NC4uYmM2ZDU4MmQyZTNlNTdkNGNm OThjNTgyODA4ZmFhOTUzNTk4MDNjOSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9sYXlvdXRfdGVzdHMvcG9ydC9iYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQpAQCAtMzQyLDEwICszNDIsNiBAQCBjbGFzcyBQb3J0 KG9iamVjdCk6CiAgICAgZGVmIGV4cGVjdGVkX2NoZWNrc3VtKHNlbGYsIHRlc3QpOgogICAgICAg ICAiIiJSZXR1cm5zIHRoZSBjaGVja3N1bSBvZiB0aGUgaW1hZ2Ugd2UgZXhwZWN0IHRoZSB0ZXN0 IHRvIHByb2R1Y2UsIG9yIE5vbmUgaWYgaXQgaXMgYSB0ZXh0LW9ubHkgdGVzdC4iIiIKICAgICAg ICAgcG5nX3BhdGggPSBzZWxmLmV4cGVjdGVkX2ZpbGVuYW1lKHRlc3QsICcucG5nJykKLSAgICAg ICAgY2hlY2tzdW1fcGF0aCA9IHNlbGYuX2ZpbGVzeXN0ZW0uc3BsaXRleHQocG5nX3BhdGgpWzBd ICsgJy5jaGVja3N1bScKLQotICAgICAgICBpZiBzZWxmLnBhdGhfZXhpc3RzKGNoZWNrc3VtX3Bh dGgpOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYuX2ZpbGVzeXN0ZW0ucmVhZF9iaW5hcnlfZmls ZShjaGVja3N1bV9wYXRoKQogCiAgICAgICAgIGlmIHNlbGYucGF0aF9leGlzdHMocG5nX3BhdGgp OgogICAgICAgICAgICAgd2l0aCBzZWxmLl9maWxlc3lzdGVtLm9wZW5fYmluYXJ5X2ZpbGVfZm9y X3JlYWRpbmcocG5nX3BhdGgpIGFzIGZpbGVoYW5kbGU6CmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0X3VuaXR0ZXN0LnB5IGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydF91bml0dGVzdC5w eQppbmRleCBjNDg5ZTIwZWZlZmFlN2JjYzg0NDMzODU5OGJlMGEzYmJmYWYzMmQ0Li5jYjVmZGEw MzQyYzJlN2M0ZGU4ZmE4ZGM4OTRjYmNlYzc5YzdhODJlIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0X3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRl c3QucHkKQEAgLTIwNCw4ICsyMDQsOCBAQCBjbGFzcyBNb2NrRFJUVGVzdCh1bml0dGVzdC5UZXN0 Q2FzZSk6CiAgICAgICAgICAgICAgICAgICAgICAgICAnQWN0dWFsSGFzaDogY2hlY2tzdW0tY2hl Y2tzdW1cbicsCiAgICAgICAgICAgICAgICAgICAgICAgICAnRXhwZWN0ZWRIYXNoOiB3cm9uZy1j aGVja3N1bVxuJywKICAgICAgICAgICAgICAgICAgICAgICAgICdDb250ZW50LVR5cGU6IGltYWdl L3BuZ1xuJywKLSAgICAgICAgICAgICAgICAgICAgICAgICdDb250ZW50LUxlbmd0aDogMTNcbics Ci0gICAgICAgICAgICAgICAgICAgICAgICAnY2hlY2tzdW1ceDhhLXBuZycsCisgICAgICAgICAg ICAgICAgICAgICAgICAnQ29udGVudC1MZW5ndGg6IDQzXG4nLAorICAgICAgICAgICAgICAgICAg ICAgICAgJ2NoZWNrc3VtXHg4YS1wbmd0RVh0Y2hlY2tzdW1ceDAwY2hlY2tzdW0tY2hlY2tzdW0n LAogICAgICAgICAgICAgICAgICAgICAgICAgJyNFT0ZcbiddKQogCiAgICAgZGVmIHRlc3RfdGV4 dG9ubHkoc2VsZik6CkBAIC0yNjIsNyArMjYyLDcgQEAgY2xhc3MgTW9ja0Nocm9taXVtRFJUVGVz dChNb2NrRFJUVGVzdCk6CiAgICAgICAgICAgICAgICAgICAgICAgICAnI0VPRlxuJ10sCiAgICAg ICAgICAgICBmaWxlc3lzdGVtPWZpbGVzeXN0ZW0pCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWxz KGZpbGVzeXN0ZW0ud3JpdHRlbl9maWxlcywKLSAgICAgICAgICAgIHsnL3RtcC9wbmdfcmVzdWx0 MC5wbmcnOiAnY2hlY2tzdW1ceDhhLXBuZyd9KQorICAgICAgICAgICAgeycvdG1wL3BuZ19yZXN1 bHQwLnBuZyc6ICdjaGVja3N1bVx4OGEtcG5ndEVYdGNoZWNrc3VtXHgwMGNoZWNrc3VtLWNoZWNr c3VtJ30pCiAKICAgICBkZWYgdGVzdF9jaHJvbWl1bV9wYXJzZV9vcHRpb25zKHNlbGYpOgogICAg ICAgICBvcHRpb25zLCBhcmdzID0gbW9ja19kcnQucGFyc2Vfb3B0aW9ucyhbJy0tcGxhdGZvcm0n LCAnY2hyb21pdW0tbWFjJywKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5 b3V0X3Rlc3RzL3BvcnQvdGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvdGVzdC5weQppbmRleCBmZWQ3ZTExMDJmNDBiYTAyNGUzM2Y1NjFmYTIxNGQ1NmUw N2U4Mzk3Li5iYzI2NTViNzRhMGFkM2MwN2VlYmE2MzQxMDk2ZThiZWRkNDVmMTk4IDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5CkBAIC02 MSw3ICs2MSw3IEBAIGNsYXNzIFRlc3RJbnN0YW5jZToKIAogICAgICAgICAjIFdlIGFkZCB0aGUg J1x4OGEnIGZvciB0aGUgaW1hZ2UgZmlsZSB0byBwcmV2ZW50IHRoZSB2YWx1ZSBmcm9tCiAgICAg ICAgICMgYmVpbmcgdHJlYXRlZCBhcyBVVEYtOCAodGhlIGNoYXJhY3RlciBpcyBpbnZhbGlkKQot ICAgICAgICBzZWxmLmFjdHVhbF9pbWFnZSA9IHNlbGYuYmFzZSArICdceDhhJyArICctcG5nJwor ICAgICAgICBzZWxmLmFjdHVhbF9pbWFnZSA9IHNlbGYuYmFzZSArICdceDhhJyArICctcG5nJyAr ICd0RVh0Y2hlY2tzdW1ceDAwJyArIHNlbGYuYWN0dWFsX2NoZWNrc3VtCiAKICAgICAgICAgc2Vs Zi5leHBlY3RlZF90ZXh0ID0gc2VsZi5hY3R1YWxfdGV4dAogICAgICAgICBzZWxmLmV4cGVjdGVk X2NoZWNrc3VtID0gc2VsZi5hY3R1YWxfY2hlY2tzdW0KQEAgLTEwOSw4ICsxMDksOCBAQCBkZWYg dW5pdF90ZXN0X2xpc3QoKToKICAgICB0ZXN0cy5hZGQoJ2ZhaWx1cmVzL2V4cGVjdGVkL2hhbmcu aHRtbCcsIGhhbmc9VHJ1ZSkKICAgICB0ZXN0cy5hZGQoJ2ZhaWx1cmVzL2V4cGVjdGVkL21pc3Np bmdfdGV4dC5odG1sJywgZXhwZWN0ZWRfdGV4dD1Ob25lKQogICAgIHRlc3RzLmFkZCgnZmFpbHVy ZXMvZXhwZWN0ZWQvaW1hZ2UuaHRtbCcsCi0gICAgICAgICAgICAgIGFjdHVhbF9pbWFnZT0naW1h Z2VfZmFpbC1wbmcnLAotICAgICAgICAgICAgICBleHBlY3RlZF9pbWFnZT0naW1hZ2UtcG5nJykK KyAgICAgICAgICAgICAgYWN0dWFsX2ltYWdlPSdpbWFnZV9mYWlsLXBuZ3RFWHRjaGVja3N1bVx4 MDBjaGVja3N1bV9mYWlsJywKKyAgICAgICAgICAgICAgZXhwZWN0ZWRfaW1hZ2U9J2ltYWdlLXBu Z3RFWHRjaGVja3N1bVx4MDBjaGVja3N1bS1wbmcnKQogICAgIHRlc3RzLmFkZCgnZmFpbHVyZXMv ZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0uaHRtbCcsCiAgICAgICAgICAgICAgIGFjdHVhbF9jaGVj a3N1bT0naW1hZ2VfY2hlY2tzdW1fZmFpbC1jaGVja3N1bScsCiAgICAgICAgICAgICAgIGFjdHVh bF9pbWFnZT0naW1hZ2VfY2hlY2tzdW1fZmFpbC1wbmcnKQpAQCAtMjE0LDggKzIxNCw3IEBAIGRl ZiB1bml0X3Rlc3RfZmlsZXN5c3RlbShmaWxlcz1Ob25lKToKICAgICBmaWxlc1tMQVlPVVRfVEVT VF9ESVIgKyAnL3BsYXRmb3JtL3Rlc3QvdGVzdF9leHBlY3RhdGlvbnMudHh0J10gPSAiIiIKIFdP TlRGSVggOiBmYWlsdXJlcy9leHBlY3RlZC9jaGVja3N1bS5odG1sID0gSU1BR0UKIFdPTlRGSVgg OiBmYWlsdXJlcy9leHBlY3RlZC9jcmFzaC5odG1sID0gQ1JBU0gKLS8vIFRoaXMgb25lIGFjdHVh bGx5IHBhc3NlcyBiZWNhdXNlIHRoZSBjaGVja3N1bXMgd2lsbCBtYXRjaC4KLVdPTlRGSVggOiBm YWlsdXJlcy9leHBlY3RlZC9pbWFnZS5odG1sID0gUEFTUworV09OVEZJWCA6IGZhaWx1cmVzL2V4 cGVjdGVkL2ltYWdlLmh0bWwgPSBJTUFHRQogV09OVEZJWCA6IGZhaWx1cmVzL2V4cGVjdGVkL2F1 ZGlvLmh0bWwgPSBBVURJTwogV09OVEZJWCA6IGZhaWx1cmVzL2V4cGVjdGVkL2ltYWdlX2NoZWNr c3VtLmh0bWwgPSBJTUFHRQogV09OVEZJWCA6IGZhaWx1cmVzL2V4cGVjdGVkL21pc21hdGNoLmh0 bWwgPSBJTUFHRQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkv bGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKaW5kZXggOTQwYjRiODc5 ZWQ0YmU0MTNkYjI0NTRmZmQyYjQ1ZmQyZjllMGVhOC4uMThhNzcxMzFkNDZhOGNkYmRlMDQzMmQ2 MTY1NTE2ZDZkNWM5OTNjNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CkBAIC01 OTEsNyArNTkxLDcgQEAgTWFpblRlc3QgPSBza2lwX2lmKE1haW5UZXN0LCBzeXMucGxhdGZvcm0g PT0gJ2N5Z3dpbicgYW5kIGNvbXBhcmVfdmVyc2lvbihzeXMsICcKIGNsYXNzIFJlYmFzZWxpbmVU ZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgYXNzZXJ0QmFzZWxpbmVzKHNlbGYsIGZp bGVfbGlzdCwgZmlsZSk6CiAgICAgICAgICJhc3NlcnQgdGhhdCB0aGUgZmlsZV9saXN0IGNvbnRh aW5zIHRoZSBiYXNlbGluZXMuIiIiCi0gICAgICAgIGZvciBleHQgaW4gWyIudHh0IiwgIi5wbmci LCAiLmNoZWNrc3VtIl06CisgICAgICAgIGZvciBleHQgaW4gKCIudHh0IiwgIi5wbmciKToKICAg ICAgICAgICAgIGJhc2VsaW5lID0gZmlsZSArICItZXhwZWN0ZWQiICsgZXh0CiAgICAgICAgICAg ICBzZWxmLmFzc2VydFRydWUoYW55KGYuZmluZChiYXNlbGluZSkgIT0gLTEgZm9yIGYgaW4gZmls ZV9saXN0KSkKIApAQCAtNjA5LDExICs2MDksMTIgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QodW5p dHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgICAgICAgICAgICAgdGVzdHNfaW5jbHVkZWQ9 VHJ1ZSwgZmlsZXN5c3RlbT1mcykKICAgICAgICAgZmlsZV9saXN0ID0gZnMud3JpdHRlbl9maWxl cy5rZXlzKCkKICAgICAgICAgZmlsZV9saXN0LnJlbW92ZSgnL3RtcC9sYXlvdXQtdGVzdC1yZXN1 bHRzL3Rlc3RzX3J1bjAudHh0JykKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oZmlsZV9s aXN0KSwgNikKLSAgICAgICAgc2VsZi5hc3NlcnRCYXNlbGluZXMoZmlsZV9saXN0LAotICAgICAg ICAgICAgIi9wYXNzZXMvaW1hZ2UiKQotICAgICAgICBzZWxmLmFzc2VydEJhc2VsaW5lcyhmaWxl X2xpc3QsCi0gICAgICAgICAgICAiL2ZhaWx1cmVzL2V4cGVjdGVkL21pc3NpbmdfaW1hZ2UiKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihmaWxlX2xpc3QpLCA0KQorICAgICAgICAjIFZl cmlmeSB0aGF0IHdlIGRpZG4ndCB0b3VjaCBhbnkgLmNoZWNrc3VtIGZpbGVzLgorICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKDAsIGxlbihbZmlsZW5hbWUgZm9yIGZpbGVuYW1lIGluIGZzLndyaXR0 ZW5fZmlsZXMua2V5cygpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiBmaWxl bmFtZS5lbmRzd2l0aCgnLmNoZWNrc3VtJyldKSkKKyAgICAgICAgc2VsZi5hc3NlcnRCYXNlbGlu ZXMoZmlsZV9saXN0LCAiL3Bhc3Nlcy9pbWFnZSIpCisgICAgICAgIHNlbGYuYXNzZXJ0QmFzZWxp bmVzKGZpbGVfbGlzdCwgIi9mYWlsdXJlcy9leHBlY3RlZC9taXNzaW5nX2ltYWdlIikKIAogICAg IGRlZiB0ZXN0X25ld19iYXNlbGluZShzZWxmKToKICAgICAgICAgIyBUZXN0IHRoYXQgd2UgdXBk YXRlIHRoZSBwbGF0Zm9ybSBleHBlY3RhdGlvbnMuIElmIHRoZSBleHBlY3RhdGlvbgpAQCAtNjI2 LDcgKzYyNyw3IEBAIGNsYXNzIFJlYmFzZWxpbmVUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAg ICAgICAgICAgICAgICAgICAgdGVzdHNfaW5jbHVkZWQ9VHJ1ZSwgZmlsZXN5c3RlbT1mcykKICAg ICAgICAgZmlsZV9saXN0ID0gZnMud3JpdHRlbl9maWxlcy5rZXlzKCkKICAgICAgICAgZmlsZV9s aXN0LnJlbW92ZSgnL3RtcC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rlc3RzX3J1bjAudHh0JykKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChsZW4oZmlsZV9saXN0KSwgNikKKyAgICAgICAgc2VsZi5h c3NlcnRFcXVhbChsZW4oZmlsZV9saXN0KSwgNCkKICAgICAgICAgc2VsZi5hc3NlcnRCYXNlbGlu ZXMoZmlsZV9saXN0LAogICAgICAgICAgICAgIi9wbGF0Zm9ybS90ZXN0LW1hYy1sZW9wYXJkL3Bh c3Nlcy9pbWFnZSIpCiAgICAgICAgIHNlbGYuYXNzZXJ0QmFzZWxpbmVzKGZpbGVfbGlzdCwK 90567 2011-04-21 11:53:26 -0700 2011-04-21 11:58:30 -0700 add comment back to ORWT bug-58402-20110421115325.patch text/plain 10991 tony U3VidmVyc2lvbiBSZXZpc2lvbjogODQ1MjEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMGVhYThmOGM2NjEwZTg0ZDYwNzZhZDM2MmFkMjI2ZGYx YTBlZWRmLi44ZGRmYWMyNWRhOGUyMTMzYjQ5OWE3NDEzMGQ1ZjM5NmI4MzljYTI0IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDQtMjEgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBvbGQtcnVuLXdlYmtpdC10 ZXN0cy9uZXctcnVuLXdlYmtpdC10ZXN0cyBzaG91bGRuJ3QgcmVhZCBvciB3cml0ZSAuY2hlY2tz dW0gZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTU4NDAyCisKKyAgICAgICAgKiBTY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzOiBEb24ndCBy ZWFkIG9yIHdyaXRlIC5jaGVja3N1bSBmaWxlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2FnZS9zaW5nbGVfdGVzdF9ydW5uZXIucHk6IERvbid0 IHdyaXRlIC5jaGVja3N1bSBmaWxlcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Jhc2UucHk6IERvbid0IHJlYWQgLmNoZWNrc3VtIGZpbGVzLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3Qu cHk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC90ZXN0LnB5 OiBVcGRhdGUgcGFzc2luZyBwbmdzIHRvIGluY2x1ZGUgYSBjaGVja3N1bS4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5 OgorCiAyMDExLTA0LTIwICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgVG9ueSBDaGFuZy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvb2xk LXJ1bi13ZWJraXQtdGVzdHMgYi9Ub29scy9TY3JpcHRzL29sZC1ydW4td2Via2l0LXRlc3RzCmlu ZGV4IDFkYzY5YmQxMmY1Nzk5MmFjMjg1ZGM3ZTM4MmEzNDIzZTRjZWVjOTMuLjM0ZGI1YzMxYmQ3 ZTJkYWRmNDUxOGRkZDY3NjFmMzEwOTI1NzNlNWIgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv b2xkLXJ1bi13ZWJraXQtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9vbGQtcnVuLXdlYmtpdC10 ZXN0cwpAQCAtNzUyLDE0ICs3NTIsOCBAQCBmb3IgbXkgJHRlc3QgKEB0ZXN0cykgewogICAgIG15 ICRzdWZmaXhFeHBlY3RlZEhhc2ggPSAiIjsKICAgICBpZiAoJHBpeGVsVGVzdHMgJiYgISRyZXNl dFJlc3VsdHMpIHsKICAgICAgICAgbXkgJGV4cGVjdGVkUGl4ZWxEaXIgPSBleHBlY3RlZERpcmVj dG9yeUZvclRlc3QoJGJhc2UsIDAsICJwbmciKTsKLSAgICAgICAgaWYgKG9wZW4gRVhQRUNURURI QVNILCBGaWxlOjpTcGVjLT5jYXRmaWxlKCRleHBlY3RlZFBpeGVsRGlyLCAiJGJhc2UtJGV4cGVj dGVkVGFnLmNoZWNrc3VtIikpIHsKLSAgICAgICAgICAgIG15ICRleHBlY3RlZEhhc2ggPSA8RVhQ RUNURURIQVNIPjsKLSAgICAgICAgICAgIGNob21wKCRleHBlY3RlZEhhc2gpOwotICAgICAgICAg ICAgY2xvc2UgRVhQRUNURURIQVNIOwotICAgICAgICAgICAgCi0gICAgICAgICAgICAjIEZvcm1h dCBleHBlY3RlZCBoYXNoIGludG8gYSBzdWZmaXggc3RyaW5nIHRoYXQgaXMgYXBwZW5kZWQgdG8g dGhlIHBhdGggLyBVUkwgcGFzc2VkIHRvIERSVAotICAgICAgICAgICAgJHN1ZmZpeEV4cGVjdGVk SGFzaCA9ICInJGV4cGVjdGVkSGFzaCI7Ci0gICAgICAgIH0gZWxzaWYgKG15ICRleHBlY3RlZEhh c2ggPSByZWFkQ2hlY2tzdW1Gcm9tUG5nKEZpbGU6OlNwZWMtPmNhdGZpbGUoJGV4cGVjdGVkUGl4 ZWxEaXIsICIkYmFzZS0kZXhwZWN0ZWRUYWcucG5nIikpKSB7CisgICAgICAgIGlmIChteSAkZXhw ZWN0ZWRIYXNoID0gcmVhZENoZWNrc3VtRnJvbVBuZyhGaWxlOjpTcGVjLT5jYXRmaWxlKCRleHBl Y3RlZFBpeGVsRGlyLCAiJGJhc2UtJGV4cGVjdGVkVGFnLnBuZyIpKSkgeworICAgICAgICAgICAg IyBGb3JtYXQgZXhwZWN0ZWQgaGFzaCBpbnRvIGEgc3VmZml4IHN0cmluZyB0aGF0IGlzIGFwcGVu ZGVkIHRvIHRoZSBwYXRoIC8gVVJMIHBhc3NlZCB0byBEUlQuCiAgICAgICAgICAgICAkc3VmZml4 RXhwZWN0ZWRIYXNoID0gIickZXhwZWN0ZWRIYXNoIjsKICAgICAgICAgfQogICAgIH0KQEAgLTk0 MiwxMSArOTM2LDYgQEAgZm9yIG15ICR0ZXN0IChAdGVzdHMpIHsKICAgICAgICAgICAgIG1rcGF0 aCBjYXRmaWxlKCRleHBlY3RlZFBpeGVsRGlyLCBkaXJuYW1lKCRiYXNlKSkgaWYgJHRlc3REaXJl Y3RvcnkgbmUgJGV4cGVjdGVkUGl4ZWxEaXI7CiAgICAgICAgICAgICB3cml0ZVRvRmlsZSgkZXhw ZWN0ZWRQTkdQYXRoLCAkYWN0dWFsUE5HKTsKICAgICAgICAgfQotCi0gICAgICAgIG15ICRleHBl Y3RlZENoZWNrc3VtUGF0aCA9IEZpbGU6OlNwZWMtPmNhdGZpbGUoJGV4cGVjdGVkUGl4ZWxEaXIs ICIkYmFzZS0kZXhwZWN0ZWRUYWcuY2hlY2tzdW0iKTsKLSAgICAgICAgaWYgKCRhY3R1YWxIYXNo IG5lICIiICYmICgkcmVzZXRSZXN1bHRzIHx8ICEtZiAkZXhwZWN0ZWRDaGVja3N1bVBhdGgpKSB7 Ci0gICAgICAgICAgICB3cml0ZVRvRmlsZSgkZXhwZWN0ZWRDaGVja3N1bVBhdGgsICRhY3R1YWxI YXNoKTsKLSAgICAgICAgfQogICAgIH0KIAogICAgIGlmIChkdW1wVG9vbERpZENyYXNoKCkpIHsK QEAgLTEwMDgsMTAgKzk5Nyw3IEBAIGZvciBteSAkdGVzdCAoQHRlc3RzKSB7CiAgICAgICAgICAg ICAgICAgICAgIHdyaXRlVG9GaWxlKCIkZXhwZWN0ZWRGaWxlIiwgJGFjdHVhbCk7CiAgICAgICAg ICAgICAgICAgfQogICAgICAgICAgICAgICAgIGlmICgkcGl4ZWxUZXN0RmFpbGVkKSB7Ci0gICAg ICAgICAgICAgICAgICAgIG15ICRleHBlY3RlZEZpbGUgPSBjYXRmaWxlKCRwbGF0Zm9ybVRlc3RE aXJlY3RvcnksICIkYmFzZS0kZXhwZWN0ZWRUYWcuY2hlY2tzdW0iKTsKLSAgICAgICAgICAgICAg ICAgICAgd3JpdGVUb0ZpbGUoIiRleHBlY3RlZEZpbGUiLCAkYWN0dWFsSGFzaCk7Ci0KLSAgICAg ICAgICAgICAgICAgICAgJGV4cGVjdGVkRmlsZSA9IGNhdGZpbGUoJHBsYXRmb3JtVGVzdERpcmVj dG9yeSwgIiRiYXNlLSRleHBlY3RlZFRhZy5wbmciKTsKKyAgICAgICAgICAgICAgICAgICAgbXkg JGV4cGVjdGVkRmlsZSA9IGNhdGZpbGUoJHBsYXRmb3JtVGVzdERpcmVjdG9yeSwgIiRiYXNlLSRl eHBlY3RlZFRhZy5wbmciKTsKICAgICAgICAgICAgICAgICAgICAgd3JpdGVUb0ZpbGUoIiRleHBl Y3RlZEZpbGUiLCAkYWN0dWFsUE5HKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAg ICAgJG1lc3NhZ2UgLj0gIiAocmVzdWx0cyBnZW5lcmF0ZWQgaW4gJHBsYXRmb3JtVGVzdERpcmVj dG9yeSkiOwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv bGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9sYXlvdXRfdGVzdHMvbGF5b3V0X3BhY2thZ2Uvc2luZ2xlX3Rlc3RfcnVubmVyLnB5Cmlu ZGV4IGMzOGNiOGY4N2VkNTE3ZGMwZGE1NmMxMjE3MjZhYzE1ZjNlNDQ3YzcuLjU5MzBmNWUyYjAy ZWRjN2E4NmE0ZDMzZjczZGRiY2RkNTAwYjQ2YzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL2xheW91dF9wYWNrYWdlL3NpbmdsZV90ZXN0X3J1bm5lci5w eQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9sYXlvdXRfcGFja2Fn ZS9zaW5nbGVfdGVzdF9ydW5uZXIucHkKQEAgLTE0OSw4ICsxNDksNiBAQCBjbGFzcyBTaW5nbGVU ZXN0UnVubmVyOgogICAgICAgICBpZiBzZWxmLl9vcHRpb25zLnBpeGVsX3Rlc3RzIGFuZCBkcml2 ZXJfb3V0cHV0LmltYWdlX2hhc2g6CiAgICAgICAgICAgICBzZWxmLl9zYXZlX2Jhc2VsaW5lX2Rh dGEoZHJpdmVyX291dHB1dC5pbWFnZSwgIi5wbmciLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxmLl9vcHRpb25zLm5ld19iYXNl bGluZSkKLSAgICAgICAgICAgIHNlbGYuX3NhdmVfYmFzZWxpbmVfZGF0YShkcml2ZXJfb3V0cHV0 LmltYWdlX2hhc2gsICIuY2hlY2tzdW0iLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGdlbmVyYXRlX25ld19iYXNlbGluZT1zZWxmLl9vcHRpb25zLm5ld19iYXNlbGluZSkK IAogICAgIGRlZiBfc2F2ZV9iYXNlbGluZV9kYXRhKHNlbGYsIGRhdGEsIG1vZGlmaWVyLCBnZW5l cmF0ZV9uZXdfYmFzZWxpbmU9VHJ1ZSk6CiAgICAgICAgICIiIlNhdmVzIGEgbmV3IGJhc2VsaW5l IGZpbGUgaW50byB0aGUgcG9ydCdzIGJhc2VsaW5lIGRpcmVjdG9yeS4KZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weSBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvYmFzZS5weQppbmRleCBjMmU1NjVlYTE1 MjU0NzUxZDJlMmRiYzBlZDQ2ZjY4NDhlYzkzNTQ0Li5iYzZkNTgyZDJlM2U1N2Q0Y2Y5OGM1ODI4 MDhmYWE5NTM1OTgwM2M5IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91 dF90ZXN0cy9wb3J0L2Jhc2UucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcG9ydC9iYXNlLnB5CkBAIC0zNDIsMTAgKzM0Miw2IEBAIGNsYXNzIFBvcnQob2JqZWN0 KToKICAgICBkZWYgZXhwZWN0ZWRfY2hlY2tzdW0oc2VsZiwgdGVzdCk6CiAgICAgICAgICIiIlJl dHVybnMgdGhlIGNoZWNrc3VtIG9mIHRoZSBpbWFnZSB3ZSBleHBlY3QgdGhlIHRlc3QgdG8gcHJv ZHVjZSwgb3IgTm9uZSBpZiBpdCBpcyBhIHRleHQtb25seSB0ZXN0LiIiIgogICAgICAgICBwbmdf cGF0aCA9IHNlbGYuZXhwZWN0ZWRfZmlsZW5hbWUodGVzdCwgJy5wbmcnKQotICAgICAgICBjaGVj a3N1bV9wYXRoID0gc2VsZi5fZmlsZXN5c3RlbS5zcGxpdGV4dChwbmdfcGF0aClbMF0gKyAnLmNo ZWNrc3VtJwotCi0gICAgICAgIGlmIHNlbGYucGF0aF9leGlzdHMoY2hlY2tzdW1fcGF0aCk6Ci0g ICAgICAgICAgICByZXR1cm4gc2VsZi5fZmlsZXN5c3RlbS5yZWFkX2JpbmFyeV9maWxlKGNoZWNr c3VtX3BhdGgpCiAKICAgICAgICAgaWYgc2VsZi5wYXRoX2V4aXN0cyhwbmdfcGF0aCk6CiAgICAg ICAgICAgICB3aXRoIHNlbGYuX2ZpbGVzeXN0ZW0ub3Blbl9iaW5hcnlfZmlsZV9mb3JfcmVhZGlu ZyhwbmdfcGF0aCkgYXMgZmlsZWhhbmRsZToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L21vY2tfZHJ0X3VuaXR0ZXN0LnB5CmluZGV4 IGM0ODllMjBlZmVmYWU3YmNjODQ0MzM4NTk4YmUwYTNiYmZhZjMyZDQuLmNiNWZkYTAzNDJjMmU3 YzRkZThmYThkYzg5NGNiY2VjNzljN2E4MmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvbW9ja19kcnRfdW5pdHRlc3QucHkKKysrIGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9tb2NrX2RydF91bml0dGVzdC5weQpA QCAtMjA0LDggKzIwNCw4IEBAIGNsYXNzIE1vY2tEUlRUZXN0KHVuaXR0ZXN0LlRlc3RDYXNlKToK ICAgICAgICAgICAgICAgICAgICAgICAgICdBY3R1YWxIYXNoOiBjaGVja3N1bS1jaGVja3N1bVxu JywKICAgICAgICAgICAgICAgICAgICAgICAgICdFeHBlY3RlZEhhc2g6IHdyb25nLWNoZWNrc3Vt XG4nLAogICAgICAgICAgICAgICAgICAgICAgICAgJ0NvbnRlbnQtVHlwZTogaW1hZ2UvcG5nXG4n LAotICAgICAgICAgICAgICAgICAgICAgICAgJ0NvbnRlbnQtTGVuZ3RoOiAxM1xuJywKLSAgICAg ICAgICAgICAgICAgICAgICAgICdjaGVja3N1bVx4OGEtcG5nJywKKyAgICAgICAgICAgICAgICAg ICAgICAgICdDb250ZW50LUxlbmd0aDogNDNcbicsCisgICAgICAgICAgICAgICAgICAgICAgICAn Y2hlY2tzdW1ceDhhLXBuZ3RFWHRjaGVja3N1bVx4MDBjaGVja3N1bS1jaGVja3N1bScsCiAgICAg ICAgICAgICAgICAgICAgICAgICAnI0VPRlxuJ10pCiAKICAgICBkZWYgdGVzdF90ZXh0b25seShz ZWxmKToKQEAgLTI2Miw3ICsyNjIsNyBAQCBjbGFzcyBNb2NrQ2hyb21pdW1EUlRUZXN0KE1vY2tE UlRUZXN0KToKICAgICAgICAgICAgICAgICAgICAgICAgICcjRU9GXG4nXSwKICAgICAgICAgICAg IGZpbGVzeXN0ZW09ZmlsZXN5c3RlbSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoZmlsZXN5 c3RlbS53cml0dGVuX2ZpbGVzLAotICAgICAgICAgICAgeycvdG1wL3BuZ19yZXN1bHQwLnBuZyc6 ICdjaGVja3N1bVx4OGEtcG5nJ30pCisgICAgICAgICAgICB7Jy90bXAvcG5nX3Jlc3VsdDAucG5n JzogJ2NoZWNrc3VtXHg4YS1wbmd0RVh0Y2hlY2tzdW1ceDAwY2hlY2tzdW0tY2hlY2tzdW0nfSkK IAogICAgIGRlZiB0ZXN0X2Nocm9taXVtX3BhcnNlX29wdGlvbnMoc2VsZik6CiAgICAgICAgIG9w dGlvbnMsIGFyZ3MgPSBtb2NrX2RydC5wYXJzZV9vcHRpb25zKFsnLS1wbGF0Zm9ybScsICdjaHJv bWl1bS1tYWMnLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvcG9ydC90ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9y dC90ZXN0LnB5CmluZGV4IGZlZDdlMTEwMmY0MGJhMDI0ZTMzZjU2MWZhMjE0ZDU2ZTA3ZTgzOTcu LmJjMjY1NWI3NGEwYWQzYzA3ZWViYTYzNDEwOTZlOGJlZGQ0NWYxOTggMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvdGVzdC5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3Rlc3QucHkKQEAgLTYxLDcgKzYx LDcgQEAgY2xhc3MgVGVzdEluc3RhbmNlOgogCiAgICAgICAgICMgV2UgYWRkIHRoZSAnXHg4YScg Zm9yIHRoZSBpbWFnZSBmaWxlIHRvIHByZXZlbnQgdGhlIHZhbHVlIGZyb20KICAgICAgICAgIyBi ZWluZyB0cmVhdGVkIGFzIFVURi04ICh0aGUgY2hhcmFjdGVyIGlzIGludmFsaWQpCi0gICAgICAg IHNlbGYuYWN0dWFsX2ltYWdlID0gc2VsZi5iYXNlICsgJ1x4OGEnICsgJy1wbmcnCisgICAgICAg IHNlbGYuYWN0dWFsX2ltYWdlID0gc2VsZi5iYXNlICsgJ1x4OGEnICsgJy1wbmcnICsgJ3RFWHRj aGVja3N1bVx4MDAnICsgc2VsZi5hY3R1YWxfY2hlY2tzdW0KIAogICAgICAgICBzZWxmLmV4cGVj dGVkX3RleHQgPSBzZWxmLmFjdHVhbF90ZXh0CiAgICAgICAgIHNlbGYuZXhwZWN0ZWRfY2hlY2tz dW0gPSBzZWxmLmFjdHVhbF9jaGVja3N1bQpAQCAtMTA5LDggKzEwOSw4IEBAIGRlZiB1bml0X3Rl c3RfbGlzdCgpOgogICAgIHRlc3RzLmFkZCgnZmFpbHVyZXMvZXhwZWN0ZWQvaGFuZy5odG1sJywg aGFuZz1UcnVlKQogICAgIHRlc3RzLmFkZCgnZmFpbHVyZXMvZXhwZWN0ZWQvbWlzc2luZ190ZXh0 Lmh0bWwnLCBleHBlY3RlZF90ZXh0PU5vbmUpCiAgICAgdGVzdHMuYWRkKCdmYWlsdXJlcy9leHBl Y3RlZC9pbWFnZS5odG1sJywKLSAgICAgICAgICAgICAgYWN0dWFsX2ltYWdlPSdpbWFnZV9mYWls LXBuZycsCi0gICAgICAgICAgICAgIGV4cGVjdGVkX2ltYWdlPSdpbWFnZS1wbmcnKQorICAgICAg ICAgICAgICBhY3R1YWxfaW1hZ2U9J2ltYWdlX2ZhaWwtcG5ndEVYdGNoZWNrc3VtXHgwMGNoZWNr c3VtX2ZhaWwnLAorICAgICAgICAgICAgICBleHBlY3RlZF9pbWFnZT0naW1hZ2UtcG5ndEVYdGNo ZWNrc3VtXHgwMGNoZWNrc3VtLXBuZycpCiAgICAgdGVzdHMuYWRkKCdmYWlsdXJlcy9leHBlY3Rl ZC9pbWFnZV9jaGVja3N1bS5odG1sJywKICAgICAgICAgICAgICAgYWN0dWFsX2NoZWNrc3VtPSdp bWFnZV9jaGVja3N1bV9mYWlsLWNoZWNrc3VtJywKICAgICAgICAgICAgICAgYWN0dWFsX2ltYWdl PSdpbWFnZV9jaGVja3N1bV9mYWlsLXBuZycpCkBAIC0yMTQsOCArMjE0LDcgQEAgZGVmIHVuaXRf dGVzdF9maWxlc3lzdGVtKGZpbGVzPU5vbmUpOgogICAgIGZpbGVzW0xBWU9VVF9URVNUX0RJUiAr ICcvcGxhdGZvcm0vdGVzdC90ZXN0X2V4cGVjdGF0aW9ucy50eHQnXSA9ICIiIgogV09OVEZJWCA6 IGZhaWx1cmVzL2V4cGVjdGVkL2NoZWNrc3VtLmh0bWwgPSBJTUFHRQogV09OVEZJWCA6IGZhaWx1 cmVzL2V4cGVjdGVkL2NyYXNoLmh0bWwgPSBDUkFTSAotLy8gVGhpcyBvbmUgYWN0dWFsbHkgcGFz c2VzIGJlY2F1c2UgdGhlIGNoZWNrc3VtcyB3aWxsIG1hdGNoLgotV09OVEZJWCA6IGZhaWx1cmVz L2V4cGVjdGVkL2ltYWdlLmh0bWwgPSBQQVNTCitXT05URklYIDogZmFpbHVyZXMvZXhwZWN0ZWQv aW1hZ2UuaHRtbCA9IElNQUdFCiBXT05URklYIDogZmFpbHVyZXMvZXhwZWN0ZWQvYXVkaW8uaHRt bCA9IEFVRElPCiBXT05URklYIDogZmFpbHVyZXMvZXhwZWN0ZWQvaW1hZ2VfY2hlY2tzdW0uaHRt bCA9IElNQUdFCiBXT05URklYIDogZmFpbHVyZXMvZXhwZWN0ZWQvbWlzbWF0Y2guaHRtbCA9IElN QUdFCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9ydW5f d2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvcnVuX3dlYmtpdF90ZXN0c191bml0dGVzdC5weQppbmRleCA5NDBiNGI4NzllZDRiZTQx M2RiMjQ1NGZmZDJiNDVmZDJmOWUwZWE4Li4xOGE3NzEzMWQ0NmE4Y2RiZGUwNDMyZDYxNjU1MTZk NmQ1Yzk5M2M0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0 cy9ydW5fd2Via2l0X3Rlc3RzX3VuaXR0ZXN0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJraXRfdGVzdHNfdW5pdHRlc3QucHkKQEAgLTU5MSw3ICs1 OTEsNyBAQCBNYWluVGVzdCA9IHNraXBfaWYoTWFpblRlc3QsIHN5cy5wbGF0Zm9ybSA9PSAnY3ln d2luJyBhbmQgY29tcGFyZV92ZXJzaW9uKHN5cywgJwogY2xhc3MgUmViYXNlbGluZVRlc3QodW5p dHRlc3QuVGVzdENhc2UpOgogICAgIGRlZiBhc3NlcnRCYXNlbGluZXMoc2VsZiwgZmlsZV9saXN0 LCBmaWxlKToKICAgICAgICAgImFzc2VydCB0aGF0IHRoZSBmaWxlX2xpc3QgY29udGFpbnMgdGhl IGJhc2VsaW5lcy4iIiIKLSAgICAgICAgZm9yIGV4dCBpbiBbIi50eHQiLCAiLnBuZyIsICIuY2hl Y2tzdW0iXToKKyAgICAgICAgZm9yIGV4dCBpbiAoIi50eHQiLCAiLnBuZyIpOgogICAgICAgICAg ICAgYmFzZWxpbmUgPSBmaWxlICsgIi1leHBlY3RlZCIgKyBleHQKICAgICAgICAgICAgIHNlbGYu YXNzZXJ0VHJ1ZShhbnkoZi5maW5kKGJhc2VsaW5lKSAhPSAtMSBmb3IgZiBpbiBmaWxlX2xpc3Qp KQogCkBAIC02MDksMTEgKzYwOSwxMiBAQCBjbGFzcyBSZWJhc2VsaW5lVGVzdCh1bml0dGVzdC5U ZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgICAgICAgICB0ZXN0c19pbmNsdWRlZD1UcnVlLCBm aWxlc3lzdGVtPWZzKQogICAgICAgICBmaWxlX2xpc3QgPSBmcy53cml0dGVuX2ZpbGVzLmtleXMo KQogICAgICAgICBmaWxlX2xpc3QucmVtb3ZlKCcvdG1wL2xheW91dC10ZXN0LXJlc3VsdHMvdGVz dHNfcnVuMC50eHQnKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxlbihmaWxlX2xpc3QpLCA2 KQotICAgICAgICBzZWxmLmFzc2VydEJhc2VsaW5lcyhmaWxlX2xpc3QsCi0gICAgICAgICAgICAi L3Bhc3Nlcy9pbWFnZSIpCi0gICAgICAgIHNlbGYuYXNzZXJ0QmFzZWxpbmVzKGZpbGVfbGlzdCwK LSAgICAgICAgICAgICIvZmFpbHVyZXMvZXhwZWN0ZWQvbWlzc2luZ19pbWFnZSIpCisgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwobGVuKGZpbGVfbGlzdCksIDQpCisgICAgICAgICMgVmVyaWZ5IHRo YXQgd2UgZGlkbid0IHRvdWNoIGFueSAuY2hlY2tzdW0gZmlsZXMuCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoMCwgbGVuKFtmaWxlbmFtZSBmb3IgZmlsZW5hbWUgaW4gZnMud3JpdHRlbl9maWxl cy5rZXlzKCkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIGZpbGVuYW1lLmVu ZHN3aXRoKCcuY2hlY2tzdW0nKV0pKQorICAgICAgICBzZWxmLmFzc2VydEJhc2VsaW5lcyhmaWxl X2xpc3QsICIvcGFzc2VzL2ltYWdlIikKKyAgICAgICAgc2VsZi5hc3NlcnRCYXNlbGluZXMoZmls ZV9saXN0LCAiL2ZhaWx1cmVzL2V4cGVjdGVkL21pc3NpbmdfaW1hZ2UiKQogCiAgICAgZGVmIHRl c3RfbmV3X2Jhc2VsaW5lKHNlbGYpOgogICAgICAgICAjIFRlc3QgdGhhdCB3ZSB1cGRhdGUgdGhl IHBsYXRmb3JtIGV4cGVjdGF0aW9ucy4gSWYgdGhlIGV4cGVjdGF0aW9uCkBAIC02MjYsNyArNjI3 LDcgQEAgY2xhc3MgUmViYXNlbGluZVRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAg ICAgICAgICAgICB0ZXN0c19pbmNsdWRlZD1UcnVlLCBmaWxlc3lzdGVtPWZzKQogICAgICAgICBm aWxlX2xpc3QgPSBmcy53cml0dGVuX2ZpbGVzLmtleXMoKQogICAgICAgICBmaWxlX2xpc3QucmVt b3ZlKCcvdG1wL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdHNfcnVuMC50eHQnKQotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKGxlbihmaWxlX2xpc3QpLCA2KQorICAgICAgICBzZWxmLmFzc2VydEVx dWFsKGxlbihmaWxlX2xpc3QpLCA0KQogICAgICAgICBzZWxmLmFzc2VydEJhc2VsaW5lcyhmaWxl X2xpc3QsCiAgICAgICAgICAgICAiL3BsYXRmb3JtL3Rlc3QtbWFjLWxlb3BhcmQvcGFzc2VzL2lt YWdlIikKICAgICAgICAgc2VsZi5hc3NlcnRCYXNlbGluZXMoZmlsZV9saXN0LAo=