From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 From: Sam Day To: git-commits@fedoraproject.org Subject: [rpms/phoc] rawhide: Backport fix for flaky screenshot tests Date: Thu, 20 Aug 2026 00:25:25 GMT Message-ID: <178718552529.1.9065956050398398095.rpms-phoc-5cc17f1c3a62@fedoraproject.org> List-ID: X-Git-Repo: rpms/phoc X-Git-Branch: rawhide X-Git-Rev: 5cc17f1c3a62dbbe55323152d6865d08799a9e71 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvcGhvYwpCcmFuY2gg OiByYXdoaWRlCkNvbW1pdCA6IDVjYzE3ZjFjM2E2MmRiYmU1NTMyMzE1MmQ2ODY1ZDA4Nzk5YTll NzEKQXV0aG9yIDogU2FtIERheSA8bWVAc2FtY2RheS5jb20+CkRhdGUgICA6IDIwMjYtMDgtMjBU MTA6MjU6MDArMTA6MDAKU3RhdHMgIDogKzI2NS8tMCBpbiAyIGZpbGUocykKVVJMICAgIDogaHR0 cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9waG9jL2MvNWNjMTdmMWMzYTYyZGJiZTU1 MzIzMTUyZDY4NjVkMDg3OTlhOWU3MT9icmFuY2g9cmF3aGlkZQoKTG9nOgpCYWNrcG9ydCBmaXgg Zm9yIGZsYWt5IHNjcmVlbnNob3QgdGVzdHMKCi0tLQpkaWZmIC0tZ2l0IGEvODA1LmRpZmYgYi84 MDUuZGlmZgpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4xZDRhZjdiCi0tLSAv ZGV2L251bGwKKysrIGIvODA1LmRpZmYKQEAgLTAsMCArMSwyNjIgQEAKK2RpZmYgLS1naXQgYS90 ZXN0cy90ZXN0LXh3YXlsYW5kLmMgYi90ZXN0cy90ZXN0LXh3YXlsYW5kLmMKK2luZGV4IDUzN2Iz YjE3NmVjNWRjNDUyNzcwMDU3ZThiODhhMzM5YzRlZDJmNzUuLmIwODY4NGNjYTQ1NjA2NTcxMjcx MTRjMDBlNzgzODBkNDllZGE0ZGIgMTAwNjQ0CistLS0gYS90ZXN0cy90ZXN0LXh3YXlsYW5kLmMK KysrKyBiL3Rlc3RzL3Rlc3QteHdheWxhbmQuYworQEAgLTEyLDcgKzEyLDYgQEAKKyAKKyAjaW5j bHVkZSAidGVzdGxpYi5oIgorIAorLQorIHR5cGVkZWYgc3RydWN0ICB7CisgICB4Y2JfY29ubmVj dGlvbl90ICAgICAgKmNvbm47CisgICBQaG9jVGVzdENsaWVudEdsb2JhbHMgKmdsb2JhbHM7CitA QCAtNDUsNyArNDQsMTIgQEAgb25feGNiX2ZkIChpbnQgZmQsIEdJT0NvbmRpdGlvbiBjb25kaXRp b24sIGdwb2ludGVyIHVzZXJfZGF0YSkKKyAgIGlmICgoZXZlbnQtPnJlc3BvbnNlX3R5cGUgJiAw eDdmKSA9PSBYQ0JfTUFQX05PVElGWSkgeworICAgICBnX3Rlc3RfbWVzc2FnZSAoIlhjYiBXaW5k b3cgbWFwcGVkLCB0YWtpbmcgc2NyZWVuc2hvdCIpOworICAgICBjZGF0YS0+bWFwcGVkID0gVFJV RTsKKy0gICAgdXNsZWVwICgyMCAqIDEwMDApOworKworKyAgICB3aGlsZSAoIWNkYXRhLT5nbG9i YWxzLT5mb3JlaWduX3RvcGxldmVscyAmJgorKyAgICAgICAgICAgd2xfZGlzcGxheV9kaXNwYXRj aCAoY2RhdGEtPmdsb2JhbHMtPmRpc3BsYXkpICE9IC0xKSB7CisrICAgIH0KKysgICAgZ19hc3Nl cnRfbm9ubnVsbCAoY2RhdGEtPmdsb2JhbHMtPmZvcmVpZ25fdG9wbGV2ZWxzKTsKKysKKyAgICAg cGhvY19hc3NlcnRfc2NyZWVuc2hvdCAoY2RhdGEtPmdsb2JhbHMsICJ0ZXN0LXh3YXlsYW5kLXNp bXBsZS0xLnBuZyIpOworICAgICBnX3Rlc3RfbWVzc2FnZSAoIlVubWFwcGluZyB3aW5kb3ciKTsK KyAgICAgeGNiX3VubWFwX3dpbmRvdyAoY2RhdGEtPmNvbm4sIGNkYXRhLT53aW5kb3cpOworQEAg LTUzLDcgKzU3LDYgQEAgb25feGNiX2ZkIChpbnQgZmQsIEdJT0NvbmRpdGlvbiBjb25kaXRpb24s IGdwb2ludGVyIHVzZXJfZGF0YSkKKyAgIH0gZWxzZSBpZiAoKGV2ZW50LT5yZXNwb25zZV90eXBl ICYgMHg3ZikgPT0gWENCX1VOTUFQX05PVElGWSkgeworICAgICBnX3Rlc3RfbWVzc2FnZSAoIlhj YiBXaW5kb3cgdW5tYXBwZWQsIHRha2luZyBzY3JlZW5zaG90Iik7CisgICAgIGNkYXRhLT51bm1h cHBlZCA9IFRSVUU7CistICAgIHVzbGVlcCAoMjAgKiAxMDAwKTsKKyAgICAgcGhvY19hc3NlcnRf c2NyZWVuc2hvdCAoY2RhdGEtPmdsb2JhbHMsICJlbXB0eS5wbmciKTsKKyAgICAgZ19tYWluX2xv b3BfcXVpdCAoY2RhdGEtPmxvb3ApOworICAgfQorQEAgLTE2Nyw3ICsxNzAsNyBAQCB0ZXN0X3h3 YXlsYW5kX3NpbXBsZSAodm9pZCkKKyAgICAgLnh3YXlsYW5kICAgICAgID0gVFJVRSwKKyAgIH07 CisgCistICBwaG9jX3Rlc3RfY2xpZW50X3J1biAoMywgJmlmYWNlLCBHSU5UX1RPX1BPSU5URVIg KEZBTFNFKSk7CisrICBwaG9jX3Rlc3RfY2xpZW50X3J1biAoVEVTVF9QSE9DX0NMSUVOVF9USU1F T1VULCAmaWZhY2UsIEdJTlRfVE9fUE9JTlRFUiAoRkFMU0UpKTsKKyB9CisgCisgaW50CitkaWZm IC0tZ2l0IGEvdGVzdHMvdGVzdGxpYi5jIGIvdGVzdHMvdGVzdGxpYi5jCitpbmRleCAwNDJhYjI4 NmY5N2NlNDhhZGVlODQ4MjVjNzRlM2M3MTRhNmY2NjljLi43MzRhNzE1YzU4MzJjOTI1OTMyZDdi YTg3ZjU3NjJjNDMxZDI0ZDE1IDEwMDY0NAorLS0tIGEvdGVzdHMvdGVzdGxpYi5jCisrKysgYi90 ZXN0cy90ZXN0bGliLmMKK0BAIC0xNSw2ICsxNSw4IEBACisgI2luY2x1ZGUgPGVycm5vLmg+Cisg I2luY2x1ZGUgPHN5cy9tbWFuLmg+CisgCisrI2RlZmluZSBTQ1JFRU5TSE9UX01BVENIX1RJTUVP VVQgKDUgKiBHX1RJTUVfU1BBTl9TRUNPTkQpCisrCisgc3RydWN0IHRhc2tfZGF0YSB7CisgICBQ aG9jVGVzdENsaWVudEZ1bmMgICBmdW5jOworICAgUGhvY1Rlc3RPdXRwdXRDb25maWcgb3V0cHV0 X2NvbmZpZzsKK0BAIC0xNTQsNiArMTU2LDM4IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgd2xfYnVm ZmVyX2xpc3RlbmVyIGJ1ZmZlcl9saXN0ZW5lciA9IHsKKyB9OworIAorIAorK3N0YXRpYyB2b2lk Cisrc3VyZmFjZV9mcmFtZV9oYW5kbGVfZG9uZSAodm9pZCAqZGF0YSwgc3RydWN0IHdsX2NhbGxi YWNrICpjYWxsYmFjaywgdWludDMyX3QgdGltZSkKKyt7CisrICBnYm9vbGVhbiAqZG9uZSA9IGRh dGE7CisrCisrICAqZG9uZSA9IFRSVUU7CisrICB3bF9jYWxsYmFja19kZXN0cm95IChjYWxsYmFj ayk7CisrfQorKworKworK3N0YXRpYyBjb25zdCBzdHJ1Y3Qgd2xfY2FsbGJhY2tfbGlzdGVuZXIg c3VyZmFjZV9mcmFtZV9saXN0ZW5lciA9IHsKKysgIC5kb25lID0gc3VyZmFjZV9mcmFtZV9oYW5k bGVfZG9uZSwKKyt9OworKworKworK3N0YXRpYyB2b2lkCisrc3VyZmFjZV9jb21taXRfYW5kX3dh aXRfZm9yX2ZyYW1lIChQaG9jVGVzdENsaWVudEdsb2JhbHMgKmdsb2JhbHMsIHN0cnVjdCB3bF9z dXJmYWNlICpzdXJmYWNlKQorK3sKKysgIHN0cnVjdCB3bF9jYWxsYmFjayAqY2FsbGJhY2s7Cisr ICBnYm9vbGVhbiBkb25lID0gRkFMU0U7CisrCisrICBjYWxsYmFjayA9IHdsX3N1cmZhY2VfZnJh bWUgKHN1cmZhY2UpOworKyAgZ19hc3NlcnRfbm9ubnVsbCAoY2FsbGJhY2spOworKyAgd2xfY2Fs bGJhY2tfYWRkX2xpc3RlbmVyIChjYWxsYmFjaywgJnN1cmZhY2VfZnJhbWVfbGlzdGVuZXIsICZk b25lKTsKKysgIHdsX3N1cmZhY2VfY29tbWl0IChzdXJmYWNlKTsKKysKKysgIHdoaWxlICghZG9u ZSAmJiB3bF9kaXNwbGF5X2Rpc3BhdGNoIChnbG9iYWxzLT5kaXNwbGF5KSAhPSAtMSkgeworKyAg fQorKyAgZ19hc3NlcnRfdHJ1ZSAoZG9uZSk7CisrfQorKworKworIHN0YXRpYyB2b2lkCisgb3V0 cHV0X2hhbmRsZV9nZW9tZXRyeSAodm9pZCAqZGF0YSwgc3RydWN0IHdsX291dHB1dCAqd2xfb3V0 cHV0LAorICAgICAgICAgICAgICAgICAgICAgICAgIGludDMyX3QgeCwgaW50MzJfdCB5LCBpbnQz Ml90IHBoeXNpY2FsX3dpZHRoLCBpbnQzMl90IHBoeXNpY2FsX2hlaWdodCwKK0BAIC03ODcsOCAr ODIxLDEwIEBAIHBob2NfdGVzdF9idWZmZXJfc2F2ZSAoUGhvY1Rlc3RCdWZmZXIgKmJ1ZmZlciwg Y29uc3QgY2hhciAqZmlsZW5hbWUpCisgCisgR19ERUZJTkVfQVVUT1BUUl9DTEVBTlVQX0ZVTkMg KGNhaXJvX3N1cmZhY2VfdCwgY2Fpcm9fc3VyZmFjZV9kZXN0cm95KQorIAorLWdib29sZWFuCist cGhvY190ZXN0X2J1ZmZlcl9tYXRjaGVzX3NjcmVlbnNob3QgKFBob2NUZXN0QnVmZmVyICpidWZm ZXIsIGNvbnN0IGNoYXIgKmZpbGVuYW1lKQorK3N0YXRpYyBnYm9vbGVhbgorK2J1ZmZlcl9tYXRj aGVzX3NjcmVlbnNob3QgKFBob2NUZXN0QnVmZmVyICpidWZmZXIsCisrICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29uc3QgY2hhciAgICAgKmZpbGVuYW1lLAorKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIGdib29sZWFuICAgICAgICByZXBvcnRfbWlzbWF0Y2hlcykKKyB7CisgICBjb25z dCBjaGFyICptc2c7CisgICBnX2F1dG9wdHIgKGNhaXJvX3N1cmZhY2VfdCkgc3VyZmFjZSA9IGNh aXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zyb21fcG5nIChmaWxlbmFtZSk7CitAQCAtODM1LDcg Kzg3MSw4IEBAIHBob2NfdGVzdF9idWZmZXJfbWF0Y2hlc19zY3JlZW5zaG90IChQaG9jVGVzdEJ1 ZmZlciAqYnVmZmVyLCBjb25zdCBjaGFyICpmaWxlbmFtCisgICBpZiAoYnVmZmVyLT5oZWlnaHQg IT0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfaGVpZ2h0IChzdXJmYWNlKSB8fAorICAgICAgIGJ1 ZmZlci0+d2lkdGggIT0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfd2lkdGggKHN1cmZhY2UpIHx8 CisgICAgICAgYnVmZmVyLT5zdHJpZGUgIT0gY2Fpcm9faW1hZ2Vfc3VyZmFjZV9nZXRfc3RyaWRl IChzdXJmYWNlKSkgeworLSAgICBnX3Rlc3RfbWVzc2FnZSAoIk1ldGFkYXRhIG1pc21hdGNoIGZv ciAlcyIsIGZpbGVuYW1lKTsKKysgICAgaWYgKHJlcG9ydF9taXNtYXRjaGVzKQorKyAgICAgIGdf dGVzdF9tZXNzYWdlICgiTWV0YWRhdGEgbWlzbWF0Y2ggZm9yICVzIiwgZmlsZW5hbWUpOworICAg ICByZXR1cm4gRkFMU0U7CisgICB9CisgCitAQCAtODQ2LDEzICs4ODMsNzcgQEAgcGhvY190ZXN0 X2J1ZmZlcl9tYXRjaGVzX3NjcmVlbnNob3QgKFBob2NUZXN0QnVmZmVyICpidWZmZXIsIGNvbnN0 IGNoYXIgKmZpbGVuYW0KKyAgIHJldCA9IFRSVUU7CisgICBmb3IgKGludCBpID0gMDsgaSA8IGJ1 ZmZlci0+aGVpZ2h0ICogYnVmZmVyLT5zdHJpZGUgLyA0OyBpKyspIHsKKyAgICAgaWYgKChsW2ld ICYgbWFzaykgIT0gKHJbaV0gJiBtYXNrKSkgeworLSAgICAgIGdfdGVzdF9tZXNzYWdlICgiTWlz bWF0Y2g6ICVkOiAweCV4IDB4JXggZm9yICVzIiwgaSwgbFtpXSwgcltpXSwgZmlsZW5hbWUpOwor KyAgICAgIGlmIChyZXBvcnRfbWlzbWF0Y2hlcykKKysgICAgICAgIGdfdGVzdF9tZXNzYWdlICgi TWlzbWF0Y2g6ICVkOiAweCV4IDB4JXggZm9yICVzIiwgaSwgbFtpXSwgcltpXSwgZmlsZW5hbWUp OworICAgICAgIHJldCA9IEZBTFNFOworICAgICB9CisgICB9CisgICByZXR1cm4gcmV0OworIH0K KyAKKysKKytnYm9vbGVhbgorK3Bob2NfdGVzdF9idWZmZXJfbWF0Y2hlc19zY3JlZW5zaG90IChQ aG9jVGVzdEJ1ZmZlciAqYnVmZmVyLCBjb25zdCBjaGFyICpmaWxlbmFtZSkKKyt7CisrICByZXR1 cm4gYnVmZmVyX21hdGNoZXNfc2NyZWVuc2hvdCAoYnVmZmVyLCBmaWxlbmFtZSwgVFJVRSk7Cisr fQorKworKworKy8qKgorKyAqIHBob2NfdGVzdF9jbGllbnRfYXNzZXJ0X3NjcmVlbnNob3Q6Cisr ICogQGdsb2JhbHM6IFRoZSBjbGllbnQgZ2xvYmFscworKyAqIEBzY3JlZW5zaG90OiBUaGUgZXhw ZWN0ZWQgc2NyZWVuc2hvdCBmaWxlbmFtZQorKyAqIEBmaWxlOiBUaGUgc291cmNlIGZpbGUgY29u dGFpbmluZyB0aGUgYXNzZXJ0aW9uCisrICogQGxpbmU6IFRoZSBzb3VyY2UgbGluZSBjb250YWlu aW5nIHRoZSBhc3NlcnRpb24KKysgKiBAZnVuYzogVGhlIGZ1bmN0aW9uIGNvbnRhaW5pbmcgdGhl IGFzc2VydGlvbgorKyAqCisrICogQ2FwdHVyZSBvdXRwdXQgZnJhbWVzIHVudGlsIG9uZSBtYXRj aGVzIEBzY3JlZW5zaG90IG9yIHRoZSB0aW1lb3V0IGV4cGlyZXMuCisrICogVGhpcyBhdm9pZHMg YXNzZXJ0aW5nIGFnYWluc3QgYSBmcmFtZSBxdWV1ZWQgYmVmb3JlIHRoZSBzdGF0ZSBjaGFuZ2Ug dW5kZXIKKysgKiB0ZXN0LiBPbiBmYWlsdXJlLCBzYXZlIHRoZSBmaW5hbCBmcmFtZSBhbmQgcmVw b3J0IHRoZSBhc3NlcnRpb24ncyBjYWxsIHNpdGUuCisrICovCisrdm9pZAorK3Bob2NfdGVzdF9j bGllbnRfYXNzZXJ0X3NjcmVlbnNob3QgKFBob2NUZXN0Q2xpZW50R2xvYmFscyAqZ2xvYmFscywK KysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICAgICAgICAg ICAgKnNjcmVlbnNob3QsCisrICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgY2hhciAgICAgICAgICAgICpmaWxlLAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGludCAgICAgICAgICAgICAgICAgICAgbGluZSwKKysgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICAgICAgICAgICAgKmZ1bmMpCisreworKyAgY29u c3QgZ2ludDY0IGRlYWRsaW5lID0gZ19nZXRfbW9ub3RvbmljX3RpbWUgKCkgKyBTQ1JFRU5TSE9U X01BVENIX1RJTUVPVVQ7CisrICBnX2F1dG9mcmVlIGNoYXIgKmZpbGVuYW1lID0gTlVMTDsKKysg IFBob2NUZXN0QnVmZmVyICpidWZmZXI7CisrICBndWludCBhdHRlbXB0cyA9IDA7CisrCisrICBm aWxlbmFtZSA9IGdfdGVzdF9idWlsZF9maWxlbmFtZSAoR19URVNUX0RJU1QsICJzY3JlZW5zaG90 cyIsIHNjcmVlbnNob3QsIE5VTEwpOworKyAgZ190ZXN0X21lc3NhZ2UgKCJTbmFwc2hvdHRpbmcg JXMiLCBzY3JlZW5zaG90KTsKKysKKysgIGRvIHsKKysgICAgYnVmZmVyID0gcGhvY190ZXN0X2Ns aWVudF9jYXB0dXJlX291dHB1dCAoZ2xvYmFscywgJmdsb2JhbHMtPm91dHB1dCk7CisrICAgIGF0 dGVtcHRzKys7CisrCisrICAgIGlmIChidWZmZXJfbWF0Y2hlc19zY3JlZW5zaG90IChidWZmZXIs IGZpbGVuYW1lLCBGQUxTRSkpIHsKKysgICAgICBpZiAoYXR0ZW1wdHMgPiAxKQorKyAgICAgICAg Z190ZXN0X21lc3NhZ2UgKCJTY3JlZW5zaG90IG1hdGNoZWQgYWZ0ZXIgJXUgYXR0ZW1wdHMiLCBh dHRlbXB0cyk7CisrICAgICAgcGhvY190ZXN0X2J1ZmZlcl9mcmVlIChidWZmZXIpOworKyAgICAg IHJldHVybjsKKysgICAgfQorKworKyAgICBpZiAoZ19nZXRfbW9ub3RvbmljX3RpbWUgKCkgPCBk ZWFkbGluZSkgeworKyAgICAgIHBob2NfdGVzdF9idWZmZXJfZnJlZSAoYnVmZmVyKTsKKysgICAg ICBjb250aW51ZTsKKysgICAgfQorKworKyAgICAvKiBMb2cgdGhlIGZpbmFsIG1pc21hdGNoIGFu ZCBwcmVzZXJ2ZSBpdCBmb3IgZGVidWdnaW5nLiAqLworKyAgICBwaG9jX3Rlc3RfYnVmZmVyX21h dGNoZXNfc2NyZWVuc2hvdCAoYnVmZmVyLCBmaWxlbmFtZSk7CisrCisrICAgIGdfYXV0b2ZyZWUg Y2hhciAqbmFtZSA9IF9waG9jX3Rlc3Rfc2NyZWVuc2hvdF9uYW1lIChsaW5lLCBmdW5jLCAwKTsK KysgICAgZ19hdXRvZnJlZSBjaGFyICptc2cgPQorKyAgICAgIGdfc3RyZHVwX3ByaW50ZiAoIk91 dHB1dCBjb250ZW50IGluICclcycgZG9lcyBub3QgbWF0Y2ggXCIlc1wiIiwgbmFtZSwgc2NyZWVu c2hvdCk7CisrCisrICAgIHBob2NfdGVzdF9idWZmZXJfc2F2ZSAoYnVmZmVyLCBuYW1lKTsKKysg ICAgZ19hc3NlcnRpb25fbWVzc2FnZSAoR19MT0dfRE9NQUlOLCBmaWxlLCBsaW5lLCBmdW5jLCBt c2cpOworKyAgfSB3aGlsZSAoVFJVRSk7CisrfQorKworIHZvaWQKKyBwaG9jX3Rlc3RfYnVmZmVy X2ZyZWUgKFBob2NUZXN0QnVmZmVyICpidWZmZXIpCisgeworQEAgLTk5Myw5ICsxMDk0LDcgQEAg cGhvY190ZXN0X3hkZ190b3BsZXZlbF9uZXdfd2l0aF9idWZmZXIgKFBob2NUZXN0Q2xpZW50R2xv YmFscyAqZ2xvYmFscywKKyAKKyAgIHdsX3N1cmZhY2VfYXR0YWNoICh4cy0+d2xfc3VyZmFjZSwg eHMtPmJ1ZmZlci53bF9idWZmZXIsIDAsIDApOworICAgd2xfc3VyZmFjZV9kYW1hZ2UgKHhzLT53 bF9zdXJmYWNlLCAwLCAwLCB4cy0+d2lkdGgsIHhzLT5oZWlnaHQpOworLSAgd2xfc3VyZmFjZV9j b21taXQgKHhzLT53bF9zdXJmYWNlKTsKKy0gIHdsX2Rpc3BsYXlfZGlzcGF0Y2ggKGdsb2JhbHMt PmRpc3BsYXkpOworLSAgd2xfZGlzcGxheV9yb3VuZHRyaXAgKGdsb2JhbHMtPmRpc3BsYXkpOwor KyAgc3VyZmFjZV9jb21taXRfYW5kX3dhaXRfZm9yX2ZyYW1lIChnbG9iYWxzLCB4cy0+d2xfc3Vy ZmFjZSk7CisgCisgICBpZiAodGl0bGUpIHsKKyAgICAgeHMtPmZvcmVpZ25fdG9wbGV2ZWwgPSBw aG9jX3Rlc3RfY2xpZW50X2dldF9mb3JlaWduX3RvcGxldmVsX2hhbmRsZSAoZ2xvYmFscywgdGl0 bGUpOworQEAgLTEwNTgsOSArMTE1Nyw3IEBAIHBob2NfdGVzdF94ZGdfdXBkYXRlX2J1ZmZlciAo UGhvY1Rlc3RDbGllbnRHbG9iYWxzICAgICAgKmdsb2JhbHMsCisgCisgICB3bF9zdXJmYWNlX2F0 dGFjaCAoeHMtPndsX3N1cmZhY2UsIGJ1ZmZlci53bF9idWZmZXIsIDAsIDApOworICAgd2xfc3Vy ZmFjZV9kYW1hZ2UgKHhzLT53bF9zdXJmYWNlLCAwLCAwLCB4cy0+d2lkdGgsIHhzLT5oZWlnaHQp OworLSAgd2xfc3VyZmFjZV9jb21taXQgKHhzLT53bF9zdXJmYWNlKTsKKy0gIHdsX2Rpc3BsYXlf ZGlzcGF0Y2ggKGdsb2JhbHMtPmRpc3BsYXkpOworLSAgd2xfZGlzcGxheV9yb3VuZHRyaXAgKGds b2JhbHMtPmRpc3BsYXkpOworKyAgc3VyZmFjZV9jb21taXRfYW5kX3dhaXRfZm9yX2ZyYW1lIChn bG9iYWxzLCB4cy0+d2xfc3VyZmFjZSk7CisgCisgICBwaG9jX3Rlc3RfYnVmZmVyX2ZyZWUgKCZ4 cy0+YnVmZmVyKTsKKyAgIHhzLT5idWZmZXIgPSBidWZmZXI7CitkaWZmIC0tZ2l0IGEvdGVzdHMv dGVzdGxpYi5oIGIvdGVzdHMvdGVzdGxpYi5oCitpbmRleCA0MzQzZmNkYWI5NWExZDE0ZmE5MjBi YjBmMTcwODE2Yjk3MDQ4YjE1Li5mOTA5MGQ0ZGI1NWYyMTQzN2E1ZTE2YTc4YWM5ZWE4ZDUwNTYz Nzg5IDEwMDY0NAorLS0tIGEvdGVzdHMvdGVzdGxpYi5oCisrKysgYi90ZXN0cy90ZXN0bGliLmgK K0BAIC0xNjUsNiArMTY1LDExIEBAIGdib29sZWFuIHBob2NfdGVzdF9idWZmZXJfZXF1YWwgKFBo b2NUZXN0QnVmZmVyICpidWYxLCBQaG9jVGVzdEJ1ZmZlciAqYnVmMik7CisgZ2Jvb2xlYW4gcGhv Y190ZXN0X2J1ZmZlcl9zYXZlIChQaG9jVGVzdEJ1ZmZlciAqYnVmZmVyLCBjb25zdCBjaGFyICpm aWxlbmFtZSk7CisgZ2Jvb2xlYW4gcGhvY190ZXN0X2J1ZmZlcl9tYXRjaGVzX3NjcmVlbnNob3Qg KFBob2NUZXN0QnVmZmVyICpidWZmZXIsIGNvbnN0IGNoYXIgKmZpbGVuYW1lKTsKKyB2b2lkICAg ICBwaG9jX3Rlc3RfYnVmZmVyX2ZyZWUgKFBob2NUZXN0QnVmZmVyICpidWZmZXIpOworK3ZvaWQg ICAgIHBob2NfdGVzdF9jbGllbnRfYXNzZXJ0X3NjcmVlbnNob3QgKFBob2NUZXN0Q2xpZW50R2xv YmFscyAqZ2xvYmFscywKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBjaGFyICAgICAgICAgICAgKnNjcmVlbnNob3QsCisrICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgY2hhciAgICAgICAgICAgICpmaWxl LAorKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCAgICAg ICAgICAgICAgICAgICAgbGluZSwKKysgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBjaGFyICAgICAgICAgICAgKmZ1bmMpOworIAorICNkZWZpbmUgX3Bo b2NfdGVzdF9zY3JlZW5zaG90X25hbWUobCwgZiwgbikgXAorICAgKGdfc3RyZHVwX3ByaW50ZiAo InBob2MtdGVzdC1zY3JlZW5zaG90LSVkLSVzXyVkLnBuZyIsIGwsIGYsIG4pKQorQEAgLTE3Miwy MyArMTc3LDEwIEBAIHZvaWQgICAgIHBob2NfdGVzdF9idWZmZXJfZnJlZSAoUGhvY1Rlc3RCdWZm ZXIgKmJ1ZmZlcik7CisgLyoKKyAgKiBwaG9jX2Fzc2VydF9zY3JlZW5zaG90OgorICAqIEBnOiBU aGUgY2xpZW50IGdsb2JhbCBvYmplY3QKKy0gKiBAZjogVGhlIHNjcmVlbnNob3QgdG8gY29tcGFy ZSB0aGUgY3VycmVudCBvdXRwdXQgdG8KKysgKiBAZjogVGhlIHNjcmVlbnNob3QgdG8gd2FpdCBm b3IgYW5kIGNvbXBhcmUgdGhlIG91dHB1dCB0bworICAqLworLSNkZWZpbmUgcGhvY19hc3NlcnRf c2NyZWVuc2hvdChnLCBmKSBHX1NUTVRfU1RBUlQgeyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgXAorLSAgICBQaG9jVGVzdENsaWVudEdsb2JhbHMgKl9fZyA9IChnKTsg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAor LSAgICBjaGFyICpfX2YgPSBnX3Rlc3RfYnVpbGRfZmlsZW5hbWUgKEdfVEVTVF9ESVNULCAic2Ny ZWVuc2hvdHMiLCBmLCBOVUxMKTsgICAgICAgICAgICAgICAgXAorLSAgICBQaG9jVGVzdEJ1ZmZl ciAqX19zID0gcGhvY190ZXN0X2NsaWVudF9jYXB0dXJlX291dHB1dCAoX19nLCAmX19nLT5vdXRw dXQpOyAgICAgICAgICAgICAgXAorLSAgICBnX3Rlc3RfbWVzc2FnZSAoIlNuYXBzaG90dGluZyAl cyIsIGYpOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg XAorLSAgICBpZiAocGhvY190ZXN0X2J1ZmZlcl9tYXRjaGVzX3NjcmVlbnNob3QgKF9fcywgX19m KSk7IGVsc2UgeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorLSAgICAgIGdfYXV0b2Zy ZWUgY2hhciAqX19uYW1lID0gX3Bob2NfdGVzdF9zY3JlZW5zaG90X25hbWUgKF9fTElORV9fLCBH X1NUUkZVTkMsIDApOyAgICAgICAgXAorLSAgICAgIGdfYXV0b2ZyZWUgY2hhciAqX19tc2cgPSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgXAorLSAgICAgICAgZ19zdHJkdXBfcHJpbnRmICgiT3V0cHV0IGNvbnRlbnQgaW4gJyVzJyBk b2VzIG5vdCBtYXRjaCAiICNmLCBfX25hbWUpOyAgICAgICAgICAgICAgXAorLSAgICAgIHBob2Nf dGVzdF9idWZmZXJfc2F2ZSAoJl9fZy0+b3V0cHV0LnNjcmVlbnNob3QuYnVmZmVyLCBfX25hbWUp OyAgICAgICAgICAgICAgICAgICAgICAgXAorLSAgICAgIGdfYXNzZXJ0aW9uX21lc3NhZ2UgKEdf TE9HX0RPTUFJTiwgX19GSUxFX18sIF9fTElORV9fLCBHX1NUUkZVTkMsIF9fbXNnKTsgICAgICAg ICAgICAgXAorLSAgICB9ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorLSAgICBwaG9j X3Rlc3RfYnVmZmVyX2ZyZWUgKF9fcyk7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAorLSAgICBnX2ZyZWUgKF9fZik7ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgXAorLX0gR19TVE1UX0VORAorKyNkZWZpbmUgcGhvY19hc3NlcnRfc2NyZWVuc2hv dChnLCBmKSBcCisrICBwaG9jX3Rlc3RfY2xpZW50X2Fzc2VydF9zY3JlZW5zaG90ICgoZyksIChm KSwgX19GSUxFX18sIF9fTElORV9fLCBHX1NUUkZVTkMpCisgCisgLyoqCisgICogcGhvY190ZXN0 X2Fzc2VydF9idWZmZXJfZXF1YWw6CgpkaWZmIC0tZ2l0IGEvcGhvYy5zcGVjIGIvcGhvYy5zcGVj CmluZGV4IDQzODEwMzAuLjg3NDdkYmMgMTAwNjQ0Ci0tLSBhL3Bob2Muc3BlYworKysgYi9waG9j LnNwZWMKQEAgLTEwLDYgKzEwLDkgQEAgVVJMOiAgICAgIGh0dHBzOi8vZ2l0bGFiLmdub21lLm9y Zy9Xb3JsZC9QaG9zaC9waG9jCiBTb3VyY2UwOiAgaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL1dv cmxkL1Bob3NoL3Bob2MvLS9hcmNoaXZlL3Yle3ZlcnNpb25fbm9fdGlsZGUgX30vJXtuYW1lfS12 JXt2ZXJzaW9uX25vX3RpbGRlIF99LnRhci5negogU291cmNlMTogIGh0dHBzOi8vZ2l0bGFiLmdu b21lLm9yZy9HTk9NRS9ndmRiLy0vYXJjaGl2ZS8le2d2ZGJfY29tbWl0fS9ndmRiLSV7Z3ZkYl9j b21taXR9LnRhci5negogCisjIGh0dHBzOi8vZ2l0bGFiLmdub21lLm9yZy9Xb3JsZC9QaG9zaC9w aG9jLy0vbWVyZ2VfcmVxdWVzdHMvODA1CitQYXRjaDogICAgODA1LmRpZmYKKwogQnVpbGRSZXF1 aXJlczogIGdjYwogQnVpbGRSZXF1aXJlczogIG1lc29uCiBCdWlsZFJlcXVpcmVzOiAgY21ha2UK