216888 2020-09-23 11:05:29 -0700 [webkitscmpy] Check if a git checkout is linked to an SVN checkout 2020-09-30 16:51:15 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215862 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu webkit-bug-importer oldest_to_newest 1691179 0 jbedard 2020-09-23 11:05:29 -0700 It's possible for a git checkout to be a git-svn checkout, we should be able to check a local repository for this information. 1691180 1 webkit-bug-importer 2020-09-23 11:06:08 -0700 <rdar://problem/69446322> 1692659 2 409915 jbedard 2020-09-28 13:38:24 -0700 Created attachment 409915 Patch 1693559 3 409915 jbedard 2020-09-30 16:05:24 -0700 Comment on attachment 409915 Patch Forgot to increment the library version 1693573 4 410168 jbedard 2020-09-30 16:23:58 -0700 Created attachment 410168 Patch for landing 1693580 5 ews-feeder 2020-09-30 16:51:14 -0700 Committed r267810: <https://trac.webkit.org/changeset/267810> All reviewed patches have been landed. Closing bug and clearing flags on attachment 410168. 409915 2020-09-28 13:38:24 -0700 2020-09-30 16:23:56 -0700 Patch bug-216888-20200928133824.patch text/plain 9211 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NzcxNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDIwLTA5LTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIENoZWNrIGlmIGEgZ2l0IGNoZWNrb3V0IGlzIGxp bmtlZCB0byBhbiBTVk4gY2hlY2tvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNjg4OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjk0NDYzMjI+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHk6CisgICAg ICAgIChHaXQuaW5mbyk6IFJ1biBgZ2l0IHN2biBpbmZvYCBpZiBpbiBhIEdpdC1TVk4gY2hlY2tv dXQuCisgICAgICAgIChHaXQuaXNfc3ZuKTogQ2hlY2sgaWYgaW4gYSBHaXQtU1ZOIGNoZWNrb3V0 LgorICAgICAgICAoR2l0LmlzX2dpdCk6IFJldHVybiBUcnVlLgorICAgICAgICAqIFNjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weToKKyAgICAgICAg KFNjbS5pc19zdm4pOiBSZXR1cm4gRmFsc2UuCisgICAgICAgIChTY20uaXNfZ2l0KTogRGl0dG8u CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvc3ZuLnB5OgorICAgICAgICAoU3ZuLmlzX3N2bik6IFJldHVybiBUcnVlLgorICAgICAgICAq IFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dp dC5weToKKyAgICAgICAgKEdpdC5fX2luaXRfXyk6IEFkZCBgZ2l0IHN2bmAgY29tbWFuZHMuCisg ICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9n aXRfdW5pdHRlc3QucHk6CisgICAgICAgIChUZXN0R2l0LnRlc3Rfc2NtX3R5cGUpOgorICAgICAg ICAoVGVzdEdpdC50ZXN0X2luZm8pOgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3Qvc3ZuX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdFN2 bi50ZXN0X3NjbV90eXBlKToKKwogMjAyMC0wOS0yOCAgTWF0dCBMZXdpcyAgPGpsZXdpczNAYXBw bGUuY29tPgogCiAgICAgICAgIEZpeCBCdWlsZCB0cmlnZ2VycyBmb3IgaU9TLCB3YXRjaE9TLCBh bmQgdHZPUwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvbG9jYWwvZ2l0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjY3NzAyKQor KysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwv Z2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMSw3ICsyMSw3IEBACiAjIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAK IAotZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHJ1biwgZGVjb3JhdG9ycworZnJvbSB3ZWJraXRj b3JlcHkgaW1wb3J0IHJ1biwgZGVjb3JhdG9ycywgVGltZW91dEV4cGlyZWQKIGZyb20gd2Via2l0 c2NtcHkubG9jYWwgaW1wb3J0IFNjbQogCiAKQEAgLTM3LDYgKzM3LDM5IEBAIGNsYXNzIEdpdChT Y20pOgogICAgICAgICBpZiBub3Qgc2VsZi5yb290X3BhdGg6CiAgICAgICAgICAgICByYWlzZSBP U0Vycm9yKCdQcm92aWRlZCBwYXRoIHt9IGlzIG5vdCBhIGdpdCByZXBvc2l0b3J5Jy5mb3JtYXQo cGF0aCkpCiAKKyAgICBAZGVjb3JhdG9ycy5NZW1vaXplKGNhY2hlZD1GYWxzZSkKKyAgICBkZWYg aW5mbyhzZWxmKToKKyAgICAgICAgaWYgbm90IHNlbGYuaXNfc3ZuOgorICAgICAgICAgICAgcmFp c2Ugc2VsZi5FeGNlcHRpb24oJ0Nhbm5vdCBydW4gU1ZOIGluZm8gb24gYSBnaXQgY2hlY2tvdXQg d2hpY2ggaXMgbm90IGdpdC1zdm4nKQorCisgICAgICAgIGluZm9fcmVzdWx0ID0gcnVuKFtzZWxm LmV4ZWN1dGFibGUsICdzdm4nLCAnaW5mbyddLCBjd2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1 dD1UcnVlLCBlbmNvZGluZz0ndXRmLTgnKQorICAgICAgICBpZiBpbmZvX3Jlc3VsdC5yZXR1cm5j b2RlOgorICAgICAgICAgICAgcmV0dXJuIHt9CisKKyAgICAgICAgcmVzdWx0ID0ge30KKyAgICAg ICAgZm9yIGxpbmUgaW4gaW5mb19yZXN1bHQuc3Rkb3V0LnNwbGl0bGluZXMoKToKKyAgICAgICAg ICAgIHNwbGl0ID0gbGluZS5zcGxpdCgnOiAnKQorICAgICAgICAgICAgcmVzdWx0W3NwbGl0WzBd XSA9ICc6ICcuam9pbihzcGxpdFsxOl0pCisgICAgICAgIHJldHVybiByZXN1bHQKKworICAgIEBw cm9wZXJ0eQorICAgIEBkZWNvcmF0b3JzLk1lbW9pemUoKQorICAgIGRlZiBpc19zdm4oc2VsZik6 CisgICAgICAgIHRyeToKKyAgICAgICAgICAgIHJldHVybiBydW4oCisgICAgICAgICAgICAgICAg W3NlbGYuZXhlY3V0YWJsZSwgJ3N2bicsICdmaW5kLXJldicsICdyMSddLAorICAgICAgICAgICAg ICAgIGN3ZD1zZWxmLnJvb3RfcGF0aCwKKyAgICAgICAgICAgICAgICBjYXB0dXJlX291dHB1dD1U cnVlLAorICAgICAgICAgICAgICAgIGVuY29kaW5nPSd1dGYtOCcsCisgICAgICAgICAgICAgICAg dGltZW91dD0xLAorICAgICAgICAgICAgKS5yZXR1cm5jb2RlID09IDAKKyAgICAgICAgZXhjZXB0 IFRpbWVvdXRFeHBpcmVkOgorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKKyAgICBAcHJvcGVy dHkKKyAgICBkZWYgaXNfZ2l0KHNlbGYpOgorICAgICAgICByZXR1cm4gVHJ1ZQorCiAgICAgQHBy b3BlcnR5CiAgICAgQGRlY29yYXRvcnMuTWVtb2l6ZSgpCiAgICAgZGVmIHJvb3RfcGF0aChzZWxm KToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2xvY2FsL3NjbS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS9sb2NhbC9zY20ucHkJKHJldmlzaW9uIDI2NzcwMikKKysrIFRv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5w eQkod29ya2luZyBjb3B5KQpAQCAtNDMsNiArNDMsMTQgQEAgY2xhc3MgU2NtKG9iamVjdCk6CiAg ICAgICAgIHNlbGYucGF0aCA9IHBhdGgKIAogICAgIEBwcm9wZXJ0eQorICAgIGRlZiBpc19zdm4o c2VsZik6CisgICAgICAgIHJldHVybiBGYWxzZQorCisgICAgQHByb3BlcnR5CisgICAgZGVmIGlz X2dpdChzZWxmKToKKyAgICAgICAgcmV0dXJuIEZhbHNlCisKKyAgICBAcHJvcGVydHkKICAgICBk ZWYgcm9vdF9wYXRoKHNlbGYpOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCkK IApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv bG9jYWwvc3ZuLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weQkocmV2aXNpb24gMjY3NzAyKQorKysgVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC01MCw2ICs1MCwxMCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAg ICAgcmV0dXJuIHJlc3VsdAogCiAgICAgQHByb3BlcnR5CisgICAgZGVmIGlzX3N2bihzZWxmKToK KyAgICAgICAgcmV0dXJuIFRydWUKKworICAgIEBwcm9wZXJ0eQogICAgIGRlZiByb290X3BhdGgo c2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLmluZm8oY2FjaGVkPVRydWUpLmdldCgnV29ya2lu ZyBDb3B5IFJvb3QgUGF0aCcpCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9n aXQucHkJKHJldmlzaW9uIDI2NzcwMikKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtp dHNjbXB5L3dlYmtpdHNjbXB5L21vY2tzL2xvY2FsL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAt MzIsNiArMzIsNyBAQCBjbGFzcyBHaXQobW9ja3MuU3VicHJvY2Vzcyk6CiAgICAgICAgIHNlbGYs IHBhdGg9Jy8uaW52YWxpZC1naXQnLAogICAgICAgICBicmFuY2g9Tm9uZSwgcmVtb3RlPU5vbmUs IGJyYW5jaGVzPU5vbmUsIHRhZ3M9Tm9uZSwKICAgICAgICAgZGV0YWNoZWQ9Tm9uZSwgZGVmYXVs dF9icmFuY2g9J21haW4nLAorICAgICAgICBnaXRfc3ZuPUZhbHNlLAogICAgICk6CiAgICAgICAg IHNlbGYucGF0aCA9IHBhdGgKICAgICAgICAgc2VsZi5icmFuY2ggPSBicmFuY2ggb3IgZGVmYXVs dF9icmFuY2gKQEAgLTQxLDYgKzQyLDM5IEBAIGNsYXNzIEdpdChtb2Nrcy5TdWJwcm9jZXNzKToK ICAgICAgICAgc2VsZi5icmFuY2hlcyA9IGJyYW5jaGVzIG9yIFtdCiAgICAgICAgIHNlbGYudGFn cyA9IHRhZ3Mgb3IgW10KIAorICAgICAgICBpZiBnaXRfc3ZuOgorICAgICAgICAgICAgZ2l0X3N2 bl9yb3V0ZXMgPSBbCisgICAgICAgICAgICAgICAgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKKyAg ICAgICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUsICdzdm4nLCAnZmluZC1yZXYn LCAncjEnLAorICAgICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAorICAgICAgICAgICAg ICAgICAgICBjb21wbGV0aW9uPW1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKAorICAgICAgICAgICAg ICAgICAgICAgICAgcmV0dXJuY29kZT0wLAorICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0 PSdkNDIzZWE4MmVmYWFlZDBkY2JhZmIwOWFhYTRhNzBmYWZkZWEwNzI5XG4nLAorICAgICAgICAg ICAgICAgICAgICApLAorICAgICAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUo CisgICAgICAgICAgICAgICAgICAgIGxvY2FsLkdpdC5leGVjdXRhYmxlLCAnc3ZuJywgJ2luZm8n LAorICAgICAgICAgICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAorICAgICAgICAgICAgICAgICAg ICBjb21wbGV0aW9uPW1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKAorICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuY29kZT0wLAorICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICdQYXRoOiAuXG4nCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJ1VSTDoge3JlbW90ZX0ve2JyYW5jaH1cbicKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAnUmVwb3NpdG9yeSBSb290OiB7cmVtb3RlfVxuJy5mb3JtYXQoCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHBhdGg9c2VsZi5wYXRoLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZW1vdGU9c2VsZi5yZW1vdGUsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGJyYW5jaD1zZWxmLmJyYW5jaCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICApLAorICAgICAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAgICksCisgICAgICAg ICAgICBdCisKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIGdpdF9zdm5fcm91dGVzID0gW21v Y2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFi bGUsICdzdm4nLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCisgICAgICAgICAgICAg ICAgY29tcGxldGlvbj1tb2Nrcy5Qcm9jZXNzQ29tcGxldGlvbihyZXR1cm5jb2RlPTEsIGVsYXBz ZWQ9MiksCisgICAgICAgICAgICApXQorCiAgICAgICAgIHN1cGVyKEdpdCwgc2VsZikuX19pbml0 X18oCiAgICAgICAgICAgICBtb2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAg IGxvY2FsLkdpdC5leGVjdXRhYmxlLCAnc3RhdHVzJywKQEAgLTExNiw1ICsxNTAsNSBAQCBub3Ro aW5nIHRvIGNvbW1pdCwgd29ya2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgICAgIHJl dHVybmNvZGU9MTI4LAogICAgICAgICAgICAgICAgICAgICBzdGRlcnI9J2ZhdGFsOiBub3QgYSBn aXQgcmVwb3NpdG9yeSAob3IgYW55IHBhcmVudCB1cCB0byBtb3VudCBwb2ludClcblN0b3BwaW5n IGF0IGZpbGVzeXN0ZW0gYm91bmRhcnkgKEdJVF9ESVNDT1ZFUllfQUNST1NTX0ZJTEVTWVNURU0g bm90IHNldCkuXG4nLAogICAgICAgICAgICAgICAgICksCi0gICAgICAgICAgICApLAorICAgICAg ICAgICAgKSwgKmdpdF9zdm5fcm91dGVzCiAgICAgICAgICkKSW5kZXg6IFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNjc3MDIpCisrKyBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5w eQkod29ya2luZyBjb3B5KQpAQCAtMjMsNiArMjMsOCBAQAogaW1wb3J0IG9zCiBpbXBvcnQgdW5p dHRlc3QKIAorZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IExvZ2dlckNhcHR1cmUKK2Zyb20gd2Vi a2l0Y29yZXB5Lm1vY2tzIGltcG9ydCBUaW1lIGFzIE1vY2tUaW1lCiBmcm9tIHdlYmtpdHNjbXB5 IGltcG9ydCBsb2NhbCwgbW9ja3MKIAogCkBAIC02OSwzICs3MSwyNiBAQCBjbGFzcyBUZXN0R2l0 KHVuaXR0ZXN0LlRlc3RDYXNlKToKICAgICBkZWYgdGVzdF9kZWZhdWx0X2JyYW5jaChzZWxmKToK ICAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoKToKICAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0KHNlbGYucGF0aCkuZGVmYXVsdF9icmFuY2gsICdtYWlu JykKKworICAgIGRlZiB0ZXN0X3NjbV90eXBlKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxv Y2FsLkdpdChzZWxmLnBhdGgpLCBNb2NrVGltZSwgTG9nZ2VyQ2FwdHVyZSgpOgorICAgICAgICAg ICAgc2VsZi5hc3NlcnRUcnVlKGxvY2FsLkdpdChzZWxmLnBhdGgpLmlzX2dpdCkKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RmFsc2UobG9jYWwuR2l0KHNlbGYucGF0aCkuaXNfc3ZuKQorCisgICAg ICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKSwgTW9ja1Rp bWUsIExvZ2dlckNhcHR1cmUoKToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShsb2NhbC5H aXQoc2VsZi5wYXRoKS5pc19naXQpCisgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUobG9jYWwu R2l0KHNlbGYucGF0aCkuaXNfc3ZuKQorCisgICAgZGVmIHRlc3RfaW5mbyhzZWxmKToKKyAgICAg ICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRoKSwgTW9ja1RpbWUsIExvZ2dlckNhcHR1 cmUoKToKKyAgICAgICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlzZXMobG9jYWwuR2l0LkV4Y2Vw dGlvbik6CisgICAgICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChkaWN0KCksIGxvY2FsLkdp dChzZWxmLnBhdGgpLmluZm8oKSkKKworICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxm LnBhdGgsIGdpdF9zdm49VHJ1ZSksIE1vY2tUaW1lLCBMb2dnZXJDYXB0dXJlKCk6CisgICAgICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICAgICAgJ1BhdGgnOiAnLicsCisgICAgICAgICAgICAgICAgICAgICdSZXBvc2l0b3J5IFJvb3Qn OiAnZ2l0QHdlYmtpdC5vcmc6L21vY2svcmVwb3NpdG9yeScsCisgICAgICAgICAgICAgICAgICAg ICdVUkwnOiAnZ2l0QHdlYmtpdC5vcmc6L21vY2svcmVwb3NpdG9yeS9tYWluJywKKyAgICAgICAg ICAgICAgICB9LCBsb2NhbC5HaXQoc2VsZi5wYXRoKS5pbmZvKCksCisgICAgICAgICAgICApCklu ZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L3N2bl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weQkocmV2aXNpb24gMjY3 NzAyKQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv dGVzdC9zdm5fdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTY2LDMgKzY2LDggQEAgY2xh c3MgVGVzdFN2bih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfZGVmYXVsdF9icmFu Y2goc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6CiAgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvY2FsLlN2bihzZWxmLnBhdGgpLmRlZmF1bHRfYnJh bmNoLCAndHJ1bmsnKQorCisgICAgZGVmIHRlc3Rfc2NtX3R5cGUoc2VsZik6CisgICAgICAgIHdp dGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6CisgICAgICAgICAgICBzZWxmLmFzc2VydFRy dWUobG9jYWwuU3ZuKHNlbGYucGF0aCkuaXNfc3ZuKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRG YWxzZShsb2NhbC5Tdm4oc2VsZi5wYXRoKS5pc19naXQpCg== 410168 2020-09-30 16:23:58 -0700 2020-09-30 16:51:15 -0700 Patch for landing bug-216888-20200930162357.patch text/plain 9877 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2NzgwOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI5IEBACisyMDIwLTA5LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIENoZWNrIGlmIGEgZ2l0IGNoZWNrb3V0IGlzIGxp bmtlZCB0byBhbiBTVk4gY2hlY2tvdXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNjg4OAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjk0NDYzMjI+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV3ZWkgWmh1LgorCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IEluY3JlbWVudCBs aWJyYXJ5IHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0LmluZm8pOiBSdW4gYGdpdCBz dm4gaW5mb2AgaWYgaW4gYSBHaXQtU1ZOIGNoZWNrb3V0LgorICAgICAgICAoR2l0LmlzX3N2bik6 IENoZWNrIGlmIGluIGEgR2l0LVNWTiBjaGVja291dC4KKyAgICAgICAgKEdpdC5pc19naXQpOiBS ZXR1cm4gVHJ1ZS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9zY20ucHk6CisgICAgICAgIChTY20uaXNfc3ZuKTogUmV0dXJuIEZhbHNl LgorICAgICAgICAoU2NtLmlzX2dpdCk6IERpdHRvLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weToKKyAgICAgICAgKFN2bi5p c19zdm4pOiBSZXR1cm4gVHJ1ZS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHk6CisgICAgICAgIChHaXQuX19pbml0 X18pOiBBZGQgYGdpdCBzdm5gIGNvbW1hbmRzLgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAo VGVzdEdpdC50ZXN0X3NjbV90eXBlKToKKyAgICAgICAgKFRlc3RHaXQudGVzdF9pbmZvKToKKyAg ICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2 bl91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RTdm4udGVzdF9zY21fdHlwZSk6CisKIDIwMjAt MDktMzAgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFt3 ZWJraXRweV0gVXNlIHdlYmtpdGNvcmVweSdzIGF1dG8gaW5zdGFsbGVyIGZvciBodG1sNWxpYgpJ bmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19p bml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI2NzgwOCkKKysrIFRvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoKICAgICAgICAg IlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3ZWJraXRjb3Jl cHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAgKQogCi12ZXJz aW9uID0gVmVyc2lvbigwLCAwLCA0KQordmVyc2lvbiA9IFZlcnNpb24oMCwgMCwgNSkKIAogZnJv bSB3ZWJraXRzY21weS5jb250cmlidXRvciBpbXBvcnQgQ29udHJpYnV0b3IKIApJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtp dHNjbXB5L2xvY2FsL2dpdC5weQkocmV2aXNpb24gMjY3ODA4KQorKysgVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5CSh3b3JraW5nIGNv cHkpCkBAIC0yMSw3ICsyMSw3IEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNF RCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIAotZnJvbSB3ZWJraXRjb3Jl cHkgaW1wb3J0IHJ1biwgZGVjb3JhdG9ycworZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHJ1biwg ZGVjb3JhdG9ycywgVGltZW91dEV4cGlyZWQKIGZyb20gd2Via2l0c2NtcHkubG9jYWwgaW1wb3J0 IFNjbQogCiAKQEAgLTM3LDYgKzM3LDM5IEBAIGNsYXNzIEdpdChTY20pOgogICAgICAgICBpZiBu b3Qgc2VsZi5yb290X3BhdGg6CiAgICAgICAgICAgICByYWlzZSBPU0Vycm9yKCdQcm92aWRlZCBw YXRoIHt9IGlzIG5vdCBhIGdpdCByZXBvc2l0b3J5Jy5mb3JtYXQocGF0aCkpCiAKKyAgICBAZGVj b3JhdG9ycy5NZW1vaXplKGNhY2hlZD1GYWxzZSkKKyAgICBkZWYgaW5mbyhzZWxmKToKKyAgICAg ICAgaWYgbm90IHNlbGYuaXNfc3ZuOgorICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24o J0Nhbm5vdCBydW4gU1ZOIGluZm8gb24gYSBnaXQgY2hlY2tvdXQgd2hpY2ggaXMgbm90IGdpdC1z dm4nKQorCisgICAgICAgIGluZm9fcmVzdWx0ID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUsICdzdm4n LCAnaW5mbyddLCBjd2Q9c2VsZi5wYXRoLCBjYXB0dXJlX291dHB1dD1UcnVlLCBlbmNvZGluZz0n dXRmLTgnKQorICAgICAgICBpZiBpbmZvX3Jlc3VsdC5yZXR1cm5jb2RlOgorICAgICAgICAgICAg cmV0dXJuIHt9CisKKyAgICAgICAgcmVzdWx0ID0ge30KKyAgICAgICAgZm9yIGxpbmUgaW4gaW5m b19yZXN1bHQuc3Rkb3V0LnNwbGl0bGluZXMoKToKKyAgICAgICAgICAgIHNwbGl0ID0gbGluZS5z cGxpdCgnOiAnKQorICAgICAgICAgICAgcmVzdWx0W3NwbGl0WzBdXSA9ICc6ICcuam9pbihzcGxp dFsxOl0pCisgICAgICAgIHJldHVybiByZXN1bHQKKworICAgIEBwcm9wZXJ0eQorICAgIEBkZWNv cmF0b3JzLk1lbW9pemUoKQorICAgIGRlZiBpc19zdm4oc2VsZik6CisgICAgICAgIHRyeToKKyAg ICAgICAgICAgIHJldHVybiBydW4oCisgICAgICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSwg J3N2bicsICdmaW5kLXJldicsICdyMSddLAorICAgICAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3Rf cGF0aCwKKyAgICAgICAgICAgICAgICBjYXB0dXJlX291dHB1dD1UcnVlLAorICAgICAgICAgICAg ICAgIGVuY29kaW5nPSd1dGYtOCcsCisgICAgICAgICAgICAgICAgdGltZW91dD0xLAorICAgICAg ICAgICAgKS5yZXR1cm5jb2RlID09IDAKKyAgICAgICAgZXhjZXB0IFRpbWVvdXRFeHBpcmVkOgor ICAgICAgICAgICAgcmV0dXJuIEZhbHNlCisKKyAgICBAcHJvcGVydHkKKyAgICBkZWYgaXNfZ2l0 KHNlbGYpOgorICAgICAgICByZXR1cm4gVHJ1ZQorCiAgICAgQHByb3BlcnR5CiAgICAgQGRlY29y YXRvcnMuTWVtb2l6ZSgpCiAgICAgZGVmIHJvb3RfcGF0aChzZWxmKToKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9sb2NhbC9zY20ucHkJKHJldmlzaW9uIDI2NzgwOCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL3NjbS5weQkod29ya2luZyBjb3B5KQpA QCAtNDMsNiArNDMsMTQgQEAgY2xhc3MgU2NtKG9iamVjdCk6CiAgICAgICAgIHNlbGYucGF0aCA9 IHBhdGgKIAogICAgIEBwcm9wZXJ0eQorICAgIGRlZiBpc19zdm4oc2VsZik6CisgICAgICAgIHJl dHVybiBGYWxzZQorCisgICAgQHByb3BlcnR5CisgICAgZGVmIGlzX2dpdChzZWxmKToKKyAgICAg ICAgcmV0dXJuIEZhbHNlCisKKyAgICBAcHJvcGVydHkKICAgICBkZWYgcm9vdF9wYXRoKHNlbGYp OgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yKCkKIApJbmRleDogVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2xvY2FsL3N2bi5weQkocmV2aXNpb24gMjY3ODA4KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5CSh3b3JraW5nIGNvcHkpCkBA IC01MCw2ICs1MCwxMCBAQCBjbGFzcyBTdm4oU2NtKToKICAgICAgICAgcmV0dXJuIHJlc3VsdAog CiAgICAgQHByb3BlcnR5CisgICAgZGVmIGlzX3N2bihzZWxmKToKKyAgICAgICAgcmV0dXJuIFRy dWUKKworICAgIEBwcm9wZXJ0eQogICAgIGRlZiByb290X3BhdGgoc2VsZik6CiAgICAgICAgIHJl dHVybiBzZWxmLmluZm8oY2FjaGVkPVRydWUpLmdldCgnV29ya2luZyBDb3B5IFJvb3QgUGF0aCcp CiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L21vY2tzL2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS9tb2Nrcy9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI2 NzgwOCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L21vY2tzL2xvY2FsL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzIsNiArMzIsNyBAQCBjbGFz cyBHaXQobW9ja3MuU3VicHJvY2Vzcyk6CiAgICAgICAgIHNlbGYsIHBhdGg9Jy8uaW52YWxpZC1n aXQnLAogICAgICAgICBicmFuY2g9Tm9uZSwgcmVtb3RlPU5vbmUsIGJyYW5jaGVzPU5vbmUsIHRh Z3M9Tm9uZSwKICAgICAgICAgZGV0YWNoZWQ9Tm9uZSwgZGVmYXVsdF9icmFuY2g9J21haW4nLAor ICAgICAgICBnaXRfc3ZuPUZhbHNlLAogICAgICk6CiAgICAgICAgIHNlbGYucGF0aCA9IHBhdGgK ICAgICAgICAgc2VsZi5icmFuY2ggPSBicmFuY2ggb3IgZGVmYXVsdF9icmFuY2gKQEAgLTQxLDYg KzQyLDM5IEBAIGNsYXNzIEdpdChtb2Nrcy5TdWJwcm9jZXNzKToKICAgICAgICAgc2VsZi5icmFu Y2hlcyA9IGJyYW5jaGVzIG9yIFtdCiAgICAgICAgIHNlbGYudGFncyA9IHRhZ3Mgb3IgW10KIAor ICAgICAgICBpZiBnaXRfc3ZuOgorICAgICAgICAgICAgZ2l0X3N2bl9yb3V0ZXMgPSBbCisgICAg ICAgICAgICAgICAgbW9ja3MuU3VicHJvY2Vzcy5Sb3V0ZSgKKyAgICAgICAgICAgICAgICAgICAg bG9jYWwuR2l0LmV4ZWN1dGFibGUsICdzdm4nLCAnZmluZC1yZXYnLCAncjEnLAorICAgICAgICAg ICAgICAgICAgICBjd2Q9c2VsZi5wYXRoLAorICAgICAgICAgICAgICAgICAgICBjb21wbGV0aW9u PW1vY2tzLlByb2Nlc3NDb21wbGV0aW9uKAorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJu Y29kZT0wLAorICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PSdkNDIzZWE4MmVmYWFlZDBk Y2JhZmIwOWFhYTRhNzBmYWZkZWEwNzI5XG4nLAorICAgICAgICAgICAgICAgICAgICApLAorICAg ICAgICAgICAgICAgICksIG1vY2tzLlN1YnByb2Nlc3MuUm91dGUoCisgICAgICAgICAgICAgICAg ICAgIGxvY2FsLkdpdC5leGVjdXRhYmxlLCAnc3ZuJywgJ2luZm8nLAorICAgICAgICAgICAgICAg ICAgICBjd2Q9c2VsZi5wYXRoLAorICAgICAgICAgICAgICAgICAgICBjb21wbGV0aW9uPW1vY2tz LlByb2Nlc3NDb21wbGV0aW9uKAorICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuY29kZT0w LAorICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICdQYXRoOiAuXG4nCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ1VSTDoge3Jl bW90ZX0ve2JyYW5jaH1cbicKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnUmVwb3NpdG9y eSBSb290OiB7cmVtb3RlfVxuJy5mb3JtYXQoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHBhdGg9c2VsZi5wYXRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZW1v dGU9c2VsZi5yZW1vdGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyYW5jaD1z ZWxmLmJyYW5jaCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAg ICAgICAgICApLAorICAgICAgICAgICAgICAgICksCisgICAgICAgICAgICBdCisKKyAgICAgICAg ZWxzZToKKyAgICAgICAgICAgIGdpdF9zdm5fcm91dGVzID0gW21vY2tzLlN1YnByb2Nlc3MuUm91 dGUoCisgICAgICAgICAgICAgICAgbG9jYWwuR2l0LmV4ZWN1dGFibGUsICdzdm4nLAorICAgICAg ICAgICAgICAgIGN3ZD1zZWxmLnBhdGgsCisgICAgICAgICAgICAgICAgY29tcGxldGlvbj1tb2Nr cy5Qcm9jZXNzQ29tcGxldGlvbihyZXR1cm5jb2RlPTEsIGVsYXBzZWQ9MiksCisgICAgICAgICAg ICApXQorCiAgICAgICAgIHN1cGVyKEdpdCwgc2VsZikuX19pbml0X18oCiAgICAgICAgICAgICBt b2Nrcy5TdWJwcm9jZXNzLlJvdXRlKAogICAgICAgICAgICAgICAgIGxvY2FsLkdpdC5leGVjdXRh YmxlLCAnc3RhdHVzJywKQEAgLTExNiw1ICsxNTAsNSBAQCBub3RoaW5nIHRvIGNvbW1pdCwgd29y a2luZyB0cmVlIGNsZWFuCiAgICAgICAgICAgICAgICAgICAgIHJldHVybmNvZGU9MTI4LAogICAg ICAgICAgICAgICAgICAgICBzdGRlcnI9J2ZhdGFsOiBub3QgYSBnaXQgcmVwb3NpdG9yeSAob3Ig YW55IHBhcmVudCB1cCB0byBtb3VudCBwb2ludClcblN0b3BwaW5nIGF0IGZpbGVzeXN0ZW0gYm91 bmRhcnkgKEdJVF9ESVNDT1ZFUllfQUNST1NTX0ZJTEVTWVNURU0gbm90IHNldCkuXG4nLAogICAg ICAgICAgICAgICAgICksCi0gICAgICAgICAgICApLAorICAgICAgICAgICAgKSwgKmdpdF9zdm5f cm91dGVzCiAgICAgICAgICkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0 ZXN0LnB5CShyZXZpc2lvbiAyNjc4MDgpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpA QCAtMjMsNiArMjMsOCBAQAogaW1wb3J0IG9zCiBpbXBvcnQgdW5pdHRlc3QKIAorZnJvbSB3ZWJr aXRjb3JlcHkgaW1wb3J0IExvZ2dlckNhcHR1cmUKK2Zyb20gd2Via2l0Y29yZXB5Lm1vY2tzIGlt cG9ydCBUaW1lIGFzIE1vY2tUaW1lCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBsb2NhbCwgbW9j a3MKIAogCkBAIC02OSwzICs3MSwyNiBAQCBjbGFzcyBUZXN0R2l0KHVuaXR0ZXN0LlRlc3RDYXNl KToKICAgICBkZWYgdGVzdF9kZWZhdWx0X2JyYW5jaChzZWxmKToKICAgICAgICAgd2l0aCBtb2Nr cy5sb2NhbC5HaXQoc2VsZi5wYXRoKToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9j YWwuR2l0KHNlbGYucGF0aCkuZGVmYXVsdF9icmFuY2gsICdtYWluJykKKworICAgIGRlZiB0ZXN0 X3NjbV90eXBlKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgp LCBNb2NrVGltZSwgTG9nZ2VyQ2FwdHVyZSgpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRUcnVl KGxvY2FsLkdpdChzZWxmLnBhdGgpLmlzX2dpdCkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RmFs c2UobG9jYWwuR2l0KHNlbGYucGF0aCkuaXNfc3ZuKQorCisgICAgICAgIHdpdGggbW9ja3MubG9j YWwuR2l0KHNlbGYucGF0aCwgZ2l0X3N2bj1UcnVlKSwgTW9ja1RpbWUsIExvZ2dlckNhcHR1cmUo KToKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShsb2NhbC5HaXQoc2VsZi5wYXRoKS5pc19n aXQpCisgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUobG9jYWwuR2l0KHNlbGYucGF0aCkuaXNf c3ZuKQorCisgICAgZGVmIHRlc3RfaW5mbyhzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2Nh bC5HaXQoc2VsZi5wYXRoKSwgTW9ja1RpbWUsIExvZ2dlckNhcHR1cmUoKToKKyAgICAgICAgICAg IHdpdGggc2VsZi5hc3NlcnRSYWlzZXMobG9jYWwuR2l0LkV4Y2VwdGlvbik6CisgICAgICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChkaWN0KCksIGxvY2FsLkdpdChzZWxmLnBhdGgpLmluZm8o KSkKKworICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGdpdF9zdm49VHJ1 ZSksIE1vY2tUaW1lLCBMb2dnZXJDYXB0dXJlKCk6CisgICAgICAgICAgICBzZWxmLmFzc2VydEVx dWFsKAorICAgICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAgICAgJ1BhdGgnOiAnLics CisgICAgICAgICAgICAgICAgICAgICdSZXBvc2l0b3J5IFJvb3QnOiAnZ2l0QHdlYmtpdC5vcmc6 L21vY2svcmVwb3NpdG9yeScsCisgICAgICAgICAgICAgICAgICAgICdVUkwnOiAnZ2l0QHdlYmtp dC5vcmc6L21vY2svcmVwb3NpdG9yeS9tYWluJywKKyAgICAgICAgICAgICAgICB9LCBsb2NhbC5H aXQoc2VsZi5wYXRoKS5pbmZvKCksCisgICAgICAgICAgICApCkluZGV4OiBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS90ZXN0L3N2bl91bml0dGVzdC5weQkocmV2aXNpb24gMjY3ODA4KQorKysgVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3Qu cHkJKHdvcmtpbmcgY29weSkKQEAgLTY2LDMgKzY2LDggQEAgY2xhc3MgVGVzdFN2bih1bml0dGVz dC5UZXN0Q2FzZSk6CiAgICAgZGVmIHRlc3RfZGVmYXVsdF9icmFuY2goc2VsZik6CiAgICAgICAg IHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6CiAgICAgICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKGxvY2FsLlN2bihzZWxmLnBhdGgpLmRlZmF1bHRfYnJhbmNoLCAndHJ1bmsnKQorCisg ICAgZGVmIHRlc3Rfc2NtX3R5cGUoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3Zu KHNlbGYucGF0aCk6CisgICAgICAgICAgICBzZWxmLmFzc2VydFRydWUobG9jYWwuU3ZuKHNlbGYu cGF0aCkuaXNfc3ZuKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShsb2NhbC5Tdm4oc2Vs Zi5wYXRoKS5pc19naXQpCg==