232294 2021-10-25 20:47:59 -0700 Have ImageDiff print the diff image when any pixel is different 2021-10-26 08:56:21 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 232225 232288 1 simon.fraser simon.fraser gsnedders jbedard mrobinson simon.fraser webkit-bug-importer oldest_to_newest 1808750 0 simon.fraser 2021-10-25 20:47:59 -0700 Have ImageDiff print the diff image when any pixel is different 1808751 1 442460 simon.fraser 2021-10-25 20:53:36 -0700 Created attachment 442460 Patch 1808802 2 442460 mrobinson 2021-10-26 02:14:41 -0700 Comment on attachment 442460 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=442460&action=review I like where this is heading. > Tools/Scripts/webkitpy/port/image_diff.py:133 > + if diff_output: I wonder if this should print some sort of warning is there is no diff_output? 1808869 3 ews-feeder 2021-10-26 08:55:56 -0700 Committed r284870 (243547@main): <https://commits.webkit.org/243547@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442460. 1808870 4 webkit-bug-importer 2021-10-26 08:56:21 -0700 <rdar://problem/84665305> 442460 2021-10-25 20:53:36 -0700 2021-10-26 08:55:57 -0700 Patch bug-232294-20211025205335.patch text/plain 13134 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjg0ODAwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDAyMzUyOTcxYmMxZDBjYTZmOGE1YTA1Y2MwOWNlYjFj ZWJhZDJkMC4uYmEwODA5ZTI2Njg1NDdiMGQ5YzU2ZmRiZDQ0ZjExOTdmZDRhZGRjMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2 IEBACisyMDIxLTEwLTI1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIEhhdmUgSW1hZ2VEaWZmIHByaW50IHRoZSBkaWZmIGltYWdlIHdoZW4gYW55IHBp eGVsIGlzIGRpZmZlcmVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMyMjk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisg ICAgICAgIAorICAgICAgICBJbWFnZURpZmYgY3VycmVudGx5IG9ubHkgb3V0cHV0cyB0aGUgZGlm ZiBpbWFnZSB3aGVuIGFueSBwaXhlbCBleGNlZWRzIGl0cyBidWlsdC1pbgorICAgICAgICB0b2xl cmFuY2UuCisKKyAgICAgICAgVG8gcHJlcGFyZSBmb3IgbW92aW5nIHRoZSAicGFzcy9mYWlsIiBk ZWNpc2lvbiB0byBzY3JpcHQsIGhhdmUgSW1hZ2VEaWZmIG91dHB1dCB0aGUgZGlmZgorICAgICAg ICBpbWFnZSB3aGVuIGFueSBwaXhlbCBpcyBkaWZmZXJlbnQuIEFsc28gaGF2ZSBpdCB3cml0ZSAi I0VPRiIgc28gdGhhdCB3ZSdyZSBub3QgcmVsaWFudCBvbgorICAgICAgICB0aGUgImRpZmY6IiBs aW5lIHRvIHRlcm1pbmF0ZSByZWFkaW5nIHRoZSBvdXRwdXQuCisKKyAgICAgICAgRml4IHVwIHdl YmtpdHB5IHVuaXQgdGVzdHMgZm9yICNFT0YgcGFyc2luZywgcHJlc2VuY2Ugb2YgaW1hZ2Ugd2hl biB0aGUgdGVzdCBwYXNzZXMgdmlhCisgICAgICAgIHRvbGVyYW5jZSwgYW5kIHRvIGFjdHVhbGx5 IHRlc3Qgd2hpY2ggaW1hZ2UgZGF0YSBpcyBwcmVzZW50IGluIHRoZSBJbWFnZURpZmZSZXN1bHQu CisKKyAgICAgICAgKiBJbWFnZURpZmYvSW1hZ2VEaWZmLmNwcDoKKyAgICAgICAgKHByb2Nlc3NJ bWFnZXMpOgorICAgICAgICAobWFpbik6CisgICAgICAgICogSW1hZ2VEaWZmL1BsYXRmb3JtSW1h Z2UuY3BwOgorICAgICAgICAoSW1hZ2VEaWZmOjpQbGF0Zm9ybUltYWdlOjpkaWZmZXJlbmNlKTog VHJhY2sgbGVnYWN5RGlzdGFuY2VNYXggaWYgYW55IHBpeGVsIGRpZmYgaXMgbm9uLXplcm8sCisg ICAgICAgIHNpbmNlIGl0J3MgbmVlZGVkIHRvIHNjYWxlIHRoZSBkaWZmIGltYWdlLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pbWFnZV9kaWZmLnB5OgorICAgICAgICAoSW1hZ2VE aWZmZXIuX3JlYWQpOiBMb29rIGZvciAiI0VPRiIgdG8gdGVybWluYXRlIHRoZSBvdXRwdXQuIFNh dmUgdGhlIGRpZmYgaW1hZ2UsIGV2ZW4KKyAgICAgICAgaWYgdGhlIHRlc3QgcGFzc2VkLgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5OgorICAgICAgICAo UG9ydFRlc3RDYXNlLnRlc3RfZGlmZl9pbWFnZS5tYWtlX3Byb2MpOgorICAgICAgICAoUG9ydFRl c3RDYXNlLnRlc3RfZGlmZl9pbWFnZSk6CisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZm X2ltYWdlX3Bhc3NlZCk6CisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlX2Zh aWxlZCk6CisgICAgICAgIChQb3J0VGVzdENhc2UudGVzdF9kaWZmX2ltYWdlX2NyYXNoZWQpOgor CiAyMDIxLTEwLTI1ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIERvbid0IHJ1biBJbWFnZURpZmYgYSBzZWNvbmQgdGltZSB0byBnZW5lcmF0ZSBkaWZm IGltYWdlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZmL0ltYWdlRGlmZi5jcHAgYi9Ub29s cy9JbWFnZURpZmYvSW1hZ2VEaWZmLmNwcAppbmRleCA3NGEyMDU2NDE5NTdkM2ZiYjJiMmNlODA3 YmE5YzBkMzllYmFmMTAzLi5kYWRiMzljZWNhZDA1ZDdjYjgxYmU4Yjk4ZDQxZmUzMmE2YmNiOTRi IDEwMDY0NAotLS0gYS9Ub29scy9JbWFnZURpZmYvSW1hZ2VEaWZmLmNwcAorKysgYi9Ub29scy9J bWFnZURpZmYvSW1hZ2VEaWZmLmNwcApAQCAtNzMsOSArNzMsMTAgQEAgc3RhdGljIGludCBwcm9j ZXNzSW1hZ2VzKHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdlPiYmIGFjdHVhbEltYWdlLCBz dGQ6OnVuaXEKICAgICAgICAgbGVnYWN5RGlmZmVyZW5jZSA9IHN0ZDo6bWF4PGZsb2F0PihsZWdh Y3lEaWZmZXJlbmNlLCAwLjAxZik7IC8vIHJvdW5kIHRvIDIgZGVjaW1hbCBwbGFjZXMKICAgICB9 CiAKKyAgICBpZiAoZGlmZkltYWdlKQorICAgICAgICBkaWZmSW1hZ2UtPndyaXRlQXNQTkdUb1N0 ZG91dCgpOworCiAgICAgaWYgKGxlZ2FjeURpZmZlcmVuY2UgPiAwLjBmKSB7Ci0gICAgICAgIGlm IChkaWZmSW1hZ2UpCi0gICAgICAgICAgICBkaWZmSW1hZ2UtPndyaXRlQXNQTkdUb1N0ZG91dCgp OwogICAgICAgICBmcHJpbnRmKHN0ZG91dCwgImRpZmY6ICUwMS4yZiUlIGZhaWxlZFxuIiwgbGVn YWN5RGlmZmVyZW5jZSk7CiAgICAgfSBlbHNlCiAgICAgICAgIGZwcmludGYoc3Rkb3V0LCAiZGlm ZjogJTAxLjJmJSUgcGFzc2VkXG4iLCBsZWdhY3lEaWZmZXJlbmNlKTsKQEAgLTgzLDYgKzg0LDkg QEAgc3RhdGljIGludCBwcm9jZXNzSW1hZ2VzKHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybUltYWdl PiYmIGFjdHVhbEltYWdlLCBzdGQ6OnVuaXEKICAgICBpZiAocHJpbnREaWZmZXJlbmNlKQogICAg ICAgICBmcHJpbnRmKHN0ZG91dCwgIm1heERpZmZlcmVuY2U9JXU7IHRvdGFsUGl4ZWxzPSVsdVxu IiwgZGlmZmVyZW5jZURhdGEubWF4RGlmZmVyZW5jZSwgZGlmZmVyZW5jZURhdGEudG90YWxQaXhl bHMpOwogCisgICAgZnByaW50ZihzdGRvdXQsICIjRU9GXG4iKTsKKyAgICBmZmx1c2goc3Rkb3V0 KTsKKwogICAgIHJldHVybiBFWElUX1NVQ0NFU1M7CiB9CiAKQEAgLTIyMiw3ICsyMjYsNiBAQCBp bnQgbWFpbihpbnQgYXJnYywgY29uc3QgY2hhciogYXJndltdKQogICAgICAgICAgICAgaWYgKHJl c3VsdCAhPSBFWElUX1NVQ0NFU1MpCiAgICAgICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAg ICAgICAgfQotICAgICAgICBmZmx1c2goc3Rkb3V0KTsKICAgICB9CiAKICAgICByZXR1cm4gRVhJ VF9TVUNDRVNTOwpkaWZmIC0tZ2l0IGEvVG9vbHMvSW1hZ2VEaWZmL1BsYXRmb3JtSW1hZ2UuY3Bw IGIvVG9vbHMvSW1hZ2VEaWZmL1BsYXRmb3JtSW1hZ2UuY3BwCmluZGV4IGZmZDcyOWE5NDk2M2Zk OWE4MGVjYmQ4NGNjNzg2M2ZkNTU0NzMwYTMuLjVhOWQzY2Y0NTUxYTFmMTlmNTY2YzYxZTBmMGI2 MjEyYmRlZjNkMjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0ltYWdlRGlmZi9QbGF0Zm9ybUltYWdlLmNw cAorKysgYi9Ub29scy9JbWFnZURpZmYvUGxhdGZvcm1JbWFnZS5jcHAKQEAgLTczLDEzICs3Mywx NCBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1JbWFnZT4gUGxhdGZvcm1JbWFnZTo6ZGlmZmVy ZW5jZShjb25zdCBQbGF0Zm9ybUltYWdlJiBvdAogICAgICAgICAgICAgICAgIHVuc2lnbmVkIGJs dWVEaWZmICAgPSBzdGQ6OmFicyhwaXhlbFsyXSAtIGJhc2VQaXhlbFsyXSk7CiAgICAgICAgICAg ICAgICAgdW5zaWduZWQgbWF4RGlmZiA9IHN0ZDo6bWF4KHsgcmVkRGlmZiwgZ3JlZW5EaWZmLCBi bHVlRGlmZiB9KTsKICAgICAgICAgICAgICAgICBkaWZmZXJlbmNlLm1heERpZmZlcmVuY2UgPSBz dGQ6Om1heChkaWZmZXJlbmNlLm1heERpZmZlcmVuY2UsIG1heERpZmYpOworCisgICAgICAgICAg ICAgICAgbGVnYWN5RGlzdGFuY2VNYXggPSBzdGQ6Om1heChsZWdhY3lEaXN0YW5jZU1heCwgbGVn YWN5RGlzdGFuY2UpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBMZWdhY3kgZGlm ZmVyZW5jZSBjb2RlLiBOb3RlIHRoZXJlIGlzIHNvbWUgYnVpbHQtaW4gdG9sZXJhbmNlIGhlcmUu CiAgICAgICAgICAgICBpZiAobGVnYWN5RGlzdGFuY2UgPj0gMS4wZiAvIDI1NS4wZikgewogICAg ICAgICAgICAgICAgICsrcGl4ZWxDb3VudFdpdGhTaWduaWZpY2FudERpZmZlcmVuY2U7CiAgICAg ICAgICAgICAgICAgbGVnYWN5RGlzdGFuY2VTdW0gKz0gbGVnYWN5RGlzdGFuY2U7Ci0gICAgICAg ICAgICAgICAgbGVnYWN5RGlzdGFuY2VNYXggPSBzdGQ6Om1heChsZWdhY3lEaXN0YW5jZU1heCwg bGVnYWN5RGlzdGFuY2UpOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBiYXNlUGl4ZWwg Kz0gNDsKQEAgLTkzLDE5ICs5NCwxNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1JbWFnZT4g UGxhdGZvcm1JbWFnZTo6ZGlmZmVyZW5jZShjb25zdCBQbGF0Zm9ybUltYWdlJiBvdAogICAgIGVs c2UKICAgICAgICAgZGlmZmVyZW5jZS5wZXJjZW50YWdlRGlmZmVyZW5jZSA9IDAuMGY7CiAKLSAg ICBpZiAoIXBpeGVsQ291bnRXaXRoU2lnbmlmaWNhbnREaWZmZXJlbmNlKSB7Ci0gICAgICAgIGZy ZWUoZGlmZkJ1ZmZlcik7Ci0gICAgICAgIHJldHVybiBudWxscHRyOwotICAgIH0KLQotICAgIC8v IEdlbmVyYXRlIGEgbm9ybWFsaXplZCBkaWZmIGltYWdlIGlmIHRoZXJlIGlzIGFueSBkaWZmZXJl bmNlLgotICAgIGlmIChwaXhlbENvdW50V2l0aFNpZ25pZmljYW50RGlmZmVyZW5jZSkgeworICAg IGlmIChkaWZmZXJlbmNlLnRvdGFsUGl4ZWxzKSB7CiAgICAgICAgIGRpZmZQaXhlbCA9IHJlaW50 ZXJwcmV0X2Nhc3Q8dW5zaWduZWQgY2hhcio+KGRpZmZCdWZmZXIpOwogICAgICAgICBmb3IgKHNp emVfdCBwID0gMDsgcCA8IGhlaWdodCAqIHdpZHRoOyArK3ApCiAgICAgICAgICAgICBkaWZmUGl4 ZWxbcF0gLz0gbGVnYWN5RGlzdGFuY2VNYXg7CisKKyAgICAgICAgcmV0dXJuIFBsYXRmb3JtSW1h Z2U6OmNyZWF0ZUZyb21EaWZmRGF0YShkaWZmQnVmZmVyLCB3aWR0aCwgaGVpZ2h0KTsKICAgICB9 CiAKLSAgICByZXR1cm4gUGxhdGZvcm1JbWFnZTo6Y3JlYXRlRnJvbURpZmZEYXRhKGRpZmZCdWZm ZXIsIHdpZHRoLCBoZWlnaHQpOworICAgIGZyZWUoZGlmZkJ1ZmZlcik7CisgICAgcmV0dXJuIG51 bGxwdHI7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIEltYWdlRGlmZgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9wb3J0L2ltYWdlX2RpZmYucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvaW1hZ2VfZGlmZi5weQppbmRleCBkZWE2ZjA3NTYyZjAxZDAyOGRhZTZhYzhhOTFk N2QzZTg3MTFmYjE2Li5lMTIzMGE1YzY3ZTBkMDIxNWE3ZjhiNTU4NDBmODNmZDYwOTFlY2QwIDEw MDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQorKysg Yi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW1hZ2VfZGlmZi5weQpAQCAtMTAxLDIzICsx MDEsMjQgQEAgY2xhc3MgSW1hZ2VEaWZmZXIob2JqZWN0KToKIAogICAgIGRlZiBfcmVhZChzZWxm KToKICAgICAgICAgZGVhZGxpbmUgPSB0aW1lLnRpbWUoKSArIDIuMAotICAgICAgICBvdXRwdXQg PSBOb25lCi0gICAgICAgIG91dHB1dF9pbWFnZSA9IGInJworICAgICAgICBvdXRwdXRfaW1hZ2Ug PSBOb25lCisgICAgICAgIGRpZmZfb3V0cHV0ID0gTm9uZQogCiAgICAgICAgIHdoaWxlIG5vdCBz ZWxmLl9wcm9jZXNzLnRpbWVkX291dCBhbmQgbm90IHNlbGYuX3Byb2Nlc3MuaGFzX2NyYXNoZWQo KToKICAgICAgICAgICAgIG91dHB1dCA9IHNlbGYuX3Byb2Nlc3MucmVhZF9zdGRvdXRfbGluZShk ZWFkbGluZSkKICAgICAgICAgICAgIGlmIHNlbGYuX3Byb2Nlc3MudGltZWRfb3V0IG9yIHNlbGYu X3Byb2Nlc3MuaGFzX2NyYXNoZWQoKSBvciBub3Qgb3V0cHV0OgogICAgICAgICAgICAgICAgIGJy ZWFrCiAKLSAgICAgICAgICAgIGlmIG91dHB1dC5zdGFydHN3aXRoKGInZGlmZicpOiAgIyBUaGlz IGlzIHRoZSBsYXN0IGxpbmUgSW1hZ2VEaWZmIHByaW50cy4KKyAgICAgICAgICAgIGlmIG91dHB1 dC5zdGFydHN3aXRoKGInI0VPRicpOgogICAgICAgICAgICAgICAgIGJyZWFrCiAKKyAgICAgICAg ICAgIGlmIG91dHB1dC5zdGFydHN3aXRoKGInZGlmZjonKToKKyAgICAgICAgICAgICAgICBkaWZm X291dHB1dCA9IG91dHB1dAorCiAgICAgICAgICAgICBpZiBvdXRwdXQuc3RhcnRzd2l0aChiJ0Nv bnRlbnQtTGVuZ3RoJyk6CiAgICAgICAgICAgICAgICAgbSA9IHJlLm1hdGNoKGJyJ0NvbnRlbnQt TGVuZ3RoOiAoXGQrKScsIG91dHB1dCkKICAgICAgICAgICAgICAgICBjb250ZW50X2xlbmd0aCA9 IGludChzdHJpbmdfdXRpbHMuZGVjb2RlKG0uZ3JvdXAoMSksIHRhcmdldF90eXBlPXN0cikpCiAg ICAgICAgICAgICAgICAgb3V0cHV0X2ltYWdlID0gc2VsZi5fcHJvY2Vzcy5yZWFkX3N0ZG91dChk ZWFkbGluZSwgY29udGVudF9sZW5ndGgpCi0gICAgICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5f cHJvY2Vzcy5yZWFkX3N0ZG91dF9saW5lKGRlYWRsaW5lKQotICAgICAgICAgICAgICAgIGJyZWFr CiAKICAgICAgICAgc3RkZXJyID0gc3RyaW5nX3V0aWxzLmRlY29kZShzZWxmLl9wcm9jZXNzLnBv cF9hbGxfYnVmZmVyZWRfc3RkZXJyKCksIHRhcmdldF90eXBlPXN0cikKICAgICAgICAgZXJyX3N0 ciA9ICcnCkBAIC0xMjksMTAgKzEzMCwxMCBAQCBjbGFzcyBJbWFnZURpZmZlcihvYmplY3QpOgog ICAgICAgICAgICAgZXJyX3N0ciArPSAiSW1hZ2VEaWZmIGNyYXNoZWRcbiIKIAogICAgICAgICBk aWZmX3BlcmNlbnQgPSAwCi0gICAgICAgIGlmIG91dHB1dCBhbmQgb3V0cHV0LnN0YXJ0c3dpdGgo YidkaWZmJyk6Ci0gICAgICAgICAgICBtID0gcmUubWF0Y2goYidkaWZmOiAoLispJSAocGFzc2Vk fGZhaWxlZCknLCBvdXRwdXQpCisgICAgICAgIGlmIGRpZmZfb3V0cHV0OgorICAgICAgICAgICAg bSA9IHJlLm1hdGNoKGInZGlmZjogKC4rKSUgKHBhc3NlZHxmYWlsZWQpJywgZGlmZl9vdXRwdXQp CiAgICAgICAgICAgICBpZiBtLmdyb3VwKDIpID09IGIncGFzc2VkJzoKLSAgICAgICAgICAgICAg ICByZXR1cm4gSW1hZ2VEaWZmUmVzdWx0KHBhc3NlZD1UcnVlLCBkaWZmX2ltYWdlPU5vbmUsIGRp ZmZlcmVuY2U9MCkKKyAgICAgICAgICAgICAgICByZXR1cm4gSW1hZ2VEaWZmUmVzdWx0KHBhc3Nl ZD1UcnVlLCBkaWZmX2ltYWdlPW91dHB1dF9pbWFnZSwgZGlmZmVyZW5jZT0wKQogICAgICAgICAg ICAgZGlmZl9wZXJjZW50ID0gZmxvYXQoc3RyaW5nX3V0aWxzLmRlY29kZShtLmdyb3VwKDEpLCB0 YXJnZXRfdHlwZT1zdHIpKQogCiAgICAgICAgIHJldHVybiBJbWFnZURpZmZSZXN1bHQocGFzc2Vk PUZhbHNlLCBkaWZmX2ltYWdlPW91dHB1dF9pbWFnZSwgZGlmZmVyZW5jZT1kaWZmX3BlcmNlbnQs IHRvbGVyYW5jZT1zZWxmLl90b2xlcmFuY2UsIGVycm9yX3N0cmluZz1lcnJfc3RyIG9yIE5vbmUp CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvcG9ydF90ZXN0Y2FzZS5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CmluZGV4IGQz ZTFiOTViNzQ5ZGMzOWIyNTY2N2E1MWRhMDdiN2RlYjFlOWM1YzEuLmY5ZjZlYzdhYTE0NWY2MGI4 MWFlNzk2ZWQ1NzBiMTA2NGM5OTVkMjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0 cHkvcG9ydC9wb3J0X3Rlc3RjYXNlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9wb3J0X3Rlc3RjYXNlLnB5CkBAIC0yODQsNyArMjg0LDcgQEAgY2xhc3MgUG9ydFRlc3RDYXNl KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICAgICAgc2VsZi5wcm9jID0gTm9uZQogCiAgICAgICAg IGRlZiBtYWtlX3Byb2MocG9ydCwgbm0sIGNtZCwgZW52LCBjcmFzaF9tZXNzYWdlPU5vbmUpOgot ICAgICAgICAgICAgc2VsZi5wcm9jID0gTW9ja1NlcnZlclByb2Nlc3MocG9ydCwgbm0sIGNtZCwg ZW52LCBsaW5lcz1bJ2RpZmY6IDEwMCUgZmFpbGVkXG4nLCAnZGlmZjogMTAwJSBmYWlsZWRcbidd KQorICAgICAgICAgICAgc2VsZi5wcm9jID0gTW9ja1NlcnZlclByb2Nlc3MocG9ydCwgbm0sIGNt ZCwgZW52LCBsaW5lcz1bJ0NvbnRlbnQtTGVuZ3RoOiA2XG4nLCAnaW1hZ2UxJywgJ2RpZmY6IDkw JSBmYWlsZWRcbicsICcjRU9GXG4nLCAnQ29udGVudC1MZW5ndGg6IDZcbicsICdpbWFnZTInLCAn ZGlmZjogMTAwJSBmYWlsZWRcbicsICcjRU9GXG4nXSkKICAgICAgICAgICAgIHJldHVybiBzZWxm LnByb2MKIAogICAgICAgICAjIEZJWE1FOiBDYW4ndCBwcmV0ZW5kIHRvIHJ1biBzZXR1cCBmb3Ig c29tZSBwb3J0cywgc28ganVzdCBza2lwIHRoaXMgdGVzdC4KQEAgLTI5NywyNiArMjk3LDI2IEBA IGNsYXNzIFBvcnRUZXN0Q2FzZSh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICMgRmlyc3Qg dGVzdCB0aGUgY2FzZSBvZiBub3QgdXNpbmcgdGhlIEpIQnVpbGQgd3JhcHBlci4KICAgICAgICAg c2VsZi5hc3NlcnRGYWxzZShwb3J0Ll9zaG91bGRfdXNlX2poYnVpbGQoKSkKIAotICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJyksIEltYWdlRGlm ZlJlc3VsdChwYXNzZWQ9RmFsc2UsIGRpZmZfaW1hZ2U9YicnLCBkaWZmZXJlbmNlPTEwMC4wLCB0 b2xlcmFuY2U9MC4xKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRpZmZfaW1hZ2Uo Yidmb28nLCBiJ2JhcicpLCBJbWFnZURpZmZSZXN1bHQocGFzc2VkPUZhbHNlLCBkaWZmX2ltYWdl PWInaW1hZ2UxJywgZGlmZmVyZW5jZT05MC4wLCB0b2xlcmFuY2U9MC4xKSkKICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzZWxmLnByb2MuY21kLCBbcG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCks ICItLXRvbGVyYW5jZSIsICIwLjEiXSkKIAotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQu ZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJywgdG9sZXJhbmNlPU5vbmUpLCBJbWFnZURpZmZSZXN1 bHQocGFzc2VkPUZhbHNlLCBkaWZmX2ltYWdlPWInJywgZGlmZmVyZW5jZT0xMDAuMCwgdG9sZXJh bmNlPTAuMSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5kaWZmX2ltYWdlKGInZm9v JywgYidiYXInLCB0b2xlcmFuY2U9Tm9uZSksIEltYWdlRGlmZlJlc3VsdChwYXNzZWQ9RmFsc2Us IGRpZmZfaW1hZ2U9YidpbWFnZTEnLCBkaWZmZXJlbmNlPTkwLjAsIHRvbGVyYW5jZT0wLjEpKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYucHJvYy5jbWQsIFtwb3J0Ll9wYXRoX3RvX2lt YWdlX2RpZmYoKSwgIi0tdG9sZXJhbmNlIiwgIjAuMSJdKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwocG9ydC5kaWZmX2ltYWdlKGInZm9vJywgYidiYXInLCB0b2xlcmFuY2U9MCksIEltYWdl RGlmZlJlc3VsdChwYXNzZWQ9RmFsc2UsIGRpZmZfaW1hZ2U9YicnLCBkaWZmZXJlbmNlPTEwMC4w KSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRpZmZfaW1hZ2UoYidmb28nLCBiJ2Jh cicsIHRvbGVyYW5jZT0wKSwgSW1hZ2VEaWZmUmVzdWx0KHBhc3NlZD1GYWxzZSwgZGlmZl9pbWFn ZT1iJ2ltYWdlMScsIGRpZmZlcmVuY2U9OTAuMCkpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo c2VsZi5wcm9jLmNtZCwgW3BvcnQuX3BhdGhfdG9faW1hZ2VfZGlmZigpLCAiLS10b2xlcmFuY2Ui LCAiMCJdKQogCiAgICAgICAgICMgTm93IHRlc3QgdGhlIGNhc2Ugb2YgdXNpbmcgSkhCdWlsZCB3 cmFwcGVyLgogICAgICAgICBwb3J0Ll9maWxlc3lzdGVtLm1heWJlX21ha2VfZGlyZWN0b3J5KHBv cnQucGF0aF9mcm9tX3dlYmtpdF9iYXNlKCdXZWJLaXRCdWlsZCcsICdEZXBlbmRlbmNpZXMlcycg JSBwb3J0LnBvcnRfbmFtZS51cHBlcigpKSkKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHBvcnQu X3Nob3VsZF91c2VfamhidWlsZCgpKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5k aWZmX2ltYWdlKGInZm9vJywgYidiYXInKSwgSW1hZ2VEaWZmUmVzdWx0KHBhc3NlZD1GYWxzZSwg ZGlmZl9pbWFnZT1iJycsIGRpZmZlcmVuY2U9MTAwLjAsIHRvbGVyYW5jZT0wLjEpKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHBvcnQuZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJyksIEltYWdl RGlmZlJlc3VsdChwYXNzZWQ9RmFsc2UsIGRpZmZfaW1hZ2U9YidpbWFnZTEnLCBkaWZmZXJlbmNl PTkwLjAsIHRvbGVyYW5jZT0wLjEpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYucHJv Yy5jbWQsIHBvcnQuX2poYnVpbGRfd3JhcHBlciArIFtwb3J0Ll9wYXRoX3RvX2ltYWdlX2RpZmYo KSwgIi0tdG9sZXJhbmNlIiwgIjAuMSJdKQogCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9y dC5kaWZmX2ltYWdlKGInZm9vJywgYidiYXInLCB0b2xlcmFuY2U9Tm9uZSksIEltYWdlRGlmZlJl c3VsdChwYXNzZWQ9RmFsc2UsIGRpZmZfaW1hZ2U9YicnLCBkaWZmZXJlbmNlPTEwMC4wLCB0b2xl cmFuY2U9MC4xKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRpZmZfaW1hZ2UoYidm b28nLCBiJ2JhcicsIHRvbGVyYW5jZT1Ob25lKSwgSW1hZ2VEaWZmUmVzdWx0KHBhc3NlZD1GYWxz ZSwgZGlmZl9pbWFnZT1iJ2ltYWdlMScsIGRpZmZlcmVuY2U9OTAuMCwgdG9sZXJhbmNlPTAuMSkp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5wcm9jLmNtZCwgcG9ydC5famhidWlsZF93 cmFwcGVyICsgW3BvcnQuX3BhdGhfdG9faW1hZ2VfZGlmZigpLCAiLS10b2xlcmFuY2UiLCAiMC4x Il0pCiAKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChwb3J0LmRpZmZfaW1hZ2UoYidmb28nLCBi J2JhcicsIHRvbGVyYW5jZT0wKSwgSW1hZ2VEaWZmUmVzdWx0KHBhc3NlZD1GYWxzZSwgZGlmZl9p bWFnZT1iJycsIGRpZmZlcmVuY2U9MTAwLjApKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBv cnQuZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJywgdG9sZXJhbmNlPTApLCBJbWFnZURpZmZSZXN1 bHQocGFzc2VkPUZhbHNlLCBkaWZmX2ltYWdlPWInaW1hZ2UxJywgZGlmZmVyZW5jZT05MC4wKSkK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzZWxmLnByb2MuY21kLCBwb3J0Ll9qaGJ1aWxkX3dy YXBwZXIgKyBbcG9ydC5fcGF0aF90b19pbWFnZV9kaWZmKCksICItLXRvbGVyYW5jZSIsICIwIl0p CiAKICAgICAgICAgcG9ydC5jbGVhbl91cF90ZXN0X3J1bigpCkBAIC0zMjUsMTUgKzMyNSwxNSBA QCBjbGFzcyBQb3J0VGVzdENhc2UodW5pdHRlc3QuVGVzdENhc2UpOgogCiAgICAgZGVmIHRlc3Rf ZGlmZl9pbWFnZV9wYXNzZWQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgp Ci0gICAgICAgIHBvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yID0gbGFtYmRhIHBvcnQs IG5tLCBjbWQsIGVudiwgY3Jhc2hfbWVzc2FnZT1Ob25lOiBNb2NrU2VydmVyUHJvY2VzcyhsaW5l cz1bJ2RpZmY6IDAlIHBhc3NlZFxuJ10pCisgICAgICAgIHBvcnQuX3NlcnZlcl9wcm9jZXNzX2Nv bnN0cnVjdG9yID0gbGFtYmRhIHBvcnQsIG5tLCBjbWQsIGVudiwgY3Jhc2hfbWVzc2FnZT1Ob25l OiBNb2NrU2VydmVyUHJvY2VzcyhsaW5lcz1bJ2RpZmY6IDAlIHBhc3NlZFxuJywgJyNFT0Zcbidd KQogICAgICAgICBpbWFnZV9kaWZmZXIgPSBJbWFnZURpZmZlcihwb3J0KQogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKGltYWdlX2RpZmZlci5kaWZmX2ltYWdlKGInZm9vJywgYidiYXInLCB0b2xl cmFuY2U9MC4xKSwgSW1hZ2VEaWZmUmVzdWx0KHBhc3NlZD1UcnVlLCBkaWZmX2ltYWdlPU5vbmUs IGRpZmZlcmVuY2U9MCkpCiAKICAgICBkZWYgdGVzdF9kaWZmX2ltYWdlX2ZhaWxlZChzZWxmKToK ICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KCkKLSAgICAgICAgcG9ydC5fc2VydmVyX3By b2Nlc3NfY29uc3RydWN0b3IgPSBsYW1iZGEgcG9ydCwgbm0sIGNtZCwgZW52LCBjcmFzaF9tZXNz YWdlPU5vbmU6IE1vY2tTZXJ2ZXJQcm9jZXNzKGxpbmVzPVsnZGlmZjogMTAwJSBmYWlsZWRcbidd KQorICAgICAgICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IGxhbWJkYSBwb3J0 LCBubSwgY21kLCBlbnYsIGNyYXNoX21lc3NhZ2U9Tm9uZTogTW9ja1NlcnZlclByb2Nlc3MobGlu ZXM9WydDb250ZW50LUxlbmd0aDogNFxuJywgJ3Rlc3QnLCAnZGlmZjogMTAwJSBmYWlsZWRcbics ICcjRU9GXG4nXSkKICAgICAgICAgaW1hZ2VfZGlmZmVyID0gSW1hZ2VEaWZmZXIocG9ydCkKLSAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbWFnZV9kaWZmZXIuZGlmZl9pbWFnZShiJ2ZvbycsIGIn YmFyJywgdG9sZXJhbmNlPTAuMSksIEltYWdlRGlmZlJlc3VsdChwYXNzZWQ9RmFsc2UsIGRpZmZf aW1hZ2U9YicnLCBkaWZmZXJlbmNlPTEwMC4wLCB0b2xlcmFuY2U9MC4xKSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChpbWFnZV9kaWZmZXIuZGlmZl9pbWFnZShiJ2ZvbycsIGInYmFyJywgdG9s ZXJhbmNlPTAuMSksIEltYWdlRGlmZlJlc3VsdChwYXNzZWQ9RmFsc2UsIGRpZmZfaW1hZ2U9Yid0 ZXN0JywgZGlmZmVyZW5jZT0xMDAuMCwgdG9sZXJhbmNlPTAuMSkpCiAKICAgICBkZWYgdGVzdF9k aWZmX2ltYWdlX2NyYXNoZWQoc2VsZik6CiAgICAgICAgIHBvcnQgPSBzZWxmLm1ha2VfcG9ydCgp CkBAIC0zNDksNyArMzQ5LDcgQEAgY2xhc3MgUG9ydFRlc3RDYXNlKHVuaXR0ZXN0LlRlc3RDYXNl KToKIAogICAgICAgICBwb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1Y3RvciA9IG1ha2VfcHJv YwogICAgICAgICBwb3J0LnNldHVwX3Rlc3RfcnVuKCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChwb3J0LmRpZmZfaW1hZ2UoYidmb28nLCBiJ2JhcicpLCBJbWFnZURpZmZSZXN1bHQocGFzc2Vk PUZhbHNlLCBkaWZmX2ltYWdlPWInJywgZGlmZmVyZW5jZT0wLCB0b2xlcmFuY2U9MC4xLCBlcnJv cl9zdHJpbmc9J0ltYWdlRGlmZiBjcmFzaGVkXG4nKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChwb3J0LmRpZmZfaW1hZ2UoYidmb28nLCBiJ2JhcicpLCBJbWFnZURpZmZSZXN1bHQocGFzc2Vk PUZhbHNlLCBkaWZmX2ltYWdlPU5vbmUsIGRpZmZlcmVuY2U9MCwgdG9sZXJhbmNlPTAuMSwgZXJy b3Jfc3RyaW5nPSdJbWFnZURpZmYgY3Jhc2hlZFxuJykpCiAgICAgICAgIHBvcnQuY2xlYW5fdXBf dGVzdF9ydW4oKQogCiAgICAgQHNsb3cK