208693 2020-03-05 21:05:06 -0800 [webkitpy] Fix executive on Windows to run wpt server correctly 2020-03-06 17:54:17 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke basuke cdumez commit-queue darin ews-watchlist fujii glenn japhet jbedard webkit-bug-importer oldest_to_newest 1626489 0 basuke 2020-03-05 21:05:06 -0800 Caused by typo. 1626945 1 392796 basuke 2020-03-06 16:10:44 -0800 Created attachment 392796 PATCH 1626950 2 392796 fujii 2020-03-06 16:18:25 -0800 Comment on attachment 392796 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=392796&action=review > Source/WebCore/loader/cache/CachedImage.cpp:569 > + } Whats this? 1626953 3 392798 basuke 2020-03-06 16:21:04 -0800 Created attachment 392798 PATCH 1626956 4 basuke 2020-03-06 16:23:32 -0800 Sorry, I submitted a wrong file X( New one is good to go. 1626967 5 392798 jbedard 2020-03-06 16:33:15 -0800 Comment on attachment 392798 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=392798&action=review > Tools/Scripts/webkitpy/common/system/executive.py:324 > + def _windows_killCommand(self): If this is an instance function, we shouldn't need the 'self._is_native_win' in kill_all. Otherwise it should be a staticmethod or a class variable (Like what we did with PIPE and STDOUT) 1626982 6 392812 basuke 2020-03-06 16:53:28 -0800 Created attachment 392812 PATCH 1626985 7 392812 jbedard 2020-03-06 16:56:25 -0800 Comment on attachment 392812 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=392812&action=review > Tools/Scripts/webkitpy/common/system/executive.py:326 > + return os.path.join("C:", os.sep, "WINDOWS", "system32", "taskkill.exe") Do we actually need os.sep here? I would expect os.path.join(...) to do that for you. 1626990 8 392812 basuke 2020-03-06 17:02:07 -0800 Comment on attachment 392812 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=392812&action=review >> Tools/Scripts/webkitpy/common/system/executive.py:326 >> + return os.path.join("C:", os.sep, "WINDOWS", "system32", "taskkill.exe") > > Do we actually need os.sep here? I would expect os.path.join(...) to do that for you. Well that part is copied from existing code, which is working. So I left untouched that. 1627042 9 392812 commit-queue 2020-03-06 17:53:56 -0800 Comment on attachment 392812 PATCH Clearing flags on attachment: 392812 Committed r258045: <https://trac.webkit.org/changeset/258045> 1627043 10 commit-queue 2020-03-06 17:53:58 -0800 All reviewed patches have been landed. Closing bug. 1627045 11 webkit-bug-importer 2020-03-06 17:54:17 -0800 <rdar://problem/60178285> 392796 2020-03-06 16:10:44 -0800 2020-03-06 16:21:04 -0800 PATCH bug-208693.diff text/plain 2283 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9DYWNoZWRJbWFnZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvY2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCmluZGV4IGFiMDIx NTQzOTgwYS4uMjQ3ZmI4M2U2ZmM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv Y2FjaGUvQ2FjaGVkSW1hZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9jYWNoZS9D YWNoZWRJbWFnZS5jcHAKQEAgLTU2Myw2ICs1NjMsMTAgQEAgdm9pZCBDYWNoZWRJbWFnZTo6Zmlu aXNoTG9hZGluZyhTaGFyZWRCdWZmZXIqIGRhdGEpCiAgICAgfQogCiAgICAgRW5jb2RlZERhdGFT dGF0dXMgZW5jb2RlZERhdGFTdGF0dXMgPSB1cGRhdGVJbWFnZURhdGEodHJ1ZSk7CisgICAgaWYg KG1fZGF0YSkgeworICAgICAgICBtX2RhdGEtPmNsZWFyKCk7CisgICAgICAgIHNldEVuY29kZWRT aXplKDApOworICAgIH0KIAogICAgIGlmIChlbmNvZGVkRGF0YVN0YXR1cyA9PSBFbmNvZGVkRGF0 YVN0YXR1czo6RXJyb3IgfHwgbV9pbWFnZS0+aXNOdWxsKCkpIHsKICAgICAgICAgLy8gSW1hZ2Ug ZGVjb2RpbmcgZmFpbGVkOyB0aGUgaW1hZ2UgZGF0YSBpcyBtYWxmb3JtZWQuCmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjQxMDUxMTMxNDQ5Li5h MzZjNTNhNjdjZDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAyMC0wMy0wNSAgQmFzdWtlIFN1enVraSAgPGJhc3Vr ZS5zdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW3dlYmtpdHB5XSBGaXggZXhlY3V0aXZlIG9u IFdpbmRvd3MgZW52aXJvbm1lbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwODY5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEJ1ZyBmaXggZm9yIFdpbmRvd3MgZW52aXJvbm1lbnQgYnkgZml4aW5nIGEg dHlwby4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRp dmUucHk6CisgICAgICAgIChFeGVjdXRpdmUua2lsbF9hbGwpOgorCiAyMDIwLTAzLTAyICBKb2hu IFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlc291cmNlTG9hZFN0 YXRpc3RpY3M6IEVuYWJsZSBjb29raWUgYmxvY2tpbmcgYW5kIHRoZSBTdG9yYWdlIEFjY2VzcyBB UEkgaW4gZXBoZW1lcmFsIHNlc3Npb25zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQppbmRleCA5ZTJkYThkZWM4NzguLjI3YWVkOThiZDJj MSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1 dGl2ZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0 aXZlLnB5CkBAIC0zMzUsMTAgKzMzNSwxMCBAQCBjbGFzcyBFeGVjdXRpdmUoQWJzdHJhY3RFeGVj dXRpdmUpOgogICAgICAgICBXaWxsIGZhaWwgc2lsZW50bHkgaWYgbm8gcHJvY2VzcyBhcmUgZm91 bmQuIiIiCiAgICAgICAgIGlmIHNlbGYuX2lzX2N5Z3dpbiBvciBzZWxmLl9pc19uYXRpdmVfd2lu OgogICAgICAgICAgICAgaW1hZ2VfbmFtZSA9IHNlbGYuX3dpbmRvd3NfaW1hZ2VfbmFtZShwcm9j ZXNzX25hbWUpCi0gICAgICAgICAgICBraWxsQ29tbW1hbmQgPSAndGFza2tpbGwuZXhlJworICAg ICAgICAgICAga2lsbENvbW1hbmQgPSAndGFza2tpbGwuZXhlJwogICAgICAgICAgICAgaWYgc2Vs Zi5faXNfbmF0aXZlX3dpbjoKICAgICAgICAgICAgICAgICBraWxsQ29tbWFuZCA9IG9zLnBhdGgu am9pbignQzonLCBvcy5zZXAsICdXSU5ET1dTJywgJ3N5c3RlbTMyJywgJ3Rhc2traWxsLmV4ZScp Ci0gICAgICAgICAgICBjb21tYW5kID0gW2tpbGxDb21tbWFuZCwgIi9mIiwgIi9pbSIsIGltYWdl X25hbWVdCisgICAgICAgICAgICBjb21tYW5kID0gW2tpbGxDb21tYW5kLCAiL2YiLCAiL2ltIiwg aW1hZ2VfbmFtZV0KICAgICAgICAgICAgICMgdGFza2tpbGwgd2lsbCBleGl0IDEyOCBpZiB0aGUg cHJvY2VzcyBpcyBub3QgZm91bmQuICBXZSBzaG91bGQgbG9nLgogICAgICAgICAgICAgc2VsZi5y dW5fY29tbWFuZChjb21tYW5kLCBpZ25vcmVfZXJyb3JzPVRydWUpCiAgICAgICAgICAgICByZXR1 cm4K 392798 2020-03-06 16:21:04 -0800 2020-03-06 16:53:28 -0800 PATCH diff-208693.diff text/plain 3777 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNDEw NTExMzE0NDkuLmY5MTY2OTQxNTA5ZSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAzLTA2ICBCYXN1a2UgU3V6 dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNvbT4KKworICAgICAgICBbd2Via2l0cHldIEZpeCBl eGVjdXRpdmUgb24gV2luZG93cyB0byBydW4gd3B0IHNlcnZlciBjb3JyZWN0bHkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY5MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyBmaXggZm9yIFdpbmRv d3MgZW52aXJvbm1lbnQgYSkgZml4aW5nIGEgdHlwby4gYikgZml4aW5nIHBhdGgKKyAgICAgICAg YykgZml4IGhvdyB0byBraWxsIHN1YnByb2Nlc3Nlcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHk6CisgICAgICAgIChFeGVjdXRpdmUuX3dp bmRvd3Nfa2lsbENvbW1hbmQpOgorICAgICAgICAoRXhlY3V0aXZlLmludGVycnVwdCk6CisgICAg ICAgIChFeGVjdXRpdmUua2lsbF9hbGwpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9y dC9iYXNlLnB5OgorICAgICAgICAoUG9ydC53ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXJfZG9jX3Jv b3QpOgorCiAyMDIwLTAzLTAyICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgog CiAgICAgICAgIFJlc291cmNlTG9hZFN0YXRpc3RpY3M6IEVuYWJsZSBjb29raWUgYmxvY2tpbmcg YW5kIHRoZSBTdG9yYWdlIEFjY2VzcyBBUEkgaW4gZXBoZW1lcmFsIHNlc3Npb25zCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5IGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQppbmRleCA5 ZTJkYThkZWM4NzguLmMzN2IyODk5OTI1NSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CkBAIC0zMjEsMjQgKzMyMSwzMCBAQCBjbGFz cyBFeGVjdXRpdmUoQWJzdHJhY3RFeGVjdXRpdmUpOgogICAgICAgICAgICAgcHJvY2Vzc19uYW1l ID0gIiVzLmV4ZSIgJSBuYW1lCiAgICAgICAgIHJldHVybiBwcm9jZXNzX25hbWUKIAorICAgIGRl ZiBfd2luZG93c19raWxsQ29tbWFuZChzZWxmKToKKyAgICAgICAgcmV0dXJuIG9zLnBhdGguam9p bigiQzoiLCBvcy5zZXAsICJXSU5ET1dTIiwgInN5c3RlbTMyIiwgInRhc2traWxsLmV4ZSIpCisK ICAgICBkZWYgaW50ZXJydXB0KHNlbGYsIHBpZCk6Ci0gICAgICAgIGludGVycnVwdF9zaWduYWwg PSBzaWduYWwuQ1RSTF9DX0VWRU5UIGlmIHNlbGYuX2lzX25hdGl2ZV93aW4gZWxzZSBzaWduYWwu U0lHSU5UCi0gICAgICAgIHRyeToKLSAgICAgICAgICAgIG9zLmtpbGwocGlkLCBpbnRlcnJ1cHRf c2lnbmFsKQotICAgICAgICBleGNlcHQgT1NFcnJvcjoKLSAgICAgICAgICAgICMgU2lsZW50bHkg aWdub3JlIHdoZW4gdGhlIHBpZCBkb2Vzbid0IGV4aXN0LgotICAgICAgICAgICAgIyBJdCdzIGlt cG9zc2libGUgZm9yIGNhbGxlcnMgdG8gYXZvaWQgcmFjZSBjb25kaXRpb25zIHdpdGggcHJvY2Vz cyBzaHV0ZG93bi4KLSAgICAgICAgICAgIHBhc3MKKyAgICAgICAgaWYgc2VsZi5faXNfbmF0aXZl X3dpbjoKKyAgICAgICAgICAgIGNvbW1hbmQgPSBbc2VsZi5fd2luZG93c19raWxsQ29tbWFuZCgp LCAiL2YiLCAiL3QiLCAiL3BpZCIsIHN0cihwaWQpXQorICAgICAgICAgICAgc2VsZi5ydW5fY29t bWFuZChjb21tYW5kLCBpZ25vcmVfZXJyb3JzPVRydWUpCisgICAgICAgIGVsc2U6CisgICAgICAg ICAgICB0cnk6CisgICAgICAgICAgICAgICAgb3Mua2lsbChwaWQsIHNpZ25hbC5TSUdJTlQpCisg ICAgICAgICAgICBleGNlcHQgT1NFcnJvcjoKKyAgICAgICAgICAgICAgICAjIFNpbGVudGx5IGln bm9yZSB3aGVuIHRoZSBwaWQgZG9lc24ndCBleGlzdC4KKyAgICAgICAgICAgICAgICAjIEl0J3Mg aW1wb3NzaWJsZSBmb3IgY2FsbGVycyB0byBhdm9pZCByYWNlIGNvbmRpdGlvbnMgd2l0aCBwcm9j ZXNzIHNodXRkb3duLgorICAgICAgICAgICAgICAgIHBhc3MKIAogICAgIGRlZiBraWxsX2FsbChz ZWxmLCBwcm9jZXNzX25hbWUpOgogICAgICAgICAiIiJBdHRlbXB0cyB0byBraWxsIHByb2Nlc3Nl cyBtYXRjaGluZyBwcm9jZXNzX25hbWUuCiAgICAgICAgIFdpbGwgZmFpbCBzaWxlbnRseSBpZiBu byBwcm9jZXNzIGFyZSBmb3VuZC4iIiIKICAgICAgICAgaWYgc2VsZi5faXNfY3lnd2luIG9yIHNl bGYuX2lzX25hdGl2ZV93aW46CiAgICAgICAgICAgICBpbWFnZV9uYW1lID0gc2VsZi5fd2luZG93 c19pbWFnZV9uYW1lKHByb2Nlc3NfbmFtZSkKLSAgICAgICAgICAgIGtpbGxDb21tbWFuZCA9ICd0 YXNra2lsbC5leGUnCisgICAgICAgICAgICBraWxsQ29tbWFuZCA9ICd0YXNra2lsbC5leGUnCiAg ICAgICAgICAgICBpZiBzZWxmLl9pc19uYXRpdmVfd2luOgotICAgICAgICAgICAgICAgIGtpbGxD b21tYW5kID0gb3MucGF0aC5qb2luKCdDOicsIG9zLnNlcCwgJ1dJTkRPV1MnLCAnc3lzdGVtMzIn LCAndGFza2tpbGwuZXhlJykKLSAgICAgICAgICAgIGNvbW1hbmQgPSBba2lsbENvbW1tYW5kLCAi L2YiLCAiL2ltIiwgaW1hZ2VfbmFtZV0KKyAgICAgICAgICAgICAgICBraWxsQ29tbWFuZCA9IHNl bGYuX3dpbmRvd3Nfa2lsbENvbW1hbmQoKQorICAgICAgICAgICAgY29tbWFuZCA9IFtraWxsQ29t bWFuZCwgIi9mIiwgIi9pbSIsIGltYWdlX25hbWVdCiAgICAgICAgICAgICAjIHRhc2traWxsIHdp bGwgZXhpdCAxMjggaWYgdGhlIHByb2Nlc3MgaXMgbm90IGZvdW5kLiAgV2Ugc2hvdWxkIGxvZy4K ICAgICAgICAgICAgIHNlbGYucnVuX2NvbW1hbmQoY29tbWFuZCwgaWdub3JlX2Vycm9ycz1UcnVl KQogICAgICAgICAgICAgcmV0dXJuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5CmluZGV4 IDk3ZjlmYmYwYTE1Zi4uMDdmYTQxODFjNzQwIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvYmFz ZS5weQpAQCAtMTAzNiw3ICsxMDM2LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAgICAgICBz ZWxmLl93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIuc3RhcnQoKQogCiAgICAgZGVmIHdlYl9wbGF0 Zm9ybV90ZXN0X3NlcnZlcl9kb2Nfcm9vdChzZWxmKToKLSAgICAgICAgcmV0dXJuIHdlYl9wbGF0 Zm9ybV90ZXN0X3NlcnZlci5kb2Nfcm9vdChzZWxmKSArIHNlbGYuVEVTVF9QQVRIX1NFUEFSQVRP UgorICAgICAgICByZXR1cm4gd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyLmRvY19yb290KHNlbGYp LnJlcGxhY2UoJ1xcJywgc2VsZi5URVNUX1BBVEhfU0VQQVJBVE9SKSArIHNlbGYuVEVTVF9QQVRI X1NFUEFSQVRPUgogCiAgICAgZGVmIHdlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlcl9iYXNlX2h0dHBf dXJsKHNlbGYpOgogICAgICAgICByZXR1cm4gd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyLmJhc2Vf aHR0cF91cmwoc2VsZikK 392812 2020-03-06 16:53:28 -0800 2020-03-06 17:53:56 -0800 PATCH bug-208693.diff text/plain 3783 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiNDEw NTExMzE0NDkuLmUxYmY0NWY3YzkwNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAzLTA2ICBCYXN1a2UgU3V6 dWtpICA8YmFzdWtlLnN1enVraUBzb255LmNvbT4KKworICAgICAgICBbd2Via2l0cHldIEZpeCBl eGVjdXRpdmUgb24gV2luZG93cyB0byBydW4gd3B0IHNlcnZlciBjb3JyZWN0bHkKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwODY5MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyBmaXggZm9yIFdpbmRv d3MgZW52aXJvbm1lbnQgYSkgZml4aW5nIGEgdHlwby4gYikgZml4aW5nIHBhdGgKKyAgICAgICAg YykgZml4IGhvdyB0byBraWxsIHN1YnByb2Nlc3Nlcy4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHk6CisgICAgICAgIChFeGVjdXRpdmUuX3dp bmRvd3Nfa2lsbF9jb21tYW5kKToKKyAgICAgICAgKEV4ZWN1dGl2ZS5pbnRlcnJ1cHQpOgorICAg ICAgICAoRXhlY3V0aXZlLmtpbGxfYWxsKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3Bv cnQvYmFzZS5weToKKyAgICAgICAgKFBvcnQud2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyX2RvY19y b290KToKKwogMjAyMC0wMy0wMiAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXNvdXJjZUxvYWRTdGF0aXN0aWNzOiBFbmFibGUgY29va2llIGJsb2NraW5n IGFuZCB0aGUgU3RvcmFnZSBBY2Nlc3MgQVBJIGluIGVwaGVtZXJhbCBzZXNzaW9ucwpkaWZmIC0t Z2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weSBi L1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKaW5kZXgg OWUyZGE4ZGVjODc4Li44NjllMDRhY2NmMTggMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5weQpAQCAtMzIxLDI0ICszMjEsMzAgQEAgY2xh c3MgRXhlY3V0aXZlKEFic3RyYWN0RXhlY3V0aXZlKToKICAgICAgICAgICAgIHByb2Nlc3NfbmFt ZSA9ICIlcy5leGUiICUgbmFtZQogICAgICAgICByZXR1cm4gcHJvY2Vzc19uYW1lCiAKKyAgICBk ZWYgX3dpbmRvd3Nfa2lsbF9jb21tYW5kKHNlbGYpOgorICAgICAgICBpZiBzZWxmLl9pc19uYXRp dmVfd2luOgorICAgICAgICAgICAgcmV0dXJuIG9zLnBhdGguam9pbigiQzoiLCBvcy5zZXAsICJX SU5ET1dTIiwgInN5c3RlbTMyIiwgInRhc2traWxsLmV4ZSIpCisgICAgICAgIGVsc2U6CisgICAg ICAgICAgICByZXR1cm4gJ3Rhc2traWxsLmV4ZScKKwogICAgIGRlZiBpbnRlcnJ1cHQoc2VsZiwg cGlkKToKLSAgICAgICAgaW50ZXJydXB0X3NpZ25hbCA9IHNpZ25hbC5DVFJMX0NfRVZFTlQgaWYg c2VsZi5faXNfbmF0aXZlX3dpbiBlbHNlIHNpZ25hbC5TSUdJTlQKLSAgICAgICAgdHJ5OgotICAg ICAgICAgICAgb3Mua2lsbChwaWQsIGludGVycnVwdF9zaWduYWwpCi0gICAgICAgIGV4Y2VwdCBP U0Vycm9yOgotICAgICAgICAgICAgIyBTaWxlbnRseSBpZ25vcmUgd2hlbiB0aGUgcGlkIGRvZXNu J3QgZXhpc3QuCi0gICAgICAgICAgICAjIEl0J3MgaW1wb3NzaWJsZSBmb3IgY2FsbGVycyB0byBh dm9pZCByYWNlIGNvbmRpdGlvbnMgd2l0aCBwcm9jZXNzIHNodXRkb3duLgotICAgICAgICAgICAg cGFzcworICAgICAgICBpZiBzZWxmLl9pc19uYXRpdmVfd2luOgorICAgICAgICAgICAgY29tbWFu ZCA9IFtzZWxmLl93aW5kb3dzX2tpbGxfY29tbWFuZCgpLCAiL2YiLCAiL3QiLCAiL3BpZCIsIHN0 cihwaWQpXQorICAgICAgICAgICAgc2VsZi5ydW5fY29tbWFuZChjb21tYW5kLCBpZ25vcmVfZXJy b3JzPVRydWUpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAg ICAgb3Mua2lsbChwaWQsIHNpZ25hbC5TSUdJTlQpCisgICAgICAgICAgICBleGNlcHQgT1NFcnJv cjoKKyAgICAgICAgICAgICAgICAjIFNpbGVudGx5IGlnbm9yZSB3aGVuIHRoZSBwaWQgZG9lc24n dCBleGlzdC4KKyAgICAgICAgICAgICAgICAjIEl0J3MgaW1wb3NzaWJsZSBmb3IgY2FsbGVycyB0 byBhdm9pZCByYWNlIGNvbmRpdGlvbnMgd2l0aCBwcm9jZXNzIHNodXRkb3duLgorICAgICAgICAg ICAgICAgIHBhc3MKIAogICAgIGRlZiBraWxsX2FsbChzZWxmLCBwcm9jZXNzX25hbWUpOgogICAg ICAgICAiIiJBdHRlbXB0cyB0byBraWxsIHByb2Nlc3NlcyBtYXRjaGluZyBwcm9jZXNzX25hbWUu CiAgICAgICAgIFdpbGwgZmFpbCBzaWxlbnRseSBpZiBubyBwcm9jZXNzIGFyZSBmb3VuZC4iIiIK ICAgICAgICAgaWYgc2VsZi5faXNfY3lnd2luIG9yIHNlbGYuX2lzX25hdGl2ZV93aW46CiAgICAg ICAgICAgICBpbWFnZV9uYW1lID0gc2VsZi5fd2luZG93c19pbWFnZV9uYW1lKHByb2Nlc3NfbmFt ZSkKLSAgICAgICAgICAgIGtpbGxDb21tbWFuZCA9ICd0YXNra2lsbC5leGUnCi0gICAgICAgICAg ICBpZiBzZWxmLl9pc19uYXRpdmVfd2luOgotICAgICAgICAgICAgICAgIGtpbGxDb21tYW5kID0g b3MucGF0aC5qb2luKCdDOicsIG9zLnNlcCwgJ1dJTkRPV1MnLCAnc3lzdGVtMzInLCAndGFza2tp bGwuZXhlJykKLSAgICAgICAgICAgIGNvbW1hbmQgPSBba2lsbENvbW1tYW5kLCAiL2YiLCAiL2lt IiwgaW1hZ2VfbmFtZV0KKyAgICAgICAgICAgIGNvbW1hbmQgPSBbc2VsZi5fd2luZG93c19raWxs X2NvbW1hbmQoKSwgIi9mIiwgIi9pbSIsIGltYWdlX25hbWVdCiAgICAgICAgICAgICAjIHRhc2tr aWxsIHdpbGwgZXhpdCAxMjggaWYgdGhlIHByb2Nlc3MgaXMgbm90IGZvdW5kLiAgV2Ugc2hvdWxk IGxvZy4KICAgICAgICAgICAgIHNlbGYucnVuX2NvbW1hbmQoY29tbWFuZCwgaWdub3JlX2Vycm9y cz1UcnVlKQogICAgICAgICAgICAgcmV0dXJuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L3BvcnQvYmFzZS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9iYXNlLnB5 CmluZGV4IDk3ZjlmYmYwYTE1Zi4uMDdmYTQxODFjNzQwIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvYmFzZS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvYmFzZS5weQpAQCAtMTAzNiw3ICsxMDM2LDcgQEAgY2xhc3MgUG9ydChvYmplY3QpOgogICAg ICAgICBzZWxmLl93ZWJfcGxhdGZvcm1fdGVzdF9zZXJ2ZXIuc3RhcnQoKQogCiAgICAgZGVmIHdl Yl9wbGF0Zm9ybV90ZXN0X3NlcnZlcl9kb2Nfcm9vdChzZWxmKToKLSAgICAgICAgcmV0dXJuIHdl Yl9wbGF0Zm9ybV90ZXN0X3NlcnZlci5kb2Nfcm9vdChzZWxmKSArIHNlbGYuVEVTVF9QQVRIX1NF UEFSQVRPUgorICAgICAgICByZXR1cm4gd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVyLmRvY19yb290 KHNlbGYpLnJlcGxhY2UoJ1xcJywgc2VsZi5URVNUX1BBVEhfU0VQQVJBVE9SKSArIHNlbGYuVEVT VF9QQVRIX1NFUEFSQVRPUgogCiAgICAgZGVmIHdlYl9wbGF0Zm9ybV90ZXN0X3NlcnZlcl9iYXNl X2h0dHBfdXJsKHNlbGYpOgogICAgICAgICByZXR1cm4gd2ViX3BsYXRmb3JtX3Rlc3Rfc2VydmVy LmJhc2VfaHR0cF91cmwoc2VsZikK