229360 2021-08-20 17:30:22 -0700 [Cygwin] Support Python 3 in run-webkit-tests 2021-08-23 09:34:06 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226658 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dewei_zhu ews-watchlist glenn ryanhaddad slewis webkit-bug-importer oldest_to_newest 1786056 0 jbedard 2021-08-20 17:30:22 -0700 There are some small changes needed to support Python 3 in Cygwin for run-webkit-tests. 1786057 1 webkit-bug-importer 2021-08-20 17:30:51 -0700 <rdar://problem/82192362> 1786058 2 436047 jbedard 2021-08-20 17:33:20 -0700 Created attachment 436047 Patch 1786450 3 436047 dewei_zhu 2021-08-23 09:29:42 -0700 Comment on attachment 436047 Patch r=me 1786451 4 ews-feeder 2021-08-23 09:34:05 -0700 Committed r281448 (240831@main): <https://commits.webkit.org/240831@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436047. 436047 2021-08-20 17:33:20 -0700 2021-08-23 09:34:06 -0700 Patch bug-229360-20210820173319.patch text/plain 14639 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxMzUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMmJkNzYyMzljMmNiNmQ0MGE5M2JiYTNkODkyYmNmMGI2 MTczYzQ5Zi4uMGI2YTY1ODdkNjMyYTg4MDRlNjlhYjQxYjcyMmRhMjJjOTI2MDBhNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDIxLTA4LTIwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbQ3lnd2luXSBTdXBwb3J0IFB5dGhvbiAzIGluIHJ1bi13ZWJraXQtdGVzdHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyOTM2MAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vODIxOTIzNjI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkv c2V0dXAucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5OiBEaXR0by4KKyAgICAgICAgKiBTY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rlc3RzL3Rhc2tfcG9vbF91 bml0dGVzdC5weToKKyAgICAgICAgKFRhc2tQb29sVW5pdHRlc3QpOiBTa2lwIHNvbWUgdGVzdHMg b24gY3lnd2luLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9hYnN0 cmFjdGV4ZWN1dGl2ZS5weToKKyAgICAgICAgKEFic3RyYWN0RXhlY3V0aXZlLmNvbW1hbmRfZm9y X3ByaW50aW5nKTogU3RyaW5ncyBtaWdodCBiZSBieXRlcyBvbiBzb21lIHBsYXRmb3Jtcy4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGF0aC5weToKKyAgICAgICAg KF9DeWdQYXRoLmNvbnZlcnQpOiBDeWd3aW4gcGF0aCBwcm9jZXNzIGlzIG5vdCB1bmljb2RlLgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHk6 CisgICAgICAgIChQbGF0Zm9ybUluZm8uX3dpbl92ZXJzaW9uX3N0cik6IFJldHVybiBXaW5kb3dz IHZlcnNpb24gc3RyaW5nIGFzIHVuaWNvZGUgc3RyaW5nLgorCiAyMDIxLTA4LTIwICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBVSUV2 ZW50QXR0cmlidXRpb24gdGVzdHMgbGVzcyBwbGF0Zm9ybSBkZXBlbmRlbnQKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weSBiL1Rvb2xzL1Nj cmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQppbmRleCA2MmI3YzQ1MmFlMmRi M2M4OGI4NjAzMGY4YmUwNDlmOTcyMzVhN2JmLi5mZWQ3ZTYxMGU0ZDg1MDJkOWNlODVmNjFmNDBl ZWI2NTkwNzM4N2NlIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvc2V0dXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3NldHVwLnB5CkBAIC0zMCw3ICszMCw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAg bmFtZT0nd2Via2l0Y29yZXB5JywKLSAgICB2ZXJzaW9uPScwLjkuMCcsCisgICAgdmVyc2lvbj0n MC45LjEnLAogICAgIGRlc2NyaXB0aW9uPSdMaWJyYXJ5IGNvbnRhaW5pbmcgdmFyaW91cyBQeXRo b24gc3VwcG9ydCBjbGFzc2VzIGFuZCBmdW5jdGlvbnMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9u PXJlYWRtZSgpLAogICAgIGNsYXNzaWZpZXJzPVsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkgYi9Ub29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5pdF9fLnB5Cmlu ZGV4IGNmM2M2MmJkYTA2ZmRhZDc1Y2EzNWVjZGRlMzc1NWMxYjEyYzE1YjEuLjY0M2U3YWE1Njhm MzQ1YzVhODE1MDQzNjkyZTIyNjBmZmM0NjAyN2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18ucHkKKysrIGIvVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5w eQpAQCAtNDEsNyArNDEsNyBAQCBmcm9tIHdlYmtpdGNvcmVweS5tZWFzdXJlX3RpbWUgaW1wb3J0 IE1lYXN1cmVUaW1lCiBmcm9tIHdlYmtpdGNvcmVweS5uZXN0ZWRfZnV6enlfZGljdCBpbXBvcnQg TmVzdGVkRnV6enlEaWN0CiBmcm9tIHdlYmtpdGNvcmVweS5jYWxsX2J5X25lZWQgaW1wb3J0IENh bGxCeU5lZWQKIAotdmVyc2lvbiA9IFZlcnNpb24oMCwgOSwgMCkKK3ZlcnNpb24gPSBWZXJzaW9u KDAsIDksIDEpCiAKIGZyb20gd2Via2l0Y29yZXB5LmF1dG9pbnN0YWxsIGltcG9ydCBQYWNrYWdl LCBBdXRvSW5zdGFsbAogaWYgc3lzLnZlcnNpb25faW5mbyA+ICgzLCAwKToKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGVzdHMv dGFza19wb29sX3VuaXR0ZXN0LnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3dlYmtpdGNvcmVweS90ZXN0cy90YXNrX3Bvb2xfdW5pdHRlc3QucHkKaW5kZXggOWFkN2Zm NTQ3ODY0ZDI0NGM5MGEwZDI0YmJjYmQ4Mzk0YjE2MGE1MC4uMjBiNzZmN2M1NjFhN2E2MjA3YzEx MmNlOGIwNzQwZTdjZTZhNzZhZSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90ZXN0cy90YXNrX3Bvb2xfdW5pdHRlc3QucHkKKysr IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS90ZXN0 cy90YXNrX3Bvb2xfdW5pdHRlc3QucHkKQEAgLTIyLDYgKzIyLDcgQEAKIAogaW1wb3J0IGxvZ2dp bmcKIGltcG9ydCB0aW1lCitpbXBvcnQgc3lzCiBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJr aXRjb3JlcHkgaW1wb3J0IE91dHB1dENhcHR1cmUsIFRhc2tQb29sLCBsb2cgYXMgbG9nZ2VyCkBA IC01OSwxNiArNjAsNiBAQCBkZWYgZXhjZXB0aW9uKHZhbHVlKToKIGNsYXNzIFRhc2tQb29sVW5p dHRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgIGFscGhhYmV0ID0gJ2FiY2RlZmdoaWprbG1u b3BxcnN0dXZ3eHl6JwogCi0gICAgZGVmIHRlc3Rfc2luZ2xlKHNlbGYpOgotICAgICAgICB3aXRo IE91dHB1dENhcHR1cmUobGV2ZWw9bG9nZ2luZy5XQVJOSU5HKSBhcyBjYXB0dXJlZDoKLSAgICAg ICAgICAgIHdpdGggVGFza1Bvb2wod29ya2Vycz0xLCBmb3JjZV9mb3JrPVRydWUpIGFzIHBvb2w6 Ci0gICAgICAgICAgICAgICAgcG9vbC5kbyhhY3Rpb24sICdhJykKLSAgICAgICAgICAgICAgICBw b29sLmRvKGxvZywgbG9nZ2luZy5XQVJOSU5HLCAnMScpCi0gICAgICAgICAgICAgICAgcG9vbC53 YWl0KCkKLQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1 ZSgpLCAnYWN0aW9uKGEpXG4nKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLndl YmtpdGNvcmVweS5sb2cuZ2V0dmFsdWUoKSwgJ3dvcmtlci8wIDFcbicpCi0KICAgICBkZWYgdGVz dF9zaW5nbGVfbm9fZm9yayhzZWxmKToKICAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKGxldmVs PWxvZ2dpbmcuV0FSTklORykgYXMgY2FwdHVyZWQ6CiAgICAgICAgICAgICB3aXRoIFRhc2tQb29s KHdvcmtlcnM9MSwgZm9yY2VfZm9yaz1GYWxzZSkgYXMgcG9vbDoKQEAgLTc5LDIwICs3MCw2IEBA IGNsYXNzIFRhc2tQb29sVW5pdHRlc3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgpLCAnYWN0aW9uKGEpXG4nKQog ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGNhcHR1cmVkLndlYmtpdGNvcmVweS5sb2cuZ2V0dmFs dWUoKSwgJzFcbicpCiAKLSAgICBkZWYgdGVzdF9tdWx0aXBsZShzZWxmKToKLSAgICAgICAgd2l0 aCBPdXRwdXRDYXB0dXJlKGxldmVsPWxvZ2dpbmcuSU5GTykgYXMgY2FwdHVyZWQ6Ci0gICAgICAg ICAgICB3aXRoIFRhc2tQb29sKHdvcmtlcnM9NCkgYXMgcG9vbDoKLSAgICAgICAgICAgICAgICBm b3IgY2hhcmFjdGVyIGluIHNlbGYuYWxwaGFiZXQ6Ci0gICAgICAgICAgICAgICAgICAgIHBvb2wu ZG8oYWN0aW9uLCBjaGFyYWN0ZXIpCi0gICAgICAgICAgICAgICAgcG9vbC53YWl0KCkKLQotICAg ICAgICBsaW5lcyA9IGNhcHR1cmVkLnN0ZG91dC5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKQotICAg ICAgICBzZWxmLmFzc2VydEVxdWFscyhzb3J0ZWQobGluZXMpLCBbJ2FjdGlvbih7fSknLmZvcm1h dChjaGFyYWN0ZXIpIGZvciBjaGFyYWN0ZXIgaW4gc2VsZi5hbHBoYWJldF0pCi0gICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoCi0gICAgICAgICAgICBzb3J0ZWQoY2FwdHVyZWQud2Via2l0Y29yZXB5 LmxvZy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKSksCi0gICAgICAgICAgICBzb3J0ZWQoWyd3b3Jr ZXIve30gc3RhcnRpbmcnLmZvcm1hdChudW1iZXIpIGZvciBudW1iZXIgaW4gcmFuZ2UoNCldICsg Wyd3b3JrZXIve30gc3RvcHBpbmcnLmZvcm1hdChudW1iZXIpIGZvciBudW1iZXIgaW4gcmFuZ2Uo NCldKSwKLSAgICAgICAgKQotCiAgICAgZGVmIHRlc3RfY2FsbGJhY2soc2VsZik6CiAgICAgICAg IHNlcXVlbmNlID0gW10KIApAQCAtMTA2LDE3ICs4Myw2IEBAIGNsYXNzIFRhc2tQb29sVW5pdHRl c3QodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICAgICAgJycuam9pbihzb3J0ZWQoc2VxdWVu Y2UpKSwKICAgICAgICAgKQogCi0gICAgZGVmIHRlc3RfZXhjZXB0aW9uKHNlbGYpOgotICAgICAg ICB3aXRoIE91dHB1dENhcHR1cmUobGV2ZWw9bG9nZ2luZy5JTkZPKSBhcyBjYXB0dXJlZDoKLSAg ICAgICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlzZXMoUnVudGltZUVycm9yKToKLSAgICAgICAg ICAgICAgICB3aXRoIFRhc2tQb29sKHdvcmtlcnM9MSwgZm9yY2VfZm9yaz1UcnVlKSBhcyBwb29s OgotICAgICAgICAgICAgICAgICAgICBwb29sLmRvKGV4Y2VwdGlvbiwgJ1Rlc3RpbmcgZXhjZXB0 aW9uJykKLSAgICAgICAgICAgICAgICAgICAgcG9vbC53YWl0KCkKLSAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbCgKLSAgICAgICAgICAgIGNhcHR1cmVkLndlYmtpdGNvcmVweS5sb2cuZ2V0dmFsdWUo KS5zcGxpdGxpbmVzKCksCi0gICAgICAgICAgICBbJ3dvcmtlci8wIHN0YXJ0aW5nJywgJ3dvcmtl ci8wIHN0b3BwaW5nJ10sCi0gICAgICAgICkKLQogICAgIGRlZiB0ZXN0X2V4Y2VwdGlvbl9ub19m b3JrKHNlbGYpOgogICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUobGV2ZWw9bG9nZ2luZy5JTkZP KSBhcyBjYXB0dXJlZDoKICAgICAgICAgICAgIHdpdGggc2VsZi5hc3NlcnRSYWlzZXMoUnVudGlt ZUVycm9yKToKQEAgLTEyNSw0NiArOTEsODIgQEAgY2xhc3MgVGFza1Bvb2xVbml0dGVzdCh1bml0 dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgICAgICAgICAgICAgIHBvb2wud2FpdCgpCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQud2Via2l0Y29yZXB5LmxvZy5nZXR2YWx1ZSgpLCAn JykKIAotICAgIGRlZiB0ZXN0X3NldHVwKHNlbGYpOgotICAgICAgICB3aXRoIE91dHB1dENhcHR1 cmUoKSBhcyBjYXB0dXJlZDoKLSAgICAgICAgICAgIHdpdGggVGFza1Bvb2wod29ya2Vycz00LCBz ZXR1cD1zZXR1cCkgYXMgcG9vbDoKLSAgICAgICAgICAgICAgICBmb3IgY2hhcmFjdGVyIGluIHNl bGYuYWxwaGFiZXQ6Ci0gICAgICAgICAgICAgICAgICAgIHBvb2wuZG8oYWN0aW9uLCBjaGFyYWN0 ZXIpCi0gICAgICAgICAgICAgICAgcG9vbC53YWl0KCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgKLSAgICAgICAgICAgIHNvcnRlZChjYXB0dXJlZC53ZWJraXRjb3JlcHkubG9nLmdldHZhbHVl KCkuc3BsaXRsaW5lcygpKSwKLSAgICAgICAgICAgIFsnd29ya2VyL3t9IFNldHRpbmcgdXAnLmZv cm1hdCh4KSBmb3IgeCBpbiByYW5nZSg0KV0sCi0gICAgICAgICkKKyAgICBpZiBzeXMucGxhdGZv cm0gIT0gJ2N5Z3dpbic6CisgICAgICAgIGRlZiB0ZXN0X3NpbmdsZShzZWxmKToKKyAgICAgICAg ICAgIHdpdGggT3V0cHV0Q2FwdHVyZShsZXZlbD1sb2dnaW5nLldBUk5JTkcpIGFzIGNhcHR1cmVk OgorICAgICAgICAgICAgICAgIHdpdGggVGFza1Bvb2wod29ya2Vycz0xLCBmb3JjZV9mb3JrPVRy dWUpIGFzIHBvb2w6CisgICAgICAgICAgICAgICAgICAgIHBvb2wuZG8oYWN0aW9uLCAnYScpCisg ICAgICAgICAgICAgICAgICAgIHBvb2wuZG8obG9nLCBsb2dnaW5nLldBUk5JTkcsICcxJykKKyAg ICAgICAgICAgICAgICAgICAgcG9vbC53YWl0KCkKIAotICAgIGRlZiB0ZXN0X3NldHVwX2FyZ3Vt ZW50cyhzZWxmKToKLSAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQ6Ci0g ICAgICAgICAgICB3aXRoIFRhc2tQb29sKHdvcmtlcnM9NCwgc2V0dXA9c2V0dXAsIHNldHVwYXJn cz1bJ1NldHVwIGFyZ3VtZW50J10pIGFzIHBvb2w6Ci0gICAgICAgICAgICAgICAgZm9yIGNoYXJh Y3RlciBpbiBzZWxmLmFscGhhYmV0OgotICAgICAgICAgICAgICAgICAgICBwb29sLmRvKGFjdGlv biwgY2hhcmFjdGVyKQotICAgICAgICAgICAgICAgIHBvb2wud2FpdCgpCi0gICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoCi0gICAgICAgICAgICBzb3J0ZWQoY2FwdHVyZWQud2Via2l0Y29yZXB5Lmxv Zy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKSksCi0gICAgICAgICAgICBbJ3dvcmtlci97fSBTZXR1 cCBhcmd1bWVudCcuZm9ybWF0KHgpIGZvciB4IGluIHJhbmdlKDQpXSwKLSAgICAgICAgKQorICAg ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChjYXB0dXJlZC5zdGRvdXQuZ2V0dmFsdWUoKSwgJ2Fj dGlvbihhKVxuJykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoY2FwdHVyZWQud2Via2l0 Y29yZXB5LmxvZy5nZXR2YWx1ZSgpLCAnd29ya2VyLzAgMVxuJykKIAotICAgIGRlZiB0ZXN0X3Rl YXJkb3duKHNlbGYpOgotICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoK LSAgICAgICAgICAgIHdpdGggVGFza1Bvb2wod29ya2Vycz00LCB0ZWFyZG93bj10ZWFyZG93bikg YXMgcG9vbDoKLSAgICAgICAgICAgICAgICBmb3IgY2hhcmFjdGVyIGluIHNlbGYuYWxwaGFiZXQ6 Ci0gICAgICAgICAgICAgICAgICAgIHBvb2wuZG8oYWN0aW9uLCBjaGFyYWN0ZXIpCi0gICAgICAg ICAgICAgICAgcG9vbC53YWl0KCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKLSAgICAgICAg ICAgIHNvcnRlZChjYXB0dXJlZC53ZWJraXRjb3JlcHkubG9nLmdldHZhbHVlKCkuc3BsaXRsaW5l cygpKSwKLSAgICAgICAgICAgIFsnd29ya2VyL3t9IFRlYXJpbmcgZG93bicuZm9ybWF0KHgpIGZv ciB4IGluIHJhbmdlKDQpXSwKLSAgICAgICAgKQorICAgICAgICBkZWYgdGVzdF9tdWx0aXBsZShz ZWxmKToKKyAgICAgICAgICAgIHdpdGggT3V0cHV0Q2FwdHVyZShsZXZlbD1sb2dnaW5nLklORk8p IGFzIGNhcHR1cmVkOgorICAgICAgICAgICAgICAgIHdpdGggVGFza1Bvb2wod29ya2Vycz00KSBh cyBwb29sOgorICAgICAgICAgICAgICAgICAgICBmb3IgY2hhcmFjdGVyIGluIHNlbGYuYWxwaGFi ZXQ6CisgICAgICAgICAgICAgICAgICAgICAgICBwb29sLmRvKGFjdGlvbiwgY2hhcmFjdGVyKQor ICAgICAgICAgICAgICAgICAgICBwb29sLndhaXQoKQogCi0gICAgZGVmIHRlc3RfdGVhcmRvd25f YXJndW1lbnRzKHNlbGYpOgotICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJl ZDoKLSAgICAgICAgICAgIHdpdGggVGFza1Bvb2wod29ya2Vycz00LCB0ZWFyZG93bj10ZWFyZG93 biwgdGVhcmRvd25hcmdzPVsnVGVhcmRvd24gYXJndW1lbnQnXSkgYXMgcG9vbDoKLSAgICAgICAg ICAgICAgICBmb3IgY2hhcmFjdGVyIGluIHNlbGYuYWxwaGFiZXQ6Ci0gICAgICAgICAgICAgICAg ICAgIHBvb2wuZG8oYWN0aW9uLCBjaGFyYWN0ZXIpCi0gICAgICAgICAgICAgICAgcG9vbC53YWl0 KCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKLSAgICAgICAgICAgIHNvcnRlZChjYXB0dXJl ZC53ZWJraXRjb3JlcHkubG9nLmdldHZhbHVlKCkuc3BsaXRsaW5lcygpKSwKLSAgICAgICAgICAg IFsnd29ya2VyL3t9IFRlYXJkb3duIGFyZ3VtZW50Jy5mb3JtYXQoeCkgZm9yIHggaW4gcmFuZ2Uo NCldLAotICAgICAgICApCisgICAgICAgICAgICBsaW5lcyA9IGNhcHR1cmVkLnN0ZG91dC5nZXR2 YWx1ZSgpLnNwbGl0bGluZXMoKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbHMoc29ydGVk KGxpbmVzKSwgWydhY3Rpb24oe30pJy5mb3JtYXQoY2hhcmFjdGVyKSBmb3IgY2hhcmFjdGVyIGlu IHNlbGYuYWxwaGFiZXRdKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAg ICAgICAgICBzb3J0ZWQoY2FwdHVyZWQud2Via2l0Y29yZXB5LmxvZy5nZXR2YWx1ZSgpLnNwbGl0 bGluZXMoKSksCisgICAgICAgICAgICAgICAgc29ydGVkKFsnd29ya2VyL3t9IHN0YXJ0aW5nJy5m b3JtYXQobnVtYmVyKSBmb3IgbnVtYmVyIGluIHJhbmdlKDQpXSArIFsnd29ya2VyL3t9IHN0b3Bw aW5nJy5mb3JtYXQobnVtYmVyKSBmb3IgbnVtYmVyIGluIHJhbmdlKDQpXSksCisgICAgICAgICAg ICApCisKKyAgICAgICAgZGVmIHRlc3RfZXhjZXB0aW9uKHNlbGYpOgorICAgICAgICAgICAgd2l0 aCBPdXRwdXRDYXB0dXJlKGxldmVsPWxvZ2dpbmcuSU5GTykgYXMgY2FwdHVyZWQ6CisgICAgICAg ICAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1lRXJyb3IpOgorICAgICAgICAg ICAgICAgICAgICB3aXRoIFRhc2tQb29sKHdvcmtlcnM9MSwgZm9yY2VfZm9yaz1UcnVlKSBhcyBw b29sOgorICAgICAgICAgICAgICAgICAgICAgICAgcG9vbC5kbyhleGNlcHRpb24sICdUZXN0aW5n IGV4Y2VwdGlvbicpCisgICAgICAgICAgICAgICAgICAgICAgICBwb29sLndhaXQoKQorICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBjYXB0dXJlZC53ZWJraXRj b3JlcHkubG9nLmdldHZhbHVlKCkuc3BsaXRsaW5lcygpLAorICAgICAgICAgICAgICAgIFsnd29y a2VyLzAgc3RhcnRpbmcnLCAnd29ya2VyLzAgc3RvcHBpbmcnXSwKKyAgICAgICAgICAgICkKKwor ICAgICAgICBkZWYgdGVzdF9zZXR1cChzZWxmKToKKyAgICAgICAgICAgIHdpdGggT3V0cHV0Q2Fw dHVyZSgpIGFzIGNhcHR1cmVkOgorICAgICAgICAgICAgICAgIHdpdGggVGFza1Bvb2wod29ya2Vy cz00LCBzZXR1cD1zZXR1cCkgYXMgcG9vbDoKKyAgICAgICAgICAgICAgICAgICAgZm9yIGNoYXJh Y3RlciBpbiBzZWxmLmFscGhhYmV0OgorICAgICAgICAgICAgICAgICAgICAgICAgcG9vbC5kbyhh Y3Rpb24sIGNoYXJhY3RlcikKKyAgICAgICAgICAgICAgICAgICAgcG9vbC53YWl0KCkKKyAgICAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgc29ydGVkKGNhcHR1cmVk LndlYmtpdGNvcmVweS5sb2cuZ2V0dmFsdWUoKS5zcGxpdGxpbmVzKCkpLAorICAgICAgICAgICAg ICAgIFsnd29ya2VyL3t9IFNldHRpbmcgdXAnLmZvcm1hdCh4KSBmb3IgeCBpbiByYW5nZSg0KV0s CisgICAgICAgICAgICApCisKKyAgICAgICAgZGVmIHRlc3Rfc2V0dXBfYXJndW1lbnRzKHNlbGYp OgorICAgICAgICAgICAgd2l0aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQ6CisgICAgICAg ICAgICAgICAgd2l0aCBUYXNrUG9vbCh3b3JrZXJzPTQsIHNldHVwPXNldHVwLCBzZXR1cGFyZ3M9 WydTZXR1cCBhcmd1bWVudCddKSBhcyBwb29sOgorICAgICAgICAgICAgICAgICAgICBmb3IgY2hh cmFjdGVyIGluIHNlbGYuYWxwaGFiZXQ6CisgICAgICAgICAgICAgICAgICAgICAgICBwb29sLmRv KGFjdGlvbiwgY2hhcmFjdGVyKQorICAgICAgICAgICAgICAgICAgICBwb29sLndhaXQoKQorICAg ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBzb3J0ZWQoY2FwdHVy ZWQud2Via2l0Y29yZXB5LmxvZy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKSksCisgICAgICAgICAg ICAgICAgWyd3b3JrZXIve30gU2V0dXAgYXJndW1lbnQnLmZvcm1hdCh4KSBmb3IgeCBpbiByYW5n ZSg0KV0sCisgICAgICAgICAgICApCisKKyAgICAgICAgZGVmIHRlc3RfdGVhcmRvd24oc2VsZik6 CisgICAgICAgICAgICB3aXRoIE91dHB1dENhcHR1cmUoKSBhcyBjYXB0dXJlZDoKKyAgICAgICAg ICAgICAgICB3aXRoIFRhc2tQb29sKHdvcmtlcnM9NCwgdGVhcmRvd249dGVhcmRvd24pIGFzIHBv b2w6CisgICAgICAgICAgICAgICAgICAgIGZvciBjaGFyYWN0ZXIgaW4gc2VsZi5hbHBoYWJldDoK KyAgICAgICAgICAgICAgICAgICAgICAgIHBvb2wuZG8oYWN0aW9uLCBjaGFyYWN0ZXIpCisgICAg ICAgICAgICAgICAgICAgIHBvb2wud2FpdCgpCisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFs KAorICAgICAgICAgICAgICAgIHNvcnRlZChjYXB0dXJlZC53ZWJraXRjb3JlcHkubG9nLmdldHZh bHVlKCkuc3BsaXRsaW5lcygpKSwKKyAgICAgICAgICAgICAgICBbJ3dvcmtlci97fSBUZWFyaW5n IGRvd24nLmZvcm1hdCh4KSBmb3IgeCBpbiByYW5nZSg0KV0sCisgICAgICAgICAgICApCisKKyAg ICAgICAgZGVmIHRlc3RfdGVhcmRvd25fYXJndW1lbnRzKHNlbGYpOgorICAgICAgICAgICAgd2l0 aCBPdXRwdXRDYXB0dXJlKCkgYXMgY2FwdHVyZWQ6CisgICAgICAgICAgICAgICAgd2l0aCBUYXNr UG9vbCh3b3JrZXJzPTQsIHRlYXJkb3duPXRlYXJkb3duLCB0ZWFyZG93bmFyZ3M9WydUZWFyZG93 biBhcmd1bWVudCddKSBhcyBwb29sOgorICAgICAgICAgICAgICAgICAgICBmb3IgY2hhcmFjdGVy IGluIHNlbGYuYWxwaGFiZXQ6CisgICAgICAgICAgICAgICAgICAgICAgICBwb29sLmRvKGFjdGlv biwgY2hhcmFjdGVyKQorICAgICAgICAgICAgICAgICAgICBwb29sLndhaXQoKQorICAgICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBzb3J0ZWQoY2FwdHVyZWQud2Vi a2l0Y29yZXB5LmxvZy5nZXR2YWx1ZSgpLnNwbGl0bGluZXMoKSksCisgICAgICAgICAgICAgICAg Wyd3b3JrZXIve30gVGVhcmRvd24gYXJndW1lbnQnLmZvcm1hdCh4KSBmb3IgeCBpbiByYW5nZSg0 KV0sCisgICAgICAgICAgICApCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vYWJzdHJhY3RleGVjdXRpdmUucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vYWJzdHJhY3RleGVjdXRpdmUucHkKaW5kZXggNmVhZTU1YjE0NGY5MTI4 NjBkN2JjMmZhYmY2M2IxZTJhZDFiZmYyOC4uNDI5NDYyMTIwYzc3YWY4NWUzNmY3NGU5NDFiZTdm N2MyMDc5OTFjNiAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL2Fic3RyYWN0ZXhlY3V0aXZlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9hYnN0cmFjdGV4ZWN1dGl2ZS5weQpAQCAtMTA3LDggKzEwNyw4IEBAIGNsYXNz IEFic3RyYWN0RXhlY3V0aXZlKG9iamVjdCk6CiAgICAgZGVmIGNvbW1hbmRfZm9yX3ByaW50aW5n KHNlbGYsIGFyZ3MpOgogICAgICAgICAiIiJSZXR1cm5zIGEgcHJpbnQtcmVhZHkgc3RyaW5nIHJl cHJlc2VudGluZyBjb21tYW5kIGFyZ3MuCiAgICAgICAgIFRoZSBzdHJpbmcgc2hvdWxkIGJlIGNv cHkvcGFzdGUgcmVhZHkgZm9yIGV4ZWN1dGlvbiBpbiBhIHNoZWxsLiIiIgotICAgICAgICBhcmdz ID0gc2VsZi5fc3RyaW5naWZ5X2FyZ3MoYXJncykKLSAgICAgICAgcmV0dXJuIHN0cmluZ191dGls cy5kZWNvZGUoc3RyaW5nX3V0aWxzLmVuY29kZSgnICcuam9pbihhcmdzKSwgZW5jb2Rpbmc9J3Vu aWNvZGVfZXNjYXBlJykpCisgICAgICAgIGFyZ3MgPSBbZWxtIGZvciBlbG0gaW4gc2VsZi5fc3Ry aW5naWZ5X2FyZ3MoYXJncyldCisgICAgICAgIHJldHVybiBzdHJpbmdfdXRpbHMuZGVjb2RlKHN0 cmluZ191dGlscy5lbmNvZGUoKGInICcgaWYgaXNpbnN0YW5jZShhcmdzWzBdLCBieXRlcykgZWxz ZSAnICcpLmpvaW4oYXJncyksIGVuY29kaW5nPSd1bmljb2RlX2VzY2FwZScpKQogCiAgICAgZGVm IHJ1bl9jb21tYW5kKHNlbGYsIGFyZ3MsIGN3ZD1Ob25lLCBlbnY9Tm9uZSwgaW5wdXQ9Tm9uZSwg c3Rkb3V0PU5vbmUsIGVycm9yX2hhbmRsZXI9Tm9uZSwgaWdub3JlX2Vycm9ycz1GYWxzZSwKICAg ICAgICAgcmV0dXJuX2V4aXRfY29kZT1GYWxzZSwgcmV0dXJuX3N0ZGVycj1UcnVlLCBkZWNvZGVf b3V0cHV0PVRydWUpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL3BhdGgucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGF0 aC5weQppbmRleCAwMzUwMGViN2E5MDI5MWUyMzc5Zjc5YzA4ZWRmY2IwNzA5M2Y0ZDMxLi43OWMz NjRlMGJkYzZjYjlmNGNiOGU1MjFkYzU4NTVkOTVmNTdmMzY5IDEwMDY0NAotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGF0aC5weQorKysgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGF0aC5weQpAQCAtMzYsNiArMzYsOCBAQCBpbXBvcnQg c3lzCiBpbXBvcnQgbG9nZ2luZwogaW1wb3J0IHRocmVhZGluZwogCitmcm9tIHdlYmtpdGNvcmVw eSBpbXBvcnQgc3RyaW5nX3V0aWxzCisKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CiAg ICAgZnJvbSB1cmxsaWIucGFyc2UgaW1wb3J0IHF1b3RlIGFzIHVybGxpYl9xdW90ZQogZWxzZToK QEAgLTExMCwxNCArMTEyLDE1IEBAIGNsYXNzIF9DeWdQYXRoKG9iamVjdCk6CiAgICAgZGVmIGNv bnZlcnQoc2VsZiwgcGF0aCk6CiAgICAgICAgIGlmIG5vdCBzZWxmLmlzX3J1bm5pbmcoKToKICAg ICAgICAgICAgIHNlbGYuc3RhcnQoKQotICAgICAgICBzZWxmLl9jaGlsZF9wcm9jZXNzLnN0ZGlu LndyaXRlKCIlc1xyXG4iICUgcGF0aCkKKyAgICAgICAgc2VsZi5fY2hpbGRfcHJvY2Vzcy5zdGRp bi53cml0ZShzdHJpbmdfdXRpbHMuZW5jb2RlKHBhdGgpKQorICAgICAgICBzZWxmLl9jaGlsZF9w cm9jZXNzLnN0ZGluLndyaXRlKGInXHJcbicpCiAgICAgICAgIHNlbGYuX2NoaWxkX3Byb2Nlc3Mu c3RkaW4uZmx1c2goKQogCi0gICAgICAgIHdpbmRvd3NfcGF0aCA9IHNlbGYuX2NoaWxkX3Byb2Nl c3Muc3Rkb3V0LnJlYWRsaW5lKCkucnN0cmlwKCkKKyAgICAgICAgd2luZG93c19wYXRoID0gc3Ry aW5nX3V0aWxzLmRlY29kZShzZWxmLl9jaGlsZF9wcm9jZXNzLnN0ZG91dC5yZWFkbGluZSgpLnJz dHJpcCgpKQogICAgICAgICBpZiB3aW5kb3dzX3BhdGggPT0gIiI6CiAgICAgICAgICAgICBzZWxm Ll9jaGlsZF9wcm9jZXNzLnN0ZGluLmNsb3NlKCkKICAgICAgICAgICAgIHNlbGYuX2NoaWxkX3By b2Nlc3Mud2FpdCgpCi0gICAgICAgICAgICB3aW5kb3dzX3BhdGggPSBzZWxmLl9jaGlsZF9wcm9j ZXNzLnN0ZG91dC5yZWFkbGluZSgpLnJzdHJpcCgpCisgICAgICAgICAgICB3aW5kb3dzX3BhdGgg PSBzdHJpbmdfdXRpbHMuZGVjb2RlKHNlbGYuX2NoaWxkX3Byb2Nlc3Muc3Rkb3V0LnJlYWRsaW5l KCkucnN0cmlwKCkpCiAgICAgICAgICAgICBzZWxmLl9jaGlsZF9wcm9jZXNzID0gTm9uZQogICAg ICAgICAjIFNvbWUgdmVyc2lvbnMgb2YgY3lncGF0aCB1c2UgbG93ZXJjYXNlIGRyaXZlIGxldHRl cnMgd2hpbGUgb3RoZXJzCiAgICAgICAgICMgdXNlIHVwcGVyY2FzZS4gV2UgYWx3YXlzIGNvbnZl cnQgdG8gdXBwZXJjYXNlIGZvciBjb25zaXN0ZW5jeS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkgYi9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CmluZGV4IDljZGUyZDhiZGZk NDk3MmQ2ZWU4OWNmYzE0YTA2YjYxM2ZkZWZkYTcuLjQ0YzgzYWZhYjBjN2I4ZDQ2NjkzZjM3YjJh NDM3NDQ5ZWM4ZWVlMzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9u L3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQpAQCAtMjUxLDQgKzI1MSw0IEBAIGNsYXNzIFBsYXRm b3JtSW5mbyhvYmplY3QpOgogICAgICAgICBpZiB2ZXJzaW9uOgogICAgICAgICAgICAgcmV0dXJu IHZlcnNpb24KICAgICAgICAgIyBOb3RlIHRoYXQgdGhpcyBzaG91bGQgb25seSBldmVyIGJlIGNh bGxlZCBvbiB3aW5kb3dzLCBzbyB0aGlzIHNob3VsZCBhbHdheXMgd29yay4KLSAgICAgICAgcmV0 dXJuIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ2NtZCcsICcvYycsICd2ZXInXSwgZGVj b2RlX291dHB1dD1GYWxzZSkKKyAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29t bWFuZChbJ2NtZCcsICcvYycsICd2ZXInXSwgZGVjb2RlX291dHB1dD1UcnVlKQo=