190248 2018-10-03 07:21:55 -0700 [LayoutTests][Win] Stop wpt server correctly. 2018-10-04 09:57:25 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke bfulgham commit-queue ddkilzer don.olmstead ews-watchlist fujii glenn lforschler webkit-bug-importer youennf oldest_to_newest 1466052 0 basuke 2018-10-03 07:21:55 -0700 The wpt test server wasn't killed correctly which keep opening the log files and prevent following `archive-test-results` command. It is caused by mis-implementation of executive.interrupt(). 1466055 1 351518 basuke 2018-10-03 07:28:58 -0700 Created attachment 351518 PATCH 1466056 2 ews-watchlist 2018-10-03 07:31:28 -0700 Attachment 351518 did not pass style-queue: ERROR: Tools/Scripts/webkitpy/common/system/executive.py:312: [Executive.interrupt] Module 'signal' has no 'CTRL_C_EVENT' member [pylint/E1101] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1466057 3 basuke 2018-10-03 07:35:38 -0700 (In reply to Build Bot from comment #2) > Attachment 351518 [details] did not pass style-queue: > > > ERROR: Tools/Scripts/webkitpy/common/system/executive.py:312: > [Executive.interrupt] Module 'signal' has no 'CTRL_C_EVENT' member > [pylint/E1101] [5] > Total errors found: 1 in 2 files > > > If any of these errors are false positives, please file a bug against > check-webkit-style. This is false positive. The constant is available only on Windows. https://docs.python.org/2/library/signal.html#signal.CTRL_C_EVENT 1466069 4 351518 don.olmstead 2018-10-03 08:28:50 -0700 Comment on attachment 351518 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=351518&action=review Informal review is good. Just wondering if there's any way to just check if its windows native or cygwin in one line. > Tools/Scripts/webkitpy/common/system/executive.py:487 > + if self._is_cygwin or self._is_native_win: Is there any query for both at the same time? This is repeated in a couple places. 1466099 5 351518 basuke 2018-10-03 10:09:30 -0700 Comment on attachment 351518 PATCH View in context: https://bugs.webkit.org/attachment.cgi?id=351518&action=review >> Tools/Scripts/webkitpy/common/system/executive.py:487 >> + if self._is_cygwin or self._is_native_win: > > Is there any query for both at the same time? This is repeated in a couple places. In platformInfo, is_win() is also defined so that it should be. But after writing the code, I didn't read this code hard. I am okay for both. 1466285 6 fujii 2018-10-03 19:45:48 -0700 I also confirmed your patch solves the pywebsocket.ws.log-err.txt issue (Bug 190236). Thank you for working on this. 1466288 7 fujii 2018-10-03 19:46:26 -0700 *** Bug 190236 has been marked as a duplicate of this bug. *** 1466389 8 351518 commit-queue 2018-10-04 09:56:23 -0700 Comment on attachment 351518 PATCH Clearing flags on attachment: 351518 Committed r236835: <https://trac.webkit.org/changeset/236835> 1466390 9 commit-queue 2018-10-04 09:56:25 -0700 All reviewed patches have been landed. Closing bug. 1466392 10 webkit-bug-importer 2018-10-04 09:57:25 -0700 <rdar://problem/45011998> 351518 2018-10-03 07:28:58 -0700 2018-10-04 09:56:23 -0700 PATCH 190248.diff text/plain 8146 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjY2M3 ZDc3NTBkMy4uNmM4YzI4NmNjOTcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxOC0xMC0wMyAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW0xheW91dFRlc3RzXVtXaW5d IFN0b3Agd3B0IHNlcnZlciBjb3JyZWN0bHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTAyNDgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBVc2Ugc2lnbmFsLkNUUkxfQ19FVkVOVCBpbnN0ZWFkIG9mIHNp Z25hbC5TSUdJTlQgZm9yIFdpbmRvd3MuCisgICAgICAgIEFsc28gcmVmYWN0b3JpbmcgdGhlIGRl dGVjdGlvbiBvZiBXaW5kb3dzIGFuZCBjeWd3aW4gZW52aXJvbm1lbnQgY2hlY2suCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5OgorICAgICAg ICAoRXhlY3V0aXZlLl9faW5pdF9fKTogQ2hlY2sgZW52aXJvbm1lbnQgb25jZS4KKyAgICAgICAg KEV4ZWN1dGl2ZS5fc2hvdWxkX2Nsb3NlX2Zkcyk6CisgICAgICAgIChFeGVjdXRpdmUua2lsbF9w cm9jZXNzKToKKyAgICAgICAgKEV4ZWN1dGl2ZS5jaGVja19ydW5uaW5nX3BpZCk6CisgICAgICAg IChFeGVjdXRpdmUucnVubmluZ19waWRzKToKKyAgICAgICAgKEV4ZWN1dGl2ZS5pbnRlcnJ1cHQp OiBVc2Ugc2lnbmFsLkNUUkxfQ19FVkVOVCBmb3IgV2luZG93cy4KKyAgICAgICAgKEV4ZWN1dGl2 ZS5raWxsX2FsbCk6CisgICAgICAgIChFeGVjdXRpdmUuX2NoaWxkX3Byb2Nlc3NfZW5jb2Rpbmcp OgorICAgICAgICAoRXhlY3V0aXZlLl9zaG91bGRfZW5jb2RlX2NoaWxkX3Byb2Nlc3NfYXJndW1l bnRzKToKKyAgICAgICAgKEV4ZWN1dGl2ZS5wb3Blbik6CisgICAgICAgIChFeGVjdXRpdmUucnVu X2luX3BhcmFsbGVsKToKKwogMjAxOC0xMC0wMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViS2l0Ml0gRm9ybWF0ID4gQm9sZCBhbmQgRm9ybWF0 ID4gSXRhbGljIGRvbid0IHRvZ2dsZSBiZXR3ZWVuIGJvbGQgYW5kIGl0YWxpYyBzdHlsZQpkaWZm IC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2V4ZWN1dGl2ZS5w eSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKaW5k ZXggNDRkYjNjMTkyNGIuLjc3Y2JjZTg1OTRhIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vZXhlY3V0aXZlLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9leGVjdXRpdmUucHkKQEAgLTg2LDYgKzg2LDggQEAgY2xhc3Mg RXhlY3V0aXZlKEFic3RyYWN0RXhlY3V0aXZlKToKIAogICAgIGRlZiBfX2luaXRfXyhzZWxmKToK ICAgICAgICAgc2VsZi5waWRfdG9fc3lzdGVtX3BpZCA9IHt9CisgICAgICAgIHNlbGYuX2lzX25h dGl2ZV93aW4gPSBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnd2luJykKKyAgICAgICAgc2VsZi5f aXNfY3lnd2luID0gc3lzLnBsYXRmb3JtID09ICdjeWd3aW4nCiAKICAgICBkZWYgX3Nob3VsZF9j bG9zZV9mZHMoc2VsZik6CiAgICAgICAgICMgV2UgbmVlZCB0byBwYXNzIGNsb3NlX2Zkcz1UcnVl IHRvIHdvcmsgYXJvdW5kIFB5dGhvbiBidWcgIzIzMjAKQEAgLTk0LDcgKzk2LDcgQEAgY2xhc3Mg RXhlY3V0aXZlKEFic3RyYWN0RXhlY3V0aXZlKToKICAgICAgICAgIyBJbiBQeXRob24gMi43LjEw LCBjbG9zZV9mZHMgaXMgYWxzbyBzdXBwb3J0ZWQgb24gV2luZG93cy4KICAgICAgICAgIyBIb3dl dmVyLCAieW91IGNhbm5vdCBzZXQgY2xvc2VfZmRzIHRvIHRydWUgYW5kIGFsc28gcmVkaXJlY3Qg dGhlIHN0YW5kYXJkCiAgICAgICAgICMgaGFuZGxlcyBieSBzZXR0aW5nIHN0ZGluLCBzdGRvdXQg b3Igc3RkZXJyLiIuCi0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4nKToK KyAgICAgICAgaWYgc2VsZi5faXNfbmF0aXZlX3dpbjoKICAgICAgICAgICAgIHJldHVybiBGYWxz ZQogICAgICAgICBlbHNlOgogICAgICAgICAgICAgcmV0dXJuIFRydWUKQEAgLTE2Nyw3ICsxNjks NyBAQCBjbGFzcyBFeGVjdXRpdmUoQWJzdHJhY3RFeGVjdXRpdmUpOgogCiAgICAgICAgICIiIkF0 dGVtcHRzIHRvIGtpbGwgdGhlIGdpdmVuIHBpZC4KICAgICAgICAgV2lsbCBmYWlsIHNpbGVudGx5 IGlmIHBpZCBkb2VzIG5vdCBleGlzdCBvciBpbnN1ZmZpY2llbnQgcGVybWlzc3Npb25zLiIiIgot ICAgICAgICBpZiBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnd2luMzInKToKKyAgICAgICAgaWYg c2VsZi5faXNfbmF0aXZlX3dpbjoKICAgICAgICAgICAgICMgV2Ugb25seSB1c2UgdGFza2tpbGwu ZXhlIG9uIHdpbmRvd3MgKG5vdCBjeWd3aW4pIGJlY2F1c2Ugc3VicHJvY2Vzcy5waWQKICAgICAg ICAgICAgICMgaXMgYSBDWUdXSU4gcGlkIGFuZCB0YXNra2lsbC5leGUgZXhwZWN0cyBhIHdpbmRv d3MgcGlkLgogICAgICAgICAgICAgIyBUaGFua2Z1bGx5IG9zLmtpbGwgb24gQ1lHV0lOIGhhbmRs ZXMgZWl0aGVyIHBpZCB0eXBlLgpAQCAtMTgwLDcgKzE4Miw3IEBAIGNsYXNzIEV4ZWN1dGl2ZShB YnN0cmFjdEV4ZWN1dGl2ZSk6CiAgICAgICAgICMgQWNjb3JkaW5nIHRvIGh0dHA6Ly9kb2NzLnB5 dGhvbi5vcmcvbGlicmFyeS9vcy5odG1sCiAgICAgICAgICMgb3Mua2lsbCBpc24ndCBhdmFpbGFi bGUgb24gV2luZG93cy4gcHl0aG9uIDIuNS41IG9zLmtpbGwgYXBwZWFycwogICAgICAgICAjIHRv IHdvcmsgaW4gY3lnd2luLCBob3dldmVyIGl0IG9jY2FzaW9uYWxseSByYWlzZXMgRUFHQUlOLgot ICAgICAgICByZXRyaWVzX2xlZnQgPSAxMCBpZiBzeXMucGxhdGZvcm0gPT0gImN5Z3dpbiIgZWxz ZSAyCisgICAgICAgIHJldHJpZXNfbGVmdCA9IDEwIGlmIHNlbGYuX2lzX2N5Z3dpbiBlbHNlIDIK ICAgICAgICAgY3VycmVudF9zaWduYWwgPSBzaWduYWwuU0lHVEVSTQogICAgICAgICB3aGlsZSBy ZXRyaWVzX2xlZnQgPiAwIGFuZCBzZWxmLmNoZWNrX3J1bm5pbmdfcGlkKHBpZCk6CiAgICAgICAg ICAgICB0cnk6CkBAIC0xOTksNyArMjAxLDcgQEAgY2xhc3MgRXhlY3V0aXZlKEFic3RyYWN0RXhl Y3V0aXZlKToKICAgICAgICAgICAgICAgICBlbGlmIGUuZXJybm8gPT0gZXJybm8uRUNISUxEOgog ICAgICAgICAgICAgICAgICAgICAjIENhbid0IHdhaXQgb24gYSBub24tY2hpbGQgcHJvY2Vzcywg YnV0IHRoZSBraWxsIHdvcmtlZC4KICAgICAgICAgICAgICAgICAgICAgcmV0dXJuCi0gICAgICAg ICAgICAgICAgZWxpZiBlLmVycm5vID09IGVycm5vLkVBQ0NFUyBhbmQgc3lzLnBsYXRmb3JtID09 ICdjeWd3aW4nOgorICAgICAgICAgICAgICAgIGVsaWYgZS5lcnJubyA9PSBlcnJuby5FQUNDRVMg YW5kIHNlbGYuX2lzX2N5Z3dpbjoKICAgICAgICAgICAgICAgICAgICAgIyBDeWd3aW4gcHl0aG9u IHNvbWV0aW1lcyBjYW4ndCBraWxsIG5hdGl2ZSBwcm9jZXNzZXMuCiAgICAgICAgICAgICAgICAg ICAgIHJldHVybgogICAgICAgICAgICAgICAgIGVsc2U6CkBAIC0yNTQsNyArMjU2LDcgQEAgY2xh c3MgRXhlY3V0aXZlKEFic3RyYWN0RXhlY3V0aXZlKToKICAgICAgICAgICAgIHJldHVybiBGYWxz ZQogCiAgICAgICAgICIiIlJldHVybiBUcnVlIGlmIHBpZCBpcyBhbGl2ZSwgb3RoZXJ3aXNlIHJl dHVybiBGYWxzZS4iIiIKLSAgICAgICAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ3dpbicp OgorICAgICAgICBpZiBzZWxmLl9pc19uYXRpdmVfd2luOgogICAgICAgICAgICAgcmV0dXJuIHNl bGYuX3dpbjMyX2NoZWNrX3J1bm5pbmdfcGlkKHBpZCkKIAogICAgICAgICB0cnk6CkBAIC0yNjQs NyArMjY2LDcgQEAgY2xhc3MgRXhlY3V0aXZlKEFic3RyYWN0RXhlY3V0aXZlKToKICAgICAgICAg ICAgIHJldHVybiBGYWxzZQogCiAgICAgZGVmIHJ1bm5pbmdfcGlkcyhzZWxmLCBwcm9jZXNzX25h bWVfZmlsdGVyPU5vbmUpOgotICAgICAgICBpZiBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnd2lu Jyk6CisgICAgICAgIGlmIHNlbGYuX2lzX25hdGl2ZV93aW46CiAgICAgICAgICAgICAjIEZJWE1F OiBydW5uaW5nX3BpZHMgaXNuJ3QgaW1wbGVtZW50ZWQgb24gbmF0aXZlIFdpbmRvd3MgeWV0Li4u CiAgICAgICAgICAgICByZXR1cm4gW10KIApAQCAtMjcyLDcgKzI3NCw3IEBAIGNsYXNzIEV4ZWN1 dGl2ZShBYnN0cmFjdEV4ZWN1dGl2ZSk6CiAgICAgICAgICAgICBwcm9jZXNzX25hbWVfZmlsdGVy ID0gbGFtYmRhIHByb2Nlc3NfbmFtZTogVHJ1ZQogCiAgICAgICAgIHJ1bm5pbmdfcGlkcyA9IFtd Ci0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybSBpbiAoImN5Z3dpbiIpOgorICAgICAgICBpZiBzZWxm Ll9pc19jeWd3aW46CiAgICAgICAgICAgICBwc19wcm9jZXNzID0gc2VsZi5ydW5fY29tbWFuZChb J3BzJywgJy1lJ10sIGlnbm9yZV9lcnJvcnM9VHJ1ZSkKICAgICAgICAgICAgIGZvciBsaW5lIGlu IHBzX3Byb2Nlc3Muc3BsaXRsaW5lcygpOgogICAgICAgICAgICAgICAgIHRva2VucyA9IGxpbmUu c3RyaXAoKS5zcGxpdCgpCkBAIC0zMDcsOSArMzA5LDcgQEAgY2xhc3MgRXhlY3V0aXZlKEFic3Ry YWN0RXhlY3V0aXZlKToKICAgICAgICAgcmV0dXJuIHByb2Nlc3NfbmFtZQogCiAgICAgZGVmIGlu dGVycnVwdChzZWxmLCBwaWQpOgotICAgICAgICBpbnRlcnJ1cHRfc2lnbmFsID0gc2lnbmFsLlNJ R0lOVAotICAgICAgICAjIEZJWE1FOiBUaGUgcHl0aG9uIGRvY3Mgc2VlbSB0byBpbXBseSB0aGF0 IHBsYXRmb3JtID09ICd3aW4zMicgbWF5IG5lZWQgdG8gdXNlIHNpZ25hbC5DVFJMX0NfRVZFTlQK LSAgICAgICAgIyBodHRwOi8vZG9jcy5weXRob24ub3JnLzIvbGlicmFyeS9zaWduYWwuaHRtbAor ICAgICAgICBpbnRlcnJ1cHRfc2lnbmFsID0gc2lnbmFsLkNUUkxfQ19FVkVOVCBpZiBzZWxmLl9p c19uYXRpdmVfd2luIGVsc2Ugc2lnbmFsLlNJR0lOVAogICAgICAgICB0cnk6CiAgICAgICAgICAg ICBvcy5raWxsKHBpZCwgaW50ZXJydXB0X3NpZ25hbCkKICAgICAgICAgZXhjZXB0IE9TRXJyb3I6 CkBAIC0zMjAsMTAgKzMyMCwxMCBAQCBjbGFzcyBFeGVjdXRpdmUoQWJzdHJhY3RFeGVjdXRpdmUp OgogICAgIGRlZiBraWxsX2FsbChzZWxmLCBwcm9jZXNzX25hbWUpOgogICAgICAgICAiIiJBdHRl bXB0cyB0byBraWxsIHByb2Nlc3NlcyBtYXRjaGluZyBwcm9jZXNzX25hbWUuCiAgICAgICAgIFdp bGwgZmFpbCBzaWxlbnRseSBpZiBubyBwcm9jZXNzIGFyZSBmb3VuZC4iIiIKLSAgICAgICAgaWYg c3lzLnBsYXRmb3JtID09ICdjeWd3aW4nIG9yIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4n KToKKyAgICAgICAgaWYgc2VsZi5faXNfY3lnd2luIG9yIHNlbGYuX2lzX25hdGl2ZV93aW46CiAg ICAgICAgICAgICBpbWFnZV9uYW1lID0gc2VsZi5fd2luZG93c19pbWFnZV9uYW1lKHByb2Nlc3Nf bmFtZSkKICAgICAgICAgICAgIGtpbGxDb21tbWFuZCA9ICd0YXNra2lsbC5leGUnCi0gICAgICAg ICAgICBpZiBzeXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnd2luJyk6CisgICAgICAgICAgICBpZiBz ZWxmLl9pc19uYXRpdmVfd2luOgogICAgICAgICAgICAgICAgIGtpbGxDb21tYW5kID0gb3MucGF0 aC5qb2luKCdDOicsIG9zLnNlcCwgJ1dJTkRPV1MnLCAnc3lzdGVtMzInLCAndGFza2tpbGwuZXhl JykKICAgICAgICAgICAgIGNvbW1hbmQgPSBba2lsbENvbW1tYW5kLCAiL2YiLCAiL2ltIiwgaW1h Z2VfbmFtZV0KICAgICAgICAgICAgICMgdGFza2tpbGwgd2lsbCBleGl0IDEyOCBpZiB0aGUgcHJv Y2VzcyBpcyBub3QgZm91bmQuICBXZSBzaG91bGQgbG9nLgpAQCAtNDE2LDcgKzQxNiw3IEBAIGNs YXNzIEV4ZWN1dGl2ZShBYnN0cmFjdEV4ZWN1dGl2ZSk6CiAgICAgICAgICMgV2luMzIgUHl0aG9u IDIueCB1c2VzIENyZWF0ZVByb2Nlc3NBIHJhdGhlciB0aGFuIENyZWF0ZVByb2Nlc3NXCiAgICAg ICAgICMgdG8gbGF1bmNoIHN1YnByb2Nlc3Nlcywgc28gd2UgaGF2ZSB0byBlbmNvZGUgYXJndW1l bnRzIHVzaW5nIHRoZQogICAgICAgICAjIGN1cnJlbnQgY29kZSBwYWdlLgotICAgICAgICBpZiBz eXMucGxhdGZvcm0uc3RhcnRzd2l0aCgnd2luJykgYW5kIHN5cy52ZXJzaW9uIDwgJzMnOgorICAg ICAgICBpZiBzZWxmLl9pc19uYXRpdmVfd2luIGFuZCBzeXMudmVyc2lvbiA8ICczJzoKICAgICAg ICAgICAgIHJldHVybiAnbWJjcycKICAgICAgICAgIyBBbGwgb3RoZXIgcGxhdGZvcm1zIHVzZSBV VEYtOC4KICAgICAgICAgIyBGSVhNRTogVXNpbmcgVVRGLTggb24gQ3lnd2luIHdpbGwgY29uZnVz ZSBXaW5kb3dzLW5hdGl2ZSBjb21tYW5kcwpAQCAtNDI3LDEzICs0MjcsMTMgQEAgY2xhc3MgRXhl Y3V0aXZlKEFic3RyYWN0RXhlY3V0aXZlKToKICAgICBkZWYgX3Nob3VsZF9lbmNvZGVfY2hpbGRf cHJvY2Vzc19hcmd1bWVudHMoc2VsZik6CiAgICAgICAgICMgQ3lnd2luJ3MgUHl0aG9uJ3Mgb3Mu ZXhlY3YgZG9lc24ndCBzdXBwb3J0IHVuaWNvZGUgY29tbWFuZAogICAgICAgICAjIGFyZ3VtZW50 cywgYW5kIG5laXRoZXIgZG9lcyBDeWd3aW4ncyBleGVjdiBpdHNlbGYuCi0gICAgICAgIGlmIHN5 cy5wbGF0Zm9ybSA9PSAnY3lnd2luJzoKKyAgICAgICAgaWYgc2VsZi5faXNfY3lnd2luOgogICAg ICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgICAgICAjIFdpbjMyIFB5dGhvbiAyLnggdXNlcyBD cmVhdGVQcm9jZXNzQSByYXRoZXIgdGhhbiBDcmVhdGVQcm9jZXNzVwogICAgICAgICAjIHRvIGxh dW5jaCBzdWJwcm9jZXNzZXMsIHNvIHdlIGhhdmUgdG8gZW5jb2RlIGFyZ3VtZW50cyB1c2luZyB0 aGUKICAgICAgICAgIyBjdXJyZW50IGNvZGUgcGFnZS4KLSAgICAgICAgaWYgc3lzLnBsYXRmb3Jt LnN0YXJ0c3dpdGgoJ3dpbicpIGFuZCBzeXMudmVyc2lvbiA8ICczJzoKKyAgICAgICAgaWYgc2Vs Zi5faXNfbmF0aXZlX3dpbiBhbmQgc3lzLnZlcnNpb24gPCAnMyc6CiAgICAgICAgICAgICByZXR1 cm4gVHJ1ZQogCiAgICAgICAgIHJldHVybiBGYWxzZQpAQCAtNDU0LDcgKzQ1NCw3IEBAIGNsYXNz IEV4ZWN1dGl2ZShBYnN0cmFjdEV4ZWN1dGl2ZSk6CiAKICAgICAjIFRoZSBvbmx5IHJlcXVpcmVk IGFyZ3VtZW50IHRvIHBvcGVuIGlzIG5hbWVkICJhcmdzIiwgdGhlIHJlc3QgYXJlIG9wdGlvbmFs IGtleXdvcmQgYXJndW1lbnRzLgogICAgIGRlZiBwb3BlbihzZWxmLCBhcmdzLCAqKmt3YXJncyk6 Ci0gICAgICAgIGlmIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4nKToKKyAgICAgICAgaWYg c2VsZi5faXNfbmF0aXZlX3dpbjoKICAgICAgICAgICAgIF9sb2cuZGVidWcoIkxvb2tpbmcgYXQg ezB9Ii5mb3JtYXQoYXJncykpCiAgICAgICAgICAgICAjIE11c3QgaW5jbHVkZSBwcm9wZXIgaW50 ZXJwcmV0ZXIKICAgICAgICAgICAgIGlmIHNlbGYuX25lZWRzX2ludGVycHJldGVyX2NoZWNrKGFy Z3NbMF0pOgpAQCAtNDg0LDcgKzQ4NCw3IEBAIGNsYXNzIEV4ZWN1dGl2ZShBYnN0cmFjdEV4ZWN1 dGl2ZSk6CiAgICAgICAgICIiIlJ1bnMgYSBsaXN0IG9mIChjbWRfbGluZSBsaXN0LCBjd2Qgc3Ry aW5nKSB0dXBsZXMgaW4gcGFyYWxsZWwgYW5kIHJldHVybnMgYSBsaXN0IG9mIChyZXRjb2RlLCBz dGRvdXQsIHN0ZGVycikgdHVwbGVzLiIiIgogICAgICAgICBhc3NlcnQgbGVuKGNvbW1hbmRfbGlu ZXNfYW5kX2N3ZHMpCiAKLSAgICAgICAgaWYgc3lzLnBsYXRmb3JtID09ICdjeWd3aW4nIG9yIHN5 cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCd3aW4nKToKKyAgICAgICAgaWYgc2VsZi5faXNfY3lnd2lu IG9yIHNlbGYuX2lzX25hdGl2ZV93aW46CiAgICAgICAgICAgICByZXR1cm4gbWFwKF9ydW5fY29t bWFuZF90aHVuaywgY29tbWFuZF9saW5lc19hbmRfY3dkcykKICAgICAgICAgcG9vbCA9IG11bHRp cHJvY2Vzc2luZy5Qb29sKHByb2Nlc3Nlcz1wcm9jZXNzZXMpCiAgICAgICAgIHJlc3VsdHMgPSBw b29sLm1hcChfcnVuX2NvbW1hbmRfdGh1bmssIGNvbW1hbmRfbGluZXNfYW5kX2N3ZHMpCg==