232467 2021-10-28 21:15:31 -0700 Add an ImageDiff option to avoid the built-in tolerance, and use it to generate diff images 2021-10-29 22:59:28 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 232522 P2 Normal --- 1 simon.fraser simon.fraser ap ews-watchlist glenn gsnedders jbedard mrobinson simon.fraser oldest_to_newest 1809952 0 simon.fraser 2021-10-28 21:15:31 -0700 Add an ImageDiff option to avoid the built-in tolerance, and use it to generate diff images 1809954 1 442781 simon.fraser 2021-10-28 21:20:43 -0700 Created attachment 442781 Patch 1810392 2 simon.fraser 2021-10-29 22:59:28 -0700 *** This bug has been marked as a duplicate of bug 232522 *** 442781 2021-10-28 21:20:43 -0700 2021-10-28 23:24:38 -0700 Patch bug-232467-20211028212042.patch text/plain 17549 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0OTkyCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYWJjOTg3NWVmMDA1NmQ3MzQwYzdmOWI2Zjk0NjAxY2Ew Y2IyM2RmNS4uYjYyMzc3Y2ZiZmE3Yzk3MTkzMTA5NGJiNDE3MGQ2YWJjMGU3MTE0MCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQy IEBACisyMDIxLTEwLTI4ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEFkZCBhbiBJbWFnZURpZmYgb3B0aW9uIHRvIGF2b2lkIHRoZSBidWlsdC1pbiB0 b2xlcmFuY2UsIGFuZCB1c2UgaXQgdG8gZ2VuZXJhdGUgZGlmZiBpbWFnZXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQ2NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgU29tZXRpbWVzIGEg cmVmIHRlc3QgZmFpbHMgKGUuZy4gZmFzdC9ib3JkZXJzL2JvcmRlci1pbWFnZS1maWxsLW5vLWJv cmRlci5odG1sKSBidXQgdGhlCisgICAgICAgIHJlc3VsdGluZyBkaWZmIGltYWdlIGlzIGVudGly ZWx5IGJsYWNrLiBUaGlzIGhhcHBlbmVkIGJlY2F1c2UgbGVnYWN5RGlzdGFuY2UgKiAyNTUuMGYg Y291bGQKKyAgICAgICAgdHJ1bmNhdGUgdG8gemVybywgc28gY2VpbCgpIHRoZSB2YWx1ZXMgaW5z dGVhZC4KKworICAgICAgICBBbHNvIGFkZCBhbiBgLS1leGFjdGAgSW1hZ2VEaWZmIG9wdGlvbiB0 byBhdm9pZCB0aGUgYnVpbHQtaW4gdG9sZXJhbmNlLCBhbmQgdXNlIHRoYXQgd2hlbgorICAgICAg ICBnZW5lcmF0aW5nIGRpZmYgaW1hZ2VzLCBzbyB0aGV5IGFsd2F5cyBzaG93IHRoZSByZWFsIHBp eGVsIGRpZmZlcmVuY2VzLiBUaGlzIGJlY29tZXMKKyAgICAgICAgaW1wb3J0YW50IHdoZW4gZnV6 enkgbWF0Y2hpbmcgc3BlY2lmaWVzIHRocmVzaG9sZHMgd2hpY2ggYXJlIGN1cnJlbnRseSBiZWxv dyB0aGUgYnVpbHQtaW4KKyAgICAgICAgdG9sZXJhbmNlLgorCisgICAgICAgICogSW1hZ2VEaWZm L0ltYWdlRGlmZi5jcHA6CisgICAgICAgIChwcm9jZXNzSW1hZ2VzKToKKyAgICAgICAgKG1haW4p OgorICAgICAgICAqIEltYWdlRGlmZi9QbGF0Zm9ybUltYWdlLmNwcDoKKyAgICAgICAgKEltYWdl RGlmZjo6UGxhdGZvcm1JbWFnZTo6ZGlmZmVyZW5jZSk6CisgICAgICAgICogSW1hZ2VEaWZmL1Bs YXRmb3JtSW1hZ2UuaDoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy9zaW5nbGVfdGVzdF9ydW5uZXIucHk6CisgICAgICAgIChTaW5nbGVUZXN0UnVu bmVyLl9jb21wYXJlX291dHB1dF93aXRoX3JlZmVyZW5jZSk6CisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyX3VuaXR0 ZXN0LnB5OgorICAgICAgICAoVGVzdFJlc3VsdFdyaXRlclRlc3QudGVzdF9yZWZ0ZXN0X2RpZmZf aW1hZ2UuSW1hZ2VEaWZmVGVzdFBvcnQuZGlmZl9pbWFnZSk6CisgICAgICAgIChUZXN0UmVzdWx0 V3JpdGVyVGVzdCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvbW9k ZWxzL3Rlc3RfZmFpbHVyZXMucHk6CisgICAgICAgIChGYWlsdXJlUmVmdGVzdE1pc21hdGNoLndy aXRlX2ZhaWx1cmUpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1 bl93ZWJraXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5OgorICAgICAgICAoUnVuVGVzdC50ZXN0 X3RvbGVyYW5jZS5JbWFnZURpZmZUZXN0UG9ydC5kaWZmX2ltYWdlKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQuZGlmZl9pbWFnZSk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHk6CisgICAgICAgIChJ bWFnZURpZmZlci5fX2luaXRfXyk6CisgICAgICAgIChJbWFnZURpZmZlci5kaWZmX2ltYWdlKToK KyAgICAgICAgKEltYWdlRGlmZmVyLl9zdGFydCk6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9wb3J0L3Rlc3QucHk6CisKIDIwMjEtMTAtMjggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNl ckBhcHBsZS5jb20+CiAKICAgICAgICAgUHJlcGFyZSBTaW5nbGVUZXN0UnVubmVyVGVzdCB0byBy ZWFkIGZ1enp5IHBpeGVsIG1hdGNoaW5nIGRhdGEKZGlmZiAtLWdpdCBhL1Rvb2xzL0ltYWdlRGlm Zi9JbWFnZURpZmYuY3BwIGIvVG9vbHMvSW1hZ2VEaWZmL0ltYWdlRGlmZi5jcHAKaW5kZXggYTQ2 ZjlmY2E1MDZlZmIyNGE0NzNmNzQ4ZWQwOWQ4NjhmZjJlODhkNS4uYzBlMTQ0OTYyMzJhODNhODJi NzZkNTQ2ZTdlOWExNzM1YmFhNzdlYyAxMDA2NDQKLS0tIGEvVG9vbHMvSW1hZ2VEaWZmL0ltYWdl RGlmZi5jcHAKKysrIGIvVG9vbHMvSW1hZ2VEaWZmL0ltYWdlRGlmZi5jcHAKQEAgLTQ5LDcgKzQ5 LDcgQEAgdXNpbmcgbmFtZXNwYWNlIEltYWdlRGlmZjsKICNkZWZpbmUgRk9STUFUX1NJWkVfVCAi enUiCiAjZW5kaWYKIAotc3RhdGljIGludCBwcm9jZXNzSW1hZ2VzKHN0ZDo6dW5pcXVlX3B0cjxQ bGF0Zm9ybUltYWdlPiYmIGFjdHVhbEltYWdlLCBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1JbWFn ZT4mJiBiYXNlbGluZUltYWdlLCBmbG9hdCB0b2xlcmFuY2UsIGJvb2wgcHJpbnREaWZmZXJlbmNl KQorc3RhdGljIGludCBwcm9jZXNzSW1hZ2VzKHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdl PiYmIGFjdHVhbEltYWdlLCBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1JbWFnZT4mJiBiYXNlbGlu ZUltYWdlLCBmbG9hdCB0b2xlcmFuY2UsIGJvb2wgZXhhY3QsIGJvb2wgcHJpbnREaWZmZXJlbmNl KQogewogICAgIGlmICghYWN0dWFsSW1hZ2UtPmlzQ29tcGF0aWJsZSgqYmFzZWxpbmVJbWFnZSkp IHsKICAgICAgICAgaWYgKGFjdHVhbEltYWdlLT53aWR0aCgpICE9IGJhc2VsaW5lSW1hZ2UtPndp ZHRoKCkgfHwgYWN0dWFsSW1hZ2UtPmhlaWdodCgpICE9IGJhc2VsaW5lSW1hZ2UtPmhlaWdodCgp KSB7CkBAIC02NCw3ICs2NCw3IEBAIHN0YXRpYyBpbnQgcHJvY2Vzc0ltYWdlcyhzdGQ6OnVuaXF1 ZV9wdHI8UGxhdGZvcm1JbWFnZT4mJiBhY3R1YWxJbWFnZSwgc3RkOjp1bmlxCiAgICAgfQogCiAg ICAgUGxhdGZvcm1JbWFnZTo6RGlmZmVyZW5jZSBkaWZmZXJlbmNlRGF0YSA9IHsgMTAwLCAwLCAw IH07Ci0gICAgYXV0byBkaWZmSW1hZ2UgPSBhY3R1YWxJbWFnZS0+ZGlmZmVyZW5jZSgqYmFzZWxp bmVJbWFnZSwgZGlmZmVyZW5jZURhdGEpOworICAgIGF1dG8gZGlmZkltYWdlID0gYWN0dWFsSW1h Z2UtPmRpZmZlcmVuY2UoKmJhc2VsaW5lSW1hZ2UsIGV4YWN0LCBkaWZmZXJlbmNlRGF0YSk7CiAg ICAgaWYgKGRpZmZJbWFnZSkKICAgICAgICAgZGlmZkltYWdlLT53cml0ZUFzUE5HVG9TdGRvdXQo KTsKIApAQCAtODgsNiArODgsNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJn dltdKQogCiAgICAgZmxvYXQgdG9sZXJhbmNlID0gMC4wZjsKICAgICBib29sIHZlcmJvc2UgPSBm YWxzZTsKKyAgICBib29sIGV4YWN0ID0gZmFsc2U7CiAgICAgYm9vbCBwcmludERpZmZlcmVuY2Ug PSBmYWxzZTsKIAogICAgIGZvciAoaW50IGkgPSAxOyBpIDwgYXJnYzsgKytpKSB7CkBAIC05OCw3 ICs5OSw3IEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10pCiAgICAgICAg ICAgICBjaGFyKiByZWFkRW5kID0gTlVMTDsKICAgICAgICAgICAgIHRvbGVyYW5jZSA9IHN0cnRv Zihhcmd2W2kgKyAxXSwgJnJlYWRFbmQpOwogICAgICAgICAgICAgaWYgKHJlYWRFbmQgPT0gYXJn dltpICsgMV0pIHsKLSAgICAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0byBy ZWFkIG51bWJlcmljIHRvbGVyYW5jZSB2YWx1ZSBmcm9tICVzXG4iLCBhcmd2W2kgKyAxXSk7Cisg ICAgICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gcmVhZCBudW1lcmljIHRv bGVyYW5jZSB2YWx1ZSBmcm9tICVzXG4iLCBhcmd2W2kgKyAxXSk7CiAgICAgICAgICAgICAgICAg cmV0dXJuIEVYSVRfRkFJTFVSRTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgICsraTsKQEAg LTExNSw5ICsxMTYsMTQgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkK ICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKKyAgICAgICAgaWYgKCFzdHJjbXAo YXJndltpXSwgIi1lIikgfHwgIXN0cmNtcChhcmd2W2ldLCAiLS1leGFjdCIpKSB7CisgICAgICAg ICAgICBleGFjdCA9IHRydWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorCiAg ICAgICAgIGlmICghc3RyY21wKGFyZ3ZbaV0sICItaCIpIHx8ICFzdHJjbXAoYXJndltpXSwgIi0t aGVscCIpKSB7CiAgICAgICAgICAgICBmcHJpbnRmKHN0ZG91dCwKLSAgICAgICAgICAgICAgICAi dXNhZ2U6IEltYWdlRGlmZiBbLWhdIFstdl0gWy1kXSBbLXQgVE9MRVJBTkNFXSAoW2FjdHVhbElt YWdlIGJhc2VsaW5lSW1hZ2VdIHwgPHN0ZGluPilcbiIgXAorICAgICAgICAgICAgICAgICJ1c2Fn ZTogSW1hZ2VEaWZmIFstaF0gWy12XSBbLWRdIFstZV0gWy10IFRPTEVSQU5DRV0gKFthY3R1YWxJ bWFnZSBiYXNlbGluZUltYWdlXSB8IDxzdGRpbj4pXG4iIFwKICAgICAgICAgICAgICAgICAiXG4i IFwKICAgICAgICAgICAgICAgICAiUmVhZHMgdHdvIFBORy1lbmNvZGVkIGltYWdlcyBhbmQgY29t cGFyZXMgdGhlbS4gSWYgdHdvIGZpbGUgcGF0aCBhcmd1bWVudHMgYXJlIHN1cHBsaWVkLCBcbiIg XAogICAgICAgICAgICAgICAgICJyZWFkcyBmcm9tIHRoZSBzcGVjaWZpZWQgZmlsZXMsIG90aGVy d2lzZSBmcm9tIDxzdGRpbj4gd2hlcmUgZWFjaCBmaWxlIGlzIHByZWNlZGVkIGJ5IFxuIiBcCkBA IC0xMjcsNiArMTMzLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNoYXIqIGFyZ3ZbXSkK ICAgICAgICAgICAgICAgICAiICAtaCwgLS1oZWxwICAgICAgICAgICAgc2hvdyB0aGlzIGhlbHAg bWVzc2FnZSBhbmQgZXhpdFxuIiBcCiAgICAgICAgICAgICAgICAgIiAgLXYsIC0tdmVyYm9zZSAg ICAgICAgIHByaW50IGRpYWdub3N0aWMgaW5mb3JtYXRpb24gdG8gc3RkZXJyXG4iIFwKICAgICAg ICAgICAgICAgICAiICAtZCwgLS1kaWZmZXJlbmNlICAgICAgcHJpbnQgV1BULXN0eWxlIG1heERp ZmZlcmVuY2UgYW5kIHRvdGFsUGl4ZWxzIGRhdGFcbiIgXAorICAgICAgICAgICAgICAgICIgIC1l LCAtLWV4YWN0ICAgICAgICAgICB1c2UgZXhhY3QgbWF0Y2hpbmcgKG5vIGJ1aWx0LWluIHBlci1j b21wb25lbnQgdG9sZXJhbmNlKVxuIiBcCiAgICAgICAgICAgICAgICAgIiAgLXQsIC0tdG9sZXJh bmNlIFRPTEVSQU5DRVxuIiBcCiAgICAgICAgICAgICAgICAgIiAgICAgICAgICAgICAgICAgICAg ICAgIGNvbXBhcmUgdGhlIGltYWdlcyB3aXRoIHRoZSBnaXZlbiB0b2xlcmFuY2VcbiIKICAgICAg ICAgICAgICk7CkBAIC0xNjMsNyArMTcwLDcgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNvbnN0IGNo YXIqIGFyZ3ZbXSkKICAgICAgICAgICAgIGlmICh2ZXJib3NlKQogICAgICAgICAgICAgICAgIGZw cmludGYoc3RkZXJyLCAiQ29tcGFyaW5nIGZpbGVzIGFjdHVhbDogJXMgYW5kIGJhc2VsaW5lOiAl c1xuIiwgZmlsZTFQYXRoLCBmaWxlMlBhdGgpOwogCi0gICAgICAgICAgICByZXR1cm4gcHJvY2Vz c0ltYWdlcyhzdGQ6Om1vdmUoYWN0dWFsSW1hZ2UpLCBzdGQ6Om1vdmUoYmFzZWxpbmVJbWFnZSks IHRvbGVyYW5jZSwgcHJpbnREaWZmZXJlbmNlKTsKKyAgICAgICAgICAgIHJldHVybiBwcm9jZXNz SW1hZ2VzKHN0ZDo6bW92ZShhY3R1YWxJbWFnZSksIHN0ZDo6bW92ZShiYXNlbGluZUltYWdlKSwg dG9sZXJhbmNlLCBleGFjdCwgcHJpbnREaWZmZXJlbmNlKTsKICAgICAgICAgfQogICAgIH0KIApA QCAtMjExLDcgKzIxOCw3IEBAIGludCBtYWluKGludCBhcmdjLCBjb25zdCBjaGFyKiBhcmd2W10p CiAgICAgICAgIGlmIChhY3R1YWxJbWFnZSAmJiBiYXNlbGluZUltYWdlKSB7CiAgICAgICAgICAg ICBpZiAodmVyYm9zZSkKICAgICAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkltYWdlRGlm ZjogcHJvY2Vzc2luZyBpbWFnZXMgd2l0aCB0b2xlcmFuY2UgJTAxLjJmJSVcbiIsIHRvbGVyYW5j ZSk7Ci0gICAgICAgICAgICBhdXRvIHJlc3VsdCA9IHByb2Nlc3NJbWFnZXMoc3RkOjpleGNoYW5n ZShhY3R1YWxJbWFnZSwgeyB9KSwgc3RkOjpleGNoYW5nZShiYXNlbGluZUltYWdlLCB7IH0pLCB0 b2xlcmFuY2UsIHByaW50RGlmZmVyZW5jZSk7CisgICAgICAgICAgICBhdXRvIHJlc3VsdCA9IHBy b2Nlc3NJbWFnZXMoc3RkOjpleGNoYW5nZShhY3R1YWxJbWFnZSwgeyB9KSwgc3RkOjpleGNoYW5n ZShiYXNlbGluZUltYWdlLCB7IH0pLCB0b2xlcmFuY2UsIGV4YWN0LCBwcmludERpZmZlcmVuY2Up OwogICAgICAgICAgICAgaWYgKHJlc3VsdCAhPSBFWElUX1NVQ0NFU1MpCiAgICAgICAgICAgICAg ICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZm L1BsYXRmb3JtSW1hZ2UuY3BwIGIvVG9vbHMvSW1hZ2VEaWZmL1BsYXRmb3JtSW1hZ2UuY3BwCmlu ZGV4IDVhOWQzY2Y0NTUxYTFmMTlmNTY2YzYxZTBmMGI2MjEyYmRlZjNkMjYuLmU1ZmRkOTM2OTgx NDYxMjMwYjJmOThlOTA2MDI5MjM0MGFjZjI2Y2EgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0ltYWdlRGlm Zi9QbGF0Zm9ybUltYWdlLmNwcAorKysgYi9Ub29scy9JbWFnZURpZmYvUGxhdGZvcm1JbWFnZS5j cHAKQEAgLTQwLDcgKzQwLDcgQEAgYm9vbCBQbGF0Zm9ybUltYWdlOjppc0NvbXBhdGlibGUoY29u c3QgUGxhdGZvcm1JbWFnZSYgb3RoZXIpIGNvbnN0CiAgICAgICAgICYmIGhhc0FscGhhKCkgPT0g b3RoZXIuaGFzQWxwaGEoKTsKIH0KIAotc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtSW1hZ2U+IFBs YXRmb3JtSW1hZ2U6OmRpZmZlcmVuY2UoY29uc3QgUGxhdGZvcm1JbWFnZSYgb3RoZXIsIERpZmZl cmVuY2UmIGRpZmZlcmVuY2UpCitzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1JbWFnZT4gUGxhdGZv cm1JbWFnZTo6ZGlmZmVyZW5jZShjb25zdCBQbGF0Zm9ybUltYWdlJiBvdGhlciwgYm9vbCBleGFj dCwgRGlmZmVyZW5jZSYgZGlmZmVyZW5jZSkKIHsKICAgICBzaXplX3Qgd2lkdGggPSB0aGlzLT53 aWR0aCgpOwogICAgIHNpemVfdCBoZWlnaHQgPSB0aGlzLT5oZWlnaHQoKTsKQEAgLTYyLDggKzYy LDggQEAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtSW1hZ2U+IFBsYXRmb3JtSW1hZ2U6OmRpZmZl cmVuY2UoY29uc3QgUGxhdGZvcm1JbWFnZSYgb3QKICAgICAgICAgICAgIGZsb2F0IGJsdWUgID0g KHBpeGVsWzJdIC0gYmFzZVBpeGVsWzJdKSAvIHN0ZDo6bWF4PGZsb2F0PigyNTUgLSBiYXNlUGl4 ZWxbMl0sIGJhc2VQaXhlbFsyXSk7CiAgICAgICAgICAgICBmbG9hdCBhbHBoYSA9IChwaXhlbFsz XSAtIGJhc2VQaXhlbFszXSkgLyBzdGQ6Om1heDxmbG9hdD4oMjU1IC0gYmFzZVBpeGVsWzNdLCBi YXNlUGl4ZWxbM10pOwogICAgICAgICAgICAgZmxvYXQgbGVnYWN5RGlzdGFuY2UgPSBzcXJ0Zihy ZWQgKiByZWQgKyBncmVlbiAqIGdyZWVuICsgYmx1ZSAqIGJsdWUgKyBhbHBoYSAqIGFscGhhKSAv IDIuMGY7Ci0KLSAgICAgICAgICAgICpkaWZmUGl4ZWwrKyA9IHN0YXRpY19jYXN0PHVuc2lnbmVk IGNoYXI+KGxlZ2FjeURpc3RhbmNlICogMjU1LjBmKTsKKyAgICAgICAgICAgIAorICAgICAgICAg ICAgdW5zaWduZWQgY2hhciBkaWZmUGl4ZWxWYWx1ZSA9IDA7CiAgICAgICAgICAgICAKICAgICAg ICAgICAgIC8vIFdQVC1zdHlsZSBkaWZmZXJlbmNlIGNvZGUuCiAgICAgICAgICAgICBpZiAobGVn YWN5RGlzdGFuY2UpIHsKQEAgLTc1LDEwICs3NSwxMyBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZv cm1JbWFnZT4gUGxhdGZvcm1JbWFnZTo6ZGlmZmVyZW5jZShjb25zdCBQbGF0Zm9ybUltYWdlJiBv dAogICAgICAgICAgICAgICAgIGRpZmZlcmVuY2UubWF4RGlmZmVyZW5jZSA9IHN0ZDo6bWF4KGRp ZmZlcmVuY2UubWF4RGlmZmVyZW5jZSwgbWF4RGlmZik7CiAKICAgICAgICAgICAgICAgICBsZWdh Y3lEaXN0YW5jZU1heCA9IHN0ZDo6bWF4KGxlZ2FjeURpc3RhbmNlTWF4LCBsZWdhY3lEaXN0YW5j ZSk7CisgICAgICAgICAgICAgICAgZGlmZlBpeGVsVmFsdWUgPSBzdGF0aWNfY2FzdDx1bnNpZ25l ZCBjaGFyPihzdGQ6OmNlaWwobGVnYWN5RGlzdGFuY2UgKiAyNTUuMGYpKTsKICAgICAgICAgICAg IH0KIAotICAgICAgICAgICAgLy8gTGVnYWN5IGRpZmZlcmVuY2UgY29kZS4gTm90ZSB0aGVyZSBp cyBzb21lIGJ1aWx0LWluIHRvbGVyYW5jZSBoZXJlLgotICAgICAgICAgICAgaWYgKGxlZ2FjeURp c3RhbmNlID49IDEuMGYgLyAyNTUuMGYpIHsKKyAgICAgICAgICAgICpkaWZmUGl4ZWwrKyA9IGRp ZmZQaXhlbFZhbHVlOworCisgICAgICAgICAgICAvLyBMZWdhY3kgZGlmZmVyZW5jZSBjb2RlLgor ICAgICAgICAgICAgaWYgKGV4YWN0ID8gbGVnYWN5RGlzdGFuY2UgOiBsZWdhY3lEaXN0YW5jZSA+ PSAxLjBmIC8gMjU1LjBmKSB7CiAgICAgICAgICAgICAgICAgKytwaXhlbENvdW50V2l0aFNpZ25p ZmljYW50RGlmZmVyZW5jZTsKICAgICAgICAgICAgICAgICBsZWdhY3lEaXN0YW5jZVN1bSArPSBs ZWdhY3lEaXN0YW5jZTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0ltYWdlRGlm Zi9QbGF0Zm9ybUltYWdlLmggYi9Ub29scy9JbWFnZURpZmYvUGxhdGZvcm1JbWFnZS5oCmluZGV4 IDU0OTMyMjY4ZTRhN2FlYWU4N2M2ZDdmNzE0NTQ1Nzk0Y2MxYmQ2NGIuLmJiNmU3ZGY1NmUwMTI3 ZTEyMDQ3NjJjNTk4MWYwNTRkODU1ODQ0N2YgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0ltYWdlRGlmZi9Q bGF0Zm9ybUltYWdlLmgKKysrIGIvVG9vbHMvSW1hZ2VEaWZmL1BsYXRmb3JtSW1hZ2UuaApAQCAt NjIsNyArNjIsNyBAQCBwdWJsaWM6CiAgICAgICAgIHVuc2lnbmVkIG1heERpZmZlcmVuY2UgeyAw IH07CiAgICAgICAgIHNpemVfdCB0b3RhbFBpeGVscyB7IDAgfTsKICAgICB9OwotICAgIHN0ZDo6 dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdlPiBkaWZmZXJlbmNlKGNvbnN0IFBsYXRmb3JtSW1hZ2Um LCBEaWZmZXJlbmNlJik7CisgICAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtSW1hZ2U+IGRpZmZl cmVuY2UoY29uc3QgUGxhdGZvcm1JbWFnZSYsIGJvb2wgZXhhY3QsIERpZmZlcmVuY2UmKTsKIAog ICAgIHZvaWQgd3JpdGVBc1BOR1RvU3Rkb3V0KCk7CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3NpbmdsZV90ZXN0X3J1bm5lci5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Npbmds ZV90ZXN0X3J1bm5lci5weQppbmRleCAxOTU3MDNkMThiYzA3NGNjZTA4YTkyOWEzM2FjYTBkOTMy MzU5MWMzLi5mZmMwNzljYjRhMGQ3YzFmN2JmZGZmZjFkNTg0MDQ5ODc4ODkzY2NmIDEwMDY0NAot LS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy9zaW5n bGVfdGVzdF9ydW5uZXIucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVz dHMvY29udHJvbGxlcnMvc2luZ2xlX3Rlc3RfcnVubmVyLnB5CkBAIC0zOTYsNyArMzk2LDcgQEAg Y2xhc3MgU2luZ2xlVGVzdFJ1bm5lcihvYmplY3QpOgogICAgICAgICAgICAgICAgIGZhaWx1cmVz LmFwcGVuZCh0ZXN0X2ZhaWx1cmVzLkZhaWx1cmVSZWZ0ZXN0TWlzbWF0Y2hEaWROb3RPY2N1cihy ZWZlcmVuY2VfZmlsZW5hbWUpKQogICAgICAgICBlbGlmIHJlZmVyZW5jZV9kcml2ZXJfb3V0cHV0 LmltYWdlX2hhc2ggIT0gYWN0dWFsX2RyaXZlcl9vdXRwdXQuaW1hZ2VfaGFzaDoKICAgICAgICAg ICAgICMgSW1hZ2VEaWZmIGhhcyBhIGhhcmQgY29kZWQgY29sb3IgZGlzdGFuY2UgdGhyZXNob2xk IGV2ZW4gdGhvdWdoIHRvbGVyYW5jZT0wIGlzIHNwZWNpZmllZC4KLSAgICAgICAgICAgIGRpZmZf cmVzdWx0ID0gc2VsZi5fcG9ydC5kaWZmX2ltYWdlKHJlZmVyZW5jZV9kcml2ZXJfb3V0cHV0Lmlt YWdlLCBhY3R1YWxfZHJpdmVyX291dHB1dC5pbWFnZSwgdG9sZXJhbmNlPTApCisgICAgICAgICAg ICBkaWZmX3Jlc3VsdCA9IHNlbGYuX3BvcnQuZGlmZl9pbWFnZShyZWZlcmVuY2VfZHJpdmVyX291 dHB1dC5pbWFnZSwgYWN0dWFsX2RyaXZlcl9vdXRwdXQuaW1hZ2UsIHRvbGVyYW5jZT0wLCBleGFj dD1UcnVlKQogCiAgICAgICAgICAgICAjIEZJWE1FOiB1c2UgdGhlIHJlc3VsdCBvZiBfZnV6enlf dG9sZXJhbmNlX2Zvcl9yZWZlcmVuY2UgdG8gYWxsb3cgZm9yIHBhc3Mgb3IgZmFpbCBiYXNlZCBv biBmdXp6eSBtYXRjaGluZy4gd2Via2l0Lm9yZy9iLzE0OTgyOAogCmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9jb250cm9sbGVycy90ZXN0X3Jlc3VsdF93 cml0ZXJfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9j b250cm9sbGVycy90ZXN0X3Jlc3VsdF93cml0ZXJfdW5pdHRlc3QucHkKaW5kZXggZDkwOTIwOGY4 Y2VmOWFhZDQ1ODc2YmE5ZTU0NzkyYTU0YzAzMzJhNi4uYjk0YjU4YTFiYWFmNWZiMGQzMDI0YTUw ZGFhYTE1OTFhNzUwNGI5OCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvY29udHJvbGxlcnMvdGVzdF9yZXN1bHRfd3JpdGVyX3VuaXR0ZXN0LnB5CisrKyBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL2NvbnRyb2xsZXJzL3Rlc3RfcmVz dWx0X3dyaXRlcl91bml0dGVzdC5weQpAQCAtNDAsNyArNDAsNyBAQCBjbGFzcyBUZXN0UmVzdWx0 V3JpdGVyVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHVzZWRfdG9sZXJhbmNlX3Zh bHVlcyA9IFtdCiAKICAgICAgICAgY2xhc3MgSW1hZ2VEaWZmVGVzdFBvcnQoVGVzdFBvcnQpOgot ICAgICAgICAgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVh bF9jb250ZW50cywgdG9sZXJhbmNlKToKKyAgICAgICAgICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYs IGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRvbGVyYW5jZSwgZXhhY3Q9RmFs c2UpOgogICAgICAgICAgICAgICAgIHVzZWRfdG9sZXJhbmNlX3ZhbHVlcy5hcHBlbmQodG9sZXJh bmNlKQogICAgICAgICAgICAgICAgIHJldHVybiBJbWFnZURpZmZSZXN1bHQocGFzc2VkPUZhbHNl LCBkaWZmX2ltYWdlPWInJywgZGlmZmVyZW5jZT0xLCB0b2xlcmFuY2U9dG9sZXJhbmNlKQogCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9tb2RlbHMvdGVz dF9mYWlsdXJlcy5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2ZhaWx1cmVzLnB5CmluZGV4IGVmNTdmOWIyMzM1MWY4YzdhNzkzZTNkZmQyYWZlNTZh NjgyNzQ3NWEuLjZiNTU5NzY3YzAxYzM5NWQyMjkxOGRmYzYzNTY1MWE4ZjMxZGMzNDQgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVscy90ZXN0X2Zh aWx1cmVzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL21vZGVs cy90ZXN0X2ZhaWx1cmVzLnB5CkBAIC0yMzIsNyArMjMyLDcgQEAgY2xhc3MgRmFpbHVyZVJlZnRl c3RNaXNtYXRjaChUZXN0RmFpbHVyZSk6CiAgICAgICAgIGlmIHNlbGYuaW1hZ2VfZGlmZl9yZXN1 bHQ6CiAgICAgICAgICAgICAjIElmIHRoZSByZWYgdGVzdCB3YXMgcnVuIHdpdGggbm9uLXplcm8g dG9sZXJhbmNlLCBnZW5lcmF0ZSB0aGUgaW1hZ2UgZGlmZiBhZ2FpbiB3aXRoIHplcm8gdG9sZXJh bmNlLgogICAgICAgICAgICAgaWYgc2VsZi5pbWFnZV9kaWZmX3Jlc3VsdC50b2xlcmFuY2UgIT0g MDoKLSAgICAgICAgICAgICAgICBkaWZmX2ltYWdlID0gcG9ydC5kaWZmX2ltYWdlKGV4cGVjdGVk X2RyaXZlcl9vdXRwdXQuaW1hZ2UsIGRyaXZlcl9vdXRwdXQuaW1hZ2UsIHRvbGVyYW5jZT0wKS5k aWZmX2ltYWdlCisgICAgICAgICAgICAgICAgZGlmZl9pbWFnZSA9IHBvcnQuZGlmZl9pbWFnZShl eHBlY3RlZF9kcml2ZXJfb3V0cHV0LmltYWdlLCBkcml2ZXJfb3V0cHV0LmltYWdlLCB0b2xlcmFu Y2U9MCwgZXhhY3Q9VHJ1ZSkuZGlmZl9pbWFnZQogICAgICAgICAgICAgZWxzZToKICAgICAgICAg ICAgICAgICBkaWZmX2ltYWdlID0gc2VsZi5pbWFnZV9kaWZmX3Jlc3VsdC5kaWZmX2ltYWdlCiAK ZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3J1bl93ZWJr aXRfdGVzdHNfaW50ZWdyYXRpb250ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlv dXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKaW5kZXggNDVlMGJj YjcwYWEwNGIxNTMzMTk3ODFjZTU1YjhhMWRmZGM1NTgzZC4uNWI1NTgzZWIzNWE4ZTJhNWE2MjU2 YTIyMjllMDlmNThkMzBmMzExNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9s YXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3JhdGlvbnRlc3QucHkKKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcnVuX3dlYmtpdF90ZXN0c19pbnRlZ3Jh dGlvbnRlc3QucHkKQEAgLTc1MCw3ICs3NTAsNyBAQCBjbGFzcyBSdW5UZXN0KHVuaXR0ZXN0LlRl c3RDYXNlLCBTdHJlYW1UZXN0aW5nTWl4aW4pOgogCiAgICAgZGVmIHRlc3RfdG9sZXJhbmNlKHNl bGYpOgogICAgICAgICBjbGFzcyBJbWFnZURpZmZUZXN0UG9ydCh0ZXN0LlRlc3RQb3J0KToKLSAg ICAgICAgICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxf Y29udGVudHMsIHRvbGVyYW5jZT1Ob25lKToKKyAgICAgICAgICAgIGRlZiBkaWZmX2ltYWdlKHNl bGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRvbGVyYW5jZT1Ob25lLCBl eGFjdD1GYWxzZSk6CiAgICAgICAgICAgICAgICAgc2VsZi50b2xlcmFuY2VfdXNlZF9mb3JfZGlm Zl9pbWFnZSA9IHNlbGYuX29wdGlvbnMudG9sZXJhbmNlCiAgICAgICAgICAgICAgICAgcmV0dXJu IEltYWdlRGlmZlJlc3VsdChwYXNzZWQ9RmFsc2UsIGRpZmZfaW1hZ2U9YicnLCBkaWZmZXJlbmNl PTEsIGZ1enp5X2RhdGE9Tm9uZSwgdG9sZXJhbmNlPXNlbGYuX29wdGlvbnMudG9sZXJhbmNlIG9y IDApCiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKaW5kZXggNmM1Y2MzNTcyZjI3NTdl NzBhNDA4ZDc1ZjdhOTlmNTMwMjA4ZTAxYy4uOTU0MTM2N2JlZWQwZTZlM2Y4ZTQ1NmU5ODM3Yjli ZjdhODk5MGFmNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2Uu cHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Jhc2UucHkKQEAgLTI5OCw3ICsy OTgsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAg ICAgICAgcmV0dXJuIG5vdCBXYXZlRGlmZihleHBlY3RlZF9hdWRpbywgYWN0dWFsX2F1ZGlvKS5m aWxlc0FyZUlkZW50aWNhbFdpdGhpblRvbGVyYW5jZSgpCiAKLSAgICBkZWYgZGlmZl9pbWFnZShz ZWxmLCBleHBlY3RlZF9jb250ZW50cywgYWN0dWFsX2NvbnRlbnRzLCB0b2xlcmFuY2U9Tm9uZSk6 CisgICAgZGVmIGRpZmZfaW1hZ2Uoc2VsZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250 ZW50cywgdG9sZXJhbmNlPU5vbmUsIGV4YWN0PUZhbHNlKToKICAgICAgICAgIiIiQ29tcGFyZSB0 d28gaW1hZ2VzIGFuZCByZXR1cm4gYSB0dXBsZSBvZiBhbiBpbWFnZSBkaWZmLCBhIHBlcmNlbnRh Z2UgZGlmZmVyZW5jZSAoMC0xMDApLCBhbmQgYW4gZXJyb3Igc3RyaW5nLgogCiAgICAgICAgIHx0 b2xlcmFuY2V8IHNob3VsZCBiZSBhIHBlcmNlbnRhZ2UgdmFsdWUgKDAuMCAtIDEwMC4wKS4KQEAg LTMxOCw3ICszMTgsNyBAQCBjbGFzcyBQb3J0KG9iamVjdCk6CiAgICAgICAgIHNlbGYuc2V0X29w dGlvbl9kZWZhdWx0KCd0b2xlcmFuY2UnLCAwLjEpCiAgICAgICAgIGlmIHRvbGVyYW5jZSBpcyBO b25lOgogICAgICAgICAgICAgdG9sZXJhbmNlID0gc2VsZi5nZXRfb3B0aW9uKCd0b2xlcmFuY2Un KQotICAgICAgICByZXR1cm4gc2VsZi5faW1hZ2VfZGlmZmVyLmRpZmZfaW1hZ2UoZXhwZWN0ZWRf Y29udGVudHMsIGFjdHVhbF9jb250ZW50cywgdG9sZXJhbmNlKQorICAgICAgICByZXR1cm4gc2Vs Zi5faW1hZ2VfZGlmZmVyLmRpZmZfaW1hZ2UoZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250 ZW50cywgdG9sZXJhbmNlLCBleGFjdCkKIAogICAgIGRlZiBkaWZmX3RleHQoc2VsZiwgZXhwZWN0 ZWRfdGV4dCwgYWN0dWFsX3RleHQsIGV4cGVjdGVkX2ZpbGVuYW1lLCBhY3R1YWxfZmlsZW5hbWUp OgogICAgICAgICAiIiJSZXR1cm5zIGEgc3RyaW5nIGNvbnRhaW5pbmcgdGhlIGRpZmYgb2YgdGhl IHR3byB0ZXh0IHN0cmluZ3MKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9pbWFnZV9kaWZmLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYu cHkKaW5kZXggOTFhMzZlZTllN2IwOWJiMmE1NTc4M2JlNmRmNjE5MjRmMDFhM2JhNy4uZTFkMTIw ZmI2ODE4ZTBiMmMwYWM2MzNhZjkwNzlmMTViM2Y4ODMwNyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2ltYWdlX2RpZmYucHkKQEAgLTcwLDkgKzcwLDEwIEBAIGNsYXNzIEltYWdlRGlm ZmVyKG9iamVjdCk6CiAgICAgICAgIHNlbGYuX3BvcnQgPSBwb3J0CiAgICAgICAgIHNlbGYuX3Rv bGVyYW5jZSA9IE5vbmUKICAgICAgICAgc2VsZi5fcHJvY2VzcyA9IE5vbmUKKyAgICAgICAgc2Vs Zi5fZXhhY3QgPSBOb25lCiAKLSAgICBkZWYgZGlmZl9pbWFnZShzZWxmLCBleHBlY3RlZF9jb250 ZW50cywgYWN0dWFsX2NvbnRlbnRzLCB0b2xlcmFuY2UpOgotICAgICAgICBpZiB0b2xlcmFuY2Ug IT0gc2VsZi5fdG9sZXJhbmNlIG9yIChzZWxmLl9wcm9jZXNzIGFuZCBzZWxmLl9wcm9jZXNzLmhh c19hdmFpbGFibGVfc3Rkb3V0KCkpOgorICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVk X2NvbnRlbnRzLCBhY3R1YWxfY29udGVudHMsIHRvbGVyYW5jZSwgZXhhY3Q9RmFsc2UpOgorICAg ICAgICBpZiB0b2xlcmFuY2UgIT0gc2VsZi5fdG9sZXJhbmNlIG9yIGV4YWN0ICE9IHNlbGYuX2V4 YWN0IG9yIChzZWxmLl9wcm9jZXNzIGFuZCBzZWxmLl9wcm9jZXNzLmhhc19hdmFpbGFibGVfc3Rk b3V0KCkpOgogICAgICAgICAgICAgc2VsZi5zdG9wKCkKICAgICAgICAgdHJ5OgogICAgICAgICAg ICAgYXNzZXJ0KGV4cGVjdGVkX2NvbnRlbnRzKQpAQCAtODAsNyArODEsNyBAQCBjbGFzcyBJbWFn ZURpZmZlcihvYmplY3QpOgogICAgICAgICAgICAgYXNzZXJ0KHRvbGVyYW5jZSBpcyBub3QgTm9u ZSkKIAogICAgICAgICAgICAgaWYgbm90IHNlbGYuX3Byb2Nlc3M6Ci0gICAgICAgICAgICAgICAg c2VsZi5fc3RhcnQodG9sZXJhbmNlKQorICAgICAgICAgICAgICAgIHNlbGYuX3N0YXJ0KHRvbGVy YW5jZSwgZXhhY3QpCiAgICAgICAgICAgICAjIE5vdGUgdGhhdCBhbHRob3VnaCB3ZSBhcmUgaGFu ZGVkICdvbGQnLCAnbmV3JywgSW1hZ2VEaWZmIHdhbnRzICduZXcnLCAnb2xkJy4KICAgICAgICAg ICAgIGJ1ZmZlciA9IEJ5dGVzSU8oKQogICAgICAgICAgICAgYnVmZmVyLndyaXRlKHN0cmluZ191 dGlscy5lbmNvZGUoJ0NvbnRlbnQtTGVuZ3RoOiB7fVxuJy5mb3JtYXQobGVuKGFjdHVhbF9jb250 ZW50cykpKSkKQEAgLTkyLDEwICs5MywxNCBAQCBjbGFzcyBJbWFnZURpZmZlcihvYmplY3QpOgog ICAgICAgICBleGNlcHQgSU9FcnJvciBhcyBleGNlcHRpb246CiAgICAgICAgICAgICByZXR1cm4g KE5vbmUsIDAsICJGYWlsZWQgdG8gY29tcHV0ZSBhbiBpbWFnZSBkaWZmOiAlcyIgJSBzdHIoZXhj ZXB0aW9uKSkKIAotICAgIGRlZiBfc3RhcnQoc2VsZiwgdG9sZXJhbmNlKToKKyAgICBkZWYgX3N0 YXJ0KHNlbGYsIHRvbGVyYW5jZSwgZXhhY3QpOgogICAgICAgICBjb21tYW5kID0gW3NlbGYuX3Bv cnQuX3BhdGhfdG9faW1hZ2VfZGlmZigpLCAnLS1kaWZmZXJlbmNlJywgJy0tdG9sZXJhbmNlJywg c3RyKHRvbGVyYW5jZSldCisgICAgICAgIGlmIGV4YWN0OgorICAgICAgICAgICAgY29tbWFuZC5h cHBlbmQoJy0tZXhhY3QnKQorCiAgICAgICAgIGlmIHNlbGYuX3BvcnQuX3Nob3VsZF91c2Vfamhi dWlsZCgpOgogICAgICAgICAgICAgY29tbWFuZCA9IHNlbGYuX3BvcnQuX2poYnVpbGRfd3JhcHBl ciArIGNvbW1hbmQKKwogICAgICAgICBlbnZpcm9ubWVudCA9IHNlbGYuX3BvcnQuc2V0dXBfZW52 aXJvbl9mb3Jfc2VydmVyKCdJbWFnZURpZmYnKQogICAgICAgICBzZWxmLl9wcm9jZXNzID0gc2Vs Zi5fcG9ydC5fc2VydmVyX3Byb2Nlc3NfY29uc3RydWN0b3Ioc2VsZi5fcG9ydCwgJ0ltYWdlRGlm ZicsIGNvbW1hbmQsIGVudmlyb25tZW50LCBjcmFzaF9tZXNzYWdlPSdUZXN0IG1hcmtlZCBhcyBm YWlsZWQsIEltYWdlRGlmZiBjcmFzaGVkJykKICAgICAgICAgc2VsZi5fcHJvY2Vzcy5zdGFydCgp CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvdGVzdC5weSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5CmluZGV4IGE5Y2RlNGFjNjcwYzIxM2U3OTQ2 ODM2NDg0NmNkNDhlOGIxMTIxZjUuLmE0MDU3ZTIwZTIzMzEzOThmNTFlNWI1Y2I5MGUwNTY2Yzk2 MzExNTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5Cisr KyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC90ZXN0LnB5CkBAIC00MDMsNyArNDAzLDcg QEAgY2xhc3MgVGVzdFBvcnQoUG9ydCk6CiAgICAgZGVmIGRlZmF1bHRfY29uZmlndXJhdGlvbihz ZWxmKToKICAgICAgICAgcmV0dXJuICdSZWxlYXNlJwogCi0gICAgZGVmIGRpZmZfaW1hZ2Uoc2Vs ZiwgZXhwZWN0ZWRfY29udGVudHMsIGFjdHVhbF9jb250ZW50cywgdG9sZXJhbmNlPU5vbmUpOgor ICAgIGRlZiBkaWZmX2ltYWdlKHNlbGYsIGV4cGVjdGVkX2NvbnRlbnRzLCBhY3R1YWxfY29udGVu dHMsIHRvbGVyYW5jZT1Ob25lLCBleGFjdD1GYWxzZSk6CiAgICAgICAgIGV4cGVjdGVkX2NvbnRl bnRzID0gc3RyaW5nX3V0aWxzLmVuY29kZShleHBlY3RlZF9jb250ZW50cykKICAgICAgICAgYWN0 dWFsX2NvbnRlbnRzID0gc3RyaW5nX3V0aWxzLmVuY29kZShhY3R1YWxfY29udGVudHMpCiAgICAg ICAgIGRpZmZlZCA9IGFjdHVhbF9jb250ZW50cyAhPSBleHBlY3RlZF9jb250ZW50cwo=