184715 2018-04-17 16:06:29 -0700 Fix archive step for WinCairo build bot. 2018-04-18 12:05:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ross.kirsling ross.kirsling achristensen bfulgham commit-queue dbates don.olmstead lforschler webkit-bug-importer oldest_to_newest 1415316 0 ross.kirsling 2018-04-17 16:06:29 -0700 Fix archive step for WinCairo build bot. 1415317 1 338155 ross.kirsling 2018-04-17 16:07:31 -0700 Created attachment 338155 Patch 1415321 2 ross.kirsling 2018-04-17 16:10:11 -0700 *** Bug 149715 has been marked as a duplicate of this bug. *** 1415323 3 338156 ross.kirsling 2018-04-17 16:12:25 -0700 Created attachment 338156 Patch 1415327 4 338156 lforschler 2018-04-17 16:23:42 -0700 Comment on attachment 338156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338156&action=review > Tools/BuildSlaveSupport/built-product-archive:216 > + binType = 'bin64' if os.path.exists(os.path.join(_configurationBuildDirectory, 'bin64')) else 'bin32' I'm working on a discussion with Windows folks here... if we have bots that build both 32bit and 64bit, it's possible this would always return bin64... breaking the 32bit case. It might be best to put the wincairo logic into it's own else block to avoid any unexpected behavior on the 'win' platform. 1415340 5 338156 bfulgham 2018-04-17 16:44:57 -0700 Comment on attachment 338156 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338156&action=review >> Tools/BuildSlaveSupport/built-product-archive:216 >> + binType = 'bin64' if os.path.exists(os.path.join(_configurationBuildDirectory, 'bin64')) else 'bin32' > > I'm working on a discussion with Windows folks here... if we have bots that build both 32bit and 64bit, it's possible this would always return bin64... breaking the 32bit case. > It might be best to put the wincairo logic into it's own else block to avoid any unexpected behavior on the 'win' platform. I don't think we have any bots that work this way currently -- I think they build bin64 or bin32. We had talked about doing this for machines that only built occasionally, but never actually got around to doing so. 1415343 6 lforschler 2018-04-17 16:54:46 -0700 (In reply to Brent Fulgham from comment #5) > Comment on attachment 338156 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=338156&action=review > > >> Tools/BuildSlaveSupport/built-product-archive:216 > >> + binType = 'bin64' if os.path.exists(os.path.join(_configurationBuildDirectory, 'bin64')) else 'bin32' > > > > I'm working on a discussion with Windows folks here... if we have bots that build both 32bit and 64bit, it's possible this would always return bin64... breaking the 32bit case. > > It might be best to put the wincairo logic into it's own else block to avoid any unexpected behavior on the 'win' platform. > > I don't think we have any bots that work this way currently -- I think they > build bin64 or bin32. We had talked about doing this for machines that only > built occasionally, but never actually got around to doing so. If that is the case, then this change as-is would not currently break anything... but would break something (32bit) if we do move to building both 64 and 32bit on the same machine in the future. My instinct thinks it would be much harder to debug a scenario like that in the future, and we should guard against it now. I do like the idea of using a flag... but we'd need to support that through the entire path (possibly including buildbot) 1415344 7 don.olmstead 2018-04-17 16:56:07 -0700 (In reply to Lucas Forschler from comment #6) > (In reply to Brent Fulgham from comment #5) > > Comment on attachment 338156 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=338156&action=review > > > > >> Tools/BuildSlaveSupport/built-product-archive:216 > > >> + binType = 'bin64' if os.path.exists(os.path.join(_configurationBuildDirectory, 'bin64')) else 'bin32' > > > > > > I'm working on a discussion with Windows folks here... if we have bots that build both 32bit and 64bit, it's possible this would always return bin64... breaking the 32bit case. > > > It might be best to put the wincairo logic into it's own else block to avoid any unexpected behavior on the 'win' platform. > > > > I don't think we have any bots that work this way currently -- I think they > > build bin64 or bin32. We had talked about doing this for machines that only > > built occasionally, but never actually got around to doing so. > > If that is the case, then this change as-is would not currently break > anything... but would break something (32bit) if we do move to building both > 64 and 32bit on the same machine in the future. My instinct thinks it would > be much harder to debug a scenario like that in the future, and we should > guard against it now. I do like the idea of using a flag... but we'd need to > support that through the entire path (possibly including buildbot) Is there any sort of logging or file naming that might clear this up? So that way for sure it shows its 32-bit or 64-bit in the case of debugging? 1415609 8 lforschler 2018-04-18 11:33:02 -0700 It doesn't sound like there is any objection to landing this as-is... we just need to be careful in the future about any bot building both 32 and 64. 1415629 9 338156 commit-queue 2018-04-18 12:04:12 -0700 Comment on attachment 338156 Patch Clearing flags on attachment: 338156 Committed r230772: <https://trac.webkit.org/changeset/230772> 1415630 10 commit-queue 2018-04-18 12:04:14 -0700 All reviewed patches have been landed. Closing bug. 1415631 11 webkit-bug-importer 2018-04-18 12:05:18 -0700 <rdar://problem/39535892> 338155 2018-04-17 16:07:31 -0700 2018-04-17 16:12:23 -0700 Patch bug-184715-20180417160730.patch text/plain 4580 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNzEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmYwZGUzN2VhMmQ3YjI0ODNkZGNiOGE3ODVlYTQ1NWQ3 Yzc1OTBhNy4uZGQzYmNkZTVhODQ2NDM4ZDJhMDA3YzVmMzgwY2NkNzFlMjEwMWQ1MSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDE4LTA0LTE3ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBGaXggYXJjaGl2ZSBzdGVwIGZvciBXaW5DYWlybyBidWlsZCBib3QuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ3MTUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVT dXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZToKKyAgICAgICAgKGFyY2hpdmVCdWlsdFByb2R1 Y3QpOgorICAgICAgICAoZXh0cmFjdEJ1aWx0UHJvZHVjdCk6CisgICAgICAgICogQnVpbGRTbGF2 ZVN1cHBvcnQvdGVzdC1yZXN1bHQtYXJjaGl2ZToKKyAgICAgICAgKGFyY2hpdmVfdGVzdF9yZXN1 bHRzKToKKwogMjAxOC0wNC0xNyAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGQgc3lzdGVtIHRyYWNlIHBvaW50cyBmb3IgcHJvY2VzcyBsYXVuY2ggYW5kIGZv ciBpbml0aWFsaXplV2ViUHJvY2VzcwpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBv cnQvYnVpbHQtcHJvZHVjdC1hcmNoaXZlIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbHQt cHJvZHVjdC1hcmNoaXZlCmluZGV4IGVjM2I2MTZkZjk2NGFkZjVmYjI2OWJmNjkyODY5NDNmYjg5 YWVlOWQuLjllMDEwZjlkZTNmOWRlNjY5YzBjYjJlNTdjYTMyYzQ3NWNlMzM0ZmYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQorKysgYi9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsdC1wcm9kdWN0LWFyY2hpdmUKQEAgLTE5Myw3ICsx OTMsNyBAQCBkZWYgbWluaWZ5RGlyZWN0b3J5KHBsYXRmb3JtLCBkaXJlY3RvcnkpOgogCiAKIGRl ZiBhcmNoaXZlQnVpbHRQcm9kdWN0KGNvbmZpZ3VyYXRpb24sIHBsYXRmb3JtLCBmdWxsUGxhdGZv cm0sIG1pbmlmeT1GYWxzZSk6Ci0gICAgYXNzZXJ0IHBsYXRmb3JtIGluICgnbWFjJywgJ3dpbics ICdndGsnLCAnaW9zJywgJ3dwZScpCisgICAgYXNzZXJ0IHBsYXRmb3JtIGluICgnbWFjJywgJ3dp bicsICdndGsnLCAnaW9zJywgJ3dwZScsICd3aW5jYWlybycpCiAKICAgICBpZiBwbGF0Zm9ybSA9 PSAnaW9zJzoKICAgICAgICAgY29tYmluZWREaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4oX3RvcExl dmVsQnVpbGREaXJlY3RvcnksICdjb21iaW5lZC1tYWMtYW5kLWlvcycpCkBAIC0yMTIsMTEgKzIx MiwxMSBAQCBkZWYgYXJjaGl2ZUJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwg ZnVsbFBsYXRmb3JtLCBtaW5pZnk9RmFsc2UpOgogICAgICAgICBpZiBtaW5pZnk6CiAgICAgICAg ICAgICBtaW5pZnlEaXJlY3RvcnkocGxhdGZvcm0sIF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3Rv cnkpCiAgICAgICAgIHJldHVybiBjcmVhdGVaaXAoX2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9y eSwgY29uZmlndXJhdGlvbiwgZW1iZWRQYXJlbnREaXJlY3RvcnlOYW1lT25EYXJ3aW49VHJ1ZSwg bWluaWZ5PW1pbmlmeSkKLSAgICBlbGlmIHBsYXRmb3JtID09ICd3aW4nOgotICAgICAgICAjIEZJ WE1FOiBXZSBzaG91bGRuJ3QgaGFyZGNvZGUgdGhlIGFzc3VtcHRpb24gb2YgYSAzMi1iaXQgYnVp bGQuIFNlZSA8aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0OTcxNT4u Ci0gICAgICAgIGJpbkRpcmVjdG9yeSA9IG9zLnBhdGguam9pbihfY29uZmlndXJhdGlvbkJ1aWxk RGlyZWN0b3J5LCAnYmluMzInKQorICAgIGVsaWYgcGxhdGZvcm0gaW4gKCd3aW4nLCAnd2luY2Fp cm8nKToKKyAgICAgICAgYmluVHlwZSA9ICdiaW42NCcgaWYgb3MucGF0aC5leGlzdHMob3MucGF0 aC5qb2luKF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnksICdiaW42NCcpKSBlbHNlICdiaW4z MicKKyAgICAgICAgYmluRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKF9jb25maWd1cmF0aW9uQnVp bGREaXJlY3RvcnksIGJpblR5cGUpCiAgICAgICAgIHRoaW5EaXJlY3RvcnkgPSBvcy5wYXRoLmpv aW4oX2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwgJ3RoaW4nKQotICAgICAgICB0aGluQmlu RGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKHRoaW5EaXJlY3RvcnksICJiaW4zMiIpCisgICAgICAg IHRoaW5CaW5EaXJlY3RvcnkgPSBvcy5wYXRoLmpvaW4odGhpbkRpcmVjdG9yeSwgYmluVHlwZSkK IAogICAgICAgICByZW1vdmVEaXJlY3RvcnlJZkV4aXN0cyh0aGluRGlyZWN0b3J5KQogICAgICAg ICBjb3B5QnVpbGRGaWxlcyhiaW5EaXJlY3RvcnksIHRoaW5CaW5EaXJlY3RvcnksIFsnKi5pbGsn XSkKQEAgLTI1OSw3ICsyNTksNyBAQCBkZWYgdW56aXBBcmNoaXZlKGRpcmVjdG9yeVRvRXh0cmFj dFRvLCBjb25maWd1cmF0aW9uKToKIAogCiBkZWYgZXh0cmFjdEJ1aWx0UHJvZHVjdChjb25maWd1 cmF0aW9uLCBwbGF0Zm9ybSk6Ci0gICAgYXNzZXJ0IHBsYXRmb3JtIGluICgnbWFjJywgJ3dpbics ICdndGsnLCAnaW9zJywgJ3dwZScpCisgICAgYXNzZXJ0IHBsYXRmb3JtIGluICgnbWFjJywgJ3dp bicsICdndGsnLCAnaW9zJywgJ3dwZScsICd3aW5jYWlybycpCiAKICAgICBhcmNoaXZlRmlsZSA9 IG9zLnBhdGguam9pbihfdG9wTGV2ZWxCdWlsZERpcmVjdG9yeSwgY29uZmlndXJhdGlvbiArICcu emlwJykKIApAQCAtMjY4LDcgKzI2OCw3IEBAIGRlZiBleHRyYWN0QnVpbHRQcm9kdWN0KGNvbmZp Z3VyYXRpb24sIHBsYXRmb3JtKToKIAogICAgIGlmIHBsYXRmb3JtIGluICgnbWFjJywgJ2lvcycp OgogICAgICAgICByZXR1cm4gdW56aXBBcmNoaXZlKF90b3BMZXZlbEJ1aWxkRGlyZWN0b3J5LCBj b25maWd1cmF0aW9uKQotICAgIGVsaWYgcGxhdGZvcm0gPT0gJ3dpbicgb3IgcGxhdGZvcm0gPT0g J2d0aycgb3IgcGxhdGZvcm0gPT0gJ3dwZSc6CisgICAgZWxpZiBwbGF0Zm9ybSBpbiAoJ3dpbics ICdndGsnLCAnd3BlJywgJ3dpbmNhaXJvJyk6CiAgICAgICAgIHByaW50ICdFeHRyYWN0aW5nJywg X2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeQogICAgICAgICByZXR1cm4gdW56aXBBcmNoaXZl KF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24pCiAKZGlmZiAtLWdp dCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L3Rlc3QtcmVzdWx0LWFyY2hpdmUgYi9Ub29scy9C dWlsZFNsYXZlU3VwcG9ydC90ZXN0LXJlc3VsdC1hcmNoaXZlCmluZGV4IGMxYWU3MDkzM2Y0MDY4 NzNiYzIxNzZlNDQxYjUwN2NlOTUzOTQ3NDAuLjgyOTU5YjFjZjViYWVkNWFmMzgxOWUwODNjYjQw N2Q2MDQzYTU2ZTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L3Rlc3QtcmVz dWx0LWFyY2hpdmUKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvdGVzdC1yZXN1bHQtYXJj aGl2ZQpAQCAtNTksNyArNTksNyBAQCBkZWYgY29tcHJlc3Nfc3BpbmR1bXBzKGxheW91dFRlc3RS ZXN1bHRzRGlyKToKICAgICAgICAgICAgICAgICAgICAgZ3ppcF9maWxlKHJvb3QsIG5hbWUpCiAK IGRlZiBhcmNoaXZlX3Rlc3RfcmVzdWx0cyhjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwgbGF5b3V0 VGVzdFJlc3VsdHNEaXIpOgotICAgIGFzc2VydCBwbGF0Zm9ybSBpbiAoJ21hYycsICd3aW4nLCAn Z3RrJywgJ3dpbmNhaXJvJywgJ2lvcycsICd3cGUnKQorICAgIGFzc2VydCBwbGF0Zm9ybSBpbiAo J21hYycsICd3aW4nLCAnZ3RrJywgJ3dpbmNhaXJvJywgJ2lvcycsICd3cGUnLCAnd2luY2Fpcm8n KQogCiAgICAgdHJ5OgogICAgICAgICBvcy51bmxpbmsoYXJjaGl2ZUZpbGUpCkBAIC04MCw3ICs4 MCw3IEBAIGRlZiBhcmNoaXZlX3Rlc3RfcmVzdWx0cyhjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSwg bGF5b3V0VGVzdFJlc3VsdHNEaXIpOgogICAgICAgICBjb21wcmVzc19zcGluZHVtcHMobGF5b3V0 VGVzdFJlc3VsdHNEaXIpCiAgICAgICAgIGlmIHN1YnByb2Nlc3MuY2FsbChbImRpdHRvIiwgIi1j IiwgIi1rIiwgIi0tc2VxdWVzdGVyUnNyYyIsICItLXpsaWJDb21wcmVzc2lvbkxldmVsIiwgIjIi LCBsYXlvdXRUZXN0UmVzdWx0c0RpciwgYXJjaGl2ZUZpbGVdKToKICAgICAgICAgICAgIHJldHVy biAxCi0gICAgZWxpZiBwbGF0Zm9ybSBpbiAoJ3dpbicsICdndGsnLCAnd2luY2Fpcm8nLCAnd3Bl Jyk6CisgICAgZWxpZiBwbGF0Zm9ybSBpbiAoJ3dpbicsICdndGsnLCAnd2luY2Fpcm8nLCAnd3Bl JywgJ3dpbmNhaXJvJyk6CiAgICAgICAgIGlmIHN1YnByb2Nlc3MuY2FsbChbInppcCIsICItciIs ICItMiIsIGFyY2hpdmVGaWxlLCAiLiJdLCBjd2Q9bGF5b3V0VGVzdFJlc3VsdHNEaXIpOgogICAg ICAgICAgICAgcmV0dXJuIDEKIAo= 338156 2018-04-17 16:12:25 -0700 2018-04-18 12:04:12 -0700 Patch bug-184715-20180417161224.patch text/plain 3271 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNzEzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYmYwZGUzN2VhMmQ3YjI0ODNkZGNiOGE3ODVlYTQ1NWQ3 Yzc1OTBhNy4uZmI3ZWM2MzcxYWE0MTBmNjQ2NDY2MmFjZDY0OTNiOTQ2MjRlM2MyMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE4LTA0LTE3ICBSb3NzIEtpcnNsaW5nICA8cm9zcy5raXJzbGluZ0Bzb255LmNvbT4K KworICAgICAgICBGaXggYXJjaGl2ZSBzdGVwIGZvciBXaW5DYWlybyBidWlsZCBib3QuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODQ3MTUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIEJ1aWxkU2xhdmVT dXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZToKKyAgICAgICAgKGFyY2hpdmVCdWlsdFByb2R1 Y3QpOgorICAgICAgICAoZXh0cmFjdEJ1aWx0UHJvZHVjdCk6CisKIDIwMTgtMDQtMTcgIFNhYW0g QmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHN5c3RlbSB0cmFjZSBw b2ludHMgZm9yIHByb2Nlc3MgbGF1bmNoIGFuZCBmb3IgaW5pdGlhbGl6ZVdlYlByb2Nlc3MKZGlm ZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZSBi L1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWx0LXByb2R1Y3QtYXJjaGl2ZQppbmRleCBlYzNi NjE2ZGY5NjRhZGY1ZmIyNjliZjY5Mjg2OTQzZmI4OWFlZTlkLi45ZTAxMGY5ZGUzZjlkZTY2OWMw Y2IyZTU3Y2EzMmM0NzVjZTMzNGZmIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9idWlsdC1wcm9kdWN0LWFyY2hpdmUKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bHQtcHJvZHVjdC1hcmNoaXZlCkBAIC0xOTMsNyArMTkzLDcgQEAgZGVmIG1pbmlmeURpcmVjdG9y eShwbGF0Zm9ybSwgZGlyZWN0b3J5KToKIAogCiBkZWYgYXJjaGl2ZUJ1aWx0UHJvZHVjdChjb25m aWd1cmF0aW9uLCBwbGF0Zm9ybSwgZnVsbFBsYXRmb3JtLCBtaW5pZnk9RmFsc2UpOgotICAgIGFz c2VydCBwbGF0Zm9ybSBpbiAoJ21hYycsICd3aW4nLCAnZ3RrJywgJ2lvcycsICd3cGUnKQorICAg IGFzc2VydCBwbGF0Zm9ybSBpbiAoJ21hYycsICd3aW4nLCAnZ3RrJywgJ2lvcycsICd3cGUnLCAn d2luY2Fpcm8nKQogCiAgICAgaWYgcGxhdGZvcm0gPT0gJ2lvcyc6CiAgICAgICAgIGNvbWJpbmVk RGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKF90b3BMZXZlbEJ1aWxkRGlyZWN0b3J5LCAnY29tYmlu ZWQtbWFjLWFuZC1pb3MnKQpAQCAtMjEyLDExICsyMTIsMTEgQEAgZGVmIGFyY2hpdmVCdWlsdFBy b2R1Y3QoY29uZmlndXJhdGlvbiwgcGxhdGZvcm0sIGZ1bGxQbGF0Zm9ybSwgbWluaWZ5PUZhbHNl KToKICAgICAgICAgaWYgbWluaWZ5OgogICAgICAgICAgICAgbWluaWZ5RGlyZWN0b3J5KHBsYXRm b3JtLCBfY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5KQogICAgICAgICByZXR1cm4gY3JlYXRl WmlwKF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24sIGVtYmVkUGFy ZW50RGlyZWN0b3J5TmFtZU9uRGFyd2luPVRydWUsIG1pbmlmeT1taW5pZnkpCi0gICAgZWxpZiBw bGF0Zm9ybSA9PSAnd2luJzoKLSAgICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkbid0IGhhcmRjb2Rl IHRoZSBhc3N1bXB0aW9uIG9mIGEgMzItYml0IGJ1aWxkLiBTZWUgPGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk3MTU+LgotICAgICAgICBiaW5EaXJlY3RvcnkgPSBv cy5wYXRoLmpvaW4oX2NvbmZpZ3VyYXRpb25CdWlsZERpcmVjdG9yeSwgJ2JpbjMyJykKKyAgICBl bGlmIHBsYXRmb3JtIGluICgnd2luJywgJ3dpbmNhaXJvJyk6CisgICAgICAgIGJpblR5cGUgPSAn YmluNjQnIGlmIG9zLnBhdGguZXhpc3RzKG9zLnBhdGguam9pbihfY29uZmlndXJhdGlvbkJ1aWxk RGlyZWN0b3J5LCAnYmluNjQnKSkgZWxzZSAnYmluMzInCisgICAgICAgIGJpbkRpcmVjdG9yeSA9 IG9zLnBhdGguam9pbihfY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5LCBiaW5UeXBlKQogICAg ICAgICB0aGluRGlyZWN0b3J5ID0gb3MucGF0aC5qb2luKF9jb25maWd1cmF0aW9uQnVpbGREaXJl Y3RvcnksICd0aGluJykKLSAgICAgICAgdGhpbkJpbkRpcmVjdG9yeSA9IG9zLnBhdGguam9pbih0 aGluRGlyZWN0b3J5LCAiYmluMzIiKQorICAgICAgICB0aGluQmluRGlyZWN0b3J5ID0gb3MucGF0 aC5qb2luKHRoaW5EaXJlY3RvcnksIGJpblR5cGUpCiAKICAgICAgICAgcmVtb3ZlRGlyZWN0b3J5 SWZFeGlzdHModGhpbkRpcmVjdG9yeSkKICAgICAgICAgY29weUJ1aWxkRmlsZXMoYmluRGlyZWN0 b3J5LCB0aGluQmluRGlyZWN0b3J5LCBbJyouaWxrJ10pCkBAIC0yNTksNyArMjU5LDcgQEAgZGVm IHVuemlwQXJjaGl2ZShkaXJlY3RvcnlUb0V4dHJhY3RUbywgY29uZmlndXJhdGlvbik6CiAKIAog ZGVmIGV4dHJhY3RCdWlsdFByb2R1Y3QoY29uZmlndXJhdGlvbiwgcGxhdGZvcm0pOgotICAgIGFz c2VydCBwbGF0Zm9ybSBpbiAoJ21hYycsICd3aW4nLCAnZ3RrJywgJ2lvcycsICd3cGUnKQorICAg IGFzc2VydCBwbGF0Zm9ybSBpbiAoJ21hYycsICd3aW4nLCAnZ3RrJywgJ2lvcycsICd3cGUnLCAn d2luY2Fpcm8nKQogCiAgICAgYXJjaGl2ZUZpbGUgPSBvcy5wYXRoLmpvaW4oX3RvcExldmVsQnVp bGREaXJlY3RvcnksIGNvbmZpZ3VyYXRpb24gKyAnLnppcCcpCiAKQEAgLTI2OCw3ICsyNjgsNyBA QCBkZWYgZXh0cmFjdEJ1aWx0UHJvZHVjdChjb25maWd1cmF0aW9uLCBwbGF0Zm9ybSk6CiAKICAg ICBpZiBwbGF0Zm9ybSBpbiAoJ21hYycsICdpb3MnKToKICAgICAgICAgcmV0dXJuIHVuemlwQXJj aGl2ZShfdG9wTGV2ZWxCdWlsZERpcmVjdG9yeSwgY29uZmlndXJhdGlvbikKLSAgICBlbGlmIHBs YXRmb3JtID09ICd3aW4nIG9yIHBsYXRmb3JtID09ICdndGsnIG9yIHBsYXRmb3JtID09ICd3cGUn OgorICAgIGVsaWYgcGxhdGZvcm0gaW4gKCd3aW4nLCAnZ3RrJywgJ3dwZScsICd3aW5jYWlybycp OgogICAgICAgICBwcmludCAnRXh0cmFjdGluZycsIF9jb25maWd1cmF0aW9uQnVpbGREaXJlY3Rv cnkKICAgICAgICAgcmV0dXJuIHVuemlwQXJjaGl2ZShfY29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0 b3J5LCBjb25maWd1cmF0aW9uKQogCg==