229648 2021-08-28 09:17:13 -0700 [GTK] Set DISPLAY for D-Bus activation when using xvfb for run-gtk-tests 2021-08-29 08:31:47 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 pgriffis pgriffis bugs-noreply oldest_to_newest 1788310 0 pgriffis 2021-08-28 09:17:13 -0700 [GTK] Set DISPLAY for D-Bus activation when using xvfb for run-gtk-tests 1788311 1 436718 pgriffis 2021-08-28 09:17:50 -0700 Created attachment 436718 Patch 1788312 2 436719 pgriffis 2021-08-28 09:20:52 -0700 Created attachment 436719 Patch 1788313 3 436720 pgriffis 2021-08-28 09:27:06 -0700 Created attachment 436720 Patch 1788388 4 pgriffis 2021-08-29 08:31:47 -0700 This approach didn't work out since `run-gtk-tests` doesn't run under `xvfb` like the actual tests do. 436718 2021-08-28 09:17:50 -0700 2021-08-28 09:20:49 -0700 Patch bug-229648-20210828111749.patch text/plain 6753 pgriffis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNDk2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZTZmOWU3NWE5YTAzNTk3YjI5M2MzYWE0OTM4M2RiZWZl ODljZGZkYy4uNDkzZThiNzJhYzYwNjc2NDdlZmQ4NWQzMzFmZTY0NTg4MGMxNTE0NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDIxLTA4LTI4ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIFNldCBESVNQTEFZIGZvciBELUJ1cyBhY3RpdmF0aW9uIHdoZW4gdXNp bmcgeHZmYiBmb3IgcnVuLWd0ay10ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1ndGstdGVzdHM6CisgICAgICAgIChHdGtU ZXN0UnVubmVyLl9lbnN1cmVfYWNjZXNzaWJpbGl0eV9zZXJ2aWNlX2lzX3J1bm5pbmcpOgorCisy MDIxLTA4LTI3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHVEtdIFNpbXBsaWZ5IHJ1bi1ndGstdGVzdHMgaGFuZGxpbmcgb2YgdGhlIGExMXkgc2Vy dmljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5 NjIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IHNlcnZpY2UgaXMgREJ1c0FjdGl2YXRhYmxlIHNvIGl0IGRvZXNuJ3QgbWFrZSBzZW5zZSB0byBt YW51YWxseQorICAgICAgICBmaW5kIGFuZCBzdGFydCBldmVyeSBiaW5hcnkgb3Vyc2VsdmVzIGFu ZCB0aGVuIHdhaXQgZm9yIHRoZQorICAgICAgICBzZXJ2aWNlIHRvIGFwcGVhci4gV2UgY2FuIHNp bXBseSBjYWxsIGl0IGFuZCBsZXQgdGhlIHN5c3RlbQorICAgICAgICBtYW5hZ2UgdGhlIHNlcnZp Y2UgYXMgaXQgbm9ybWFsbHkgd291bGQgaW4gdGhlIGVudmlyb25tZW50IGl0CisgICAgICAgIG5v cm1hbGx5IHdvdWxkLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3RrLXRlc3RzOgorICAgICAg ICAoR3RrVGVzdFJ1bm5lci5fX2luaXRfXyk6CisgICAgICAgIChHdGtUZXN0UnVubmVyKToKKyAg ICAgICAgKEd0a1Rlc3RSdW5uZXIuX2Vuc3VyZV9hY2Nlc3NpYmlsaXR5X3NlcnZpY2VfaXNfcnVu bmluZyk6CisgICAgICAgIChHdGtUZXN0UnVubmVyLl9zZXR1cF90ZXN0aW5nX2Vudmlyb25tZW50 KToKKwogMjAyMS0wOC0yMyAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBQQ006IFN1cHBvcnQgZXBoZW1lcmFsIG1lYXN1cmVtZW50IHdpdGggbm9uLXBlcnNp c3RlbnQgV2ViQ29yZTo6UHJpdmF0ZUNsaWNrTWVhc3VyZW1lbnQKZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvcnVuLWd0ay10ZXN0cyBiL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cwppbmRl eCAxOWFiODYxYWVlM2NjN2UxZjM1NzY2MDk2ZTBiNWE2NTA2YTEzMDUzLi5iZTcwYzM1YTRiMDdk MWMzM2Q3Y2U2NmQ0ODAyM2U5NTdjZTViODEwIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3J1 bi1ndGstdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCkBAIC0xOCw3ICsx OCw2IEBACiAjIEJvc3RvbiwgTUEgMDIxMTAtMTMwMSwgVVNBLgogCiBpbXBvcnQgbG9nZ2luZwot aW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBvcwogaW1wb3J0IHN5cwogaW1wb3J0IG9wdHBhcnNl CkBAIC0zOSw2OCArMzgsMzIgQEAgY2xhc3MgR3RrVGVzdFJ1bm5lcihUZXN0UnVubmVyKToKICAg ICBkZWYgX19pbml0X18oc2VsZiwgb3B0aW9ucywgdGVzdHM9W10pOgogICAgICAgICBzdXBlcihH dGtUZXN0UnVubmVyLCBzZWxmKS5fX2luaXRfXygiZ3RrIiwgb3B0aW9ucywgdGVzdHMpCiAKLSAg ICAgICAgIyBUaGVzZSBTUEkgZGFlbW9ucyBuZWVkIHRvIGJlIGFjdGl2ZSBmb3IgdGhlIGFjY2Vz c2liaWxpdHkgdGVzdHMgdG8gd29yay4KLSAgICAgICAgc2VsZi5fc3BpX3JlZ2lzdHJ5ZCA9IE5v bmUKLSAgICAgICAgc2VsZi5fc3BpX2J1c19sYXVuY2hlciA9IE5vbmUKLQotICAgIGRlZiBfbG9v a3VwX2F0c3BpMl9iaW5hcnkoc2VsZiwgZmlsZW5hbWUpOgotICAgICAgICBwcmVmaXggPSBjb21t b24ucGtnX2NvbmZpZ19maWxlX3ZhcmlhYmxlKCdhdHNwaS0yJywgJ3ByZWZpeCcpCi0gICAgICAg IGlmIG5vdCBwcmVmaXg6Ci0gICAgICAgICAgICByZXR1cm4gTm9uZQotICAgICAgICBmb3IgcGF0 aCBpbiBbJ2xpYmV4ZWMnLCAnbGliL2F0LXNwaTItY29yZScsICdsaWIzMi9hdC1zcGkyLWNvcmUn LCAnbGliNjQvYXQtc3BpMi1jb3JlJ106Ci0gICAgICAgICAgICBmaWxlcGF0aCA9IG9zLnBhdGgu am9pbihwcmVmaXgsIHBhdGgsIGZpbGVuYW1lKQotICAgICAgICAgICAgaWYgb3MucGF0aC5pc2Zp bGUoZmlsZXBhdGgpOgotICAgICAgICAgICAgICAgIHJldHVybiBmaWxlcGF0aAotCi0gICAgICAg IHJldHVybiBOb25lCi0KLSAgICBkZWYgX3dhaXRfZm9yX2FjY2Vzc2liaWxpdHlfYnVzKHNlbGYp OgotICAgICAgICBkZWYgdGltZW91dF9hY2Nlc3NpYmlsaXR5X2J1cygpOgotICAgICAgICAgICAg c2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQgPSBGYWxzZQotICAgICAgICAgICAgc3lzLnN0 ZGVyci53cml0ZSgiVGltZW91dCB3YWl0aW5nIGZvciB0aGUgYWNjZXNpYmlsaXR5IGJ1cy5cbiIp Ci0gICAgICAgICAgICBzeXMuc3RkZXJyLmZsdXNoKCkKLSAgICAgICAgICAgIGxvb3AucXVpdCgp Ci0gICAgICAgICMgQmFja3VwIGN1cnJlbnQgZW52aXJvbm1lbnQsIGFuZCB0ZW1wb3JhbGx5IHNl dCB0aGUgdGVzdCBvbmUuCi0gICAgICAgIG9sZGVudiA9IGRpY3Qob3MuZW52aXJvbikKLSAgICAg ICAgb3MuZW52aXJvbi5jbGVhcigpCi0gICAgICAgIG9zLmVudmlyb24udXBkYXRlKHNlbGYuX3Rl c3RfZW52KQotICAgICAgICAjIFdlIHNwaW4gYSBtYWluIGxvb3AgdW50aWwgdGhlIGJ1cyBuYW1l IGFwcGVhcnMgb24gREJ1cy4KLSAgICAgICAgc2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQg PSBUcnVlCi0gICAgICAgIGxvb3AgPSBHTGliLk1haW5Mb29wKCkKLSAgICAgICAgR2lvLmJ1c193 YXRjaF9uYW1lKEdpby5CdXNUeXBlLlNFU1NJT04sICdvcmcuYTExeS5CdXMnLCBHaW8uQnVzTmFt ZVdhdGNoZXJGbGFncy5OT05FLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgbGFtYmRhICph cmdzOiBsb29wLnF1aXQoKSwgTm9uZSkKLSAgICAgICAgR0xpYi50aW1lb3V0X2FkZF9zZWNvbmRz KDUsIHRpbWVvdXRfYWNjZXNzaWJpbGl0eV9idXMpCi0gICAgICAgIGxvb3AucnVuKCkKLSAgICAg ICAgIyBSZXN0b3JlIHByZXZpb3VzIGVudmlyb25tZW50LgotICAgICAgICBvcy5lbnZpcm9uLmNs ZWFyKCkKLSAgICAgICAgb3MuZW52aXJvbi51cGRhdGUob2xkZW52KQotICAgICAgICByZXR1cm4g c2VsZi5fYWNjZXNzaWJpbGl0eV9idXNfZm91bmQKLQotICAgIGRlZiBfc3RhcnRfYWNjZXNzaWJp bGl0eV9kYWVtb25zKHNlbGYpOgotICAgICAgICBzcGlfYnVzX2xhdW5jaGVyX3BhdGggPSBzZWxm Ll9sb29rdXBfYXRzcGkyX2JpbmFyeSgnYXQtc3BpLWJ1cy1sYXVuY2hlcicpCi0gICAgICAgIHNw aV9yZWdpc3RyeWRfcGF0aCA9IHNlbGYuX2xvb2t1cF9hdHNwaTJfYmluYXJ5KCdhdC1zcGkyLXJl Z2lzdHJ5ZCcpCi0gICAgICAgIGlmIG5vdCBzcGlfYnVzX2xhdW5jaGVyX3BhdGggb3Igbm90IHNw aV9yZWdpc3RyeWRfcGF0aDoKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotCi0gICAgICAgIHRy eToKLSAgICAgICAgICAgIHNlbGYuX3NwaV9idXNfbGF1bmNoZXIgPSBzdWJwcm9jZXNzLlBvcGVu KFtzcGlfYnVzX2xhdW5jaGVyX3BhdGhdLCBlbnY9c2VsZi5fdGVzdF9lbnYpCi0gICAgICAgIGV4 Y2VwdDoKLSAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byBsYXVuY2ggdGhl IGFjY2Vzc2liaWxpdHkgYnVzXG4iKQotICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCi0g ICAgICAgICAgICByZXR1cm4gRmFsc2UKLQotICAgICAgICAjIFdlIG5lZWQgdG8gd2FpdCB1bnRp bCB0aGUgU1BJIGJ1cyBpcyBsYXVuY2hlZCBiZWZvcmUgdHJ5aW5nIHRvIHN0YXJ0IHRoZSBTUEkg cmVnaXN0cnkuCi0gICAgICAgIGlmIG5vdCBzZWxmLl93YWl0X2Zvcl9hY2Nlc3NpYmlsaXR5X2J1 cygpOgotICAgICAgICAgICAgc3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIGNoZWNraW5nIHRoZSBh Y2Nlc3NpYmlsaXR5IGJ1cyB3aXRoaW4gRC1CdXNcbiIpCi0gICAgICAgICAgICBzeXMuc3RkZXJy LmZsdXNoKCkKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgIGRlZiBfZW5zdXJlX2FjY2Vz c2liaWxpdHlfc2VydmljZV9pc19ydW5uaW5nKHNlbGYpOgorICAgICAgICBvcmlnaW5hbF9kaXNw bGF5ID0gb3MuZW52aXJvbi5nZXQoJ0RJU1BMQVknKQogCisgICAgICAgICMgVGhlIGExMXkgc2Vy dmljZSBpcyBELUJ1cyBhY3RpdmF0YWJsZSBzbyB3ZSBzaW1wbHkgbmVlZCB0byBjYWxsIGl0IHRv IGVuc3VyZSBpdAorICAgICAgICAjIGhhcyBiZWVuIHN0YXJ0ZWQuCiAgICAgICAgIHRyeToKLSAg ICAgICAgICAgIHNlbGYuX3NwaV9yZWdpc3RyeWQgPSBzdWJwcm9jZXNzLlBvcGVuKFtzcGlfcmVn aXN0cnlkX3BhdGhdLCBlbnY9c2VsZi5fdGVzdF9lbnYpCi0gICAgICAgIGV4Y2VwdDoKLSAgICAg ICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0byBsYXVuY2ggdGhlIGFjY2Vzc2liaWxp dHkgcmVnaXN0cnlcbiIpCisgICAgICAgICAgICAjIFdlIG11c3Qgc2V0IERJU1BMQVkgZm9yIEQt QnVzIGF1dG9sYXVuY2ggdG8gd29yaworICAgICAgICAgICAgaWYgc2VsZi5fb3B0aW9ucy5kaXNw bGF5X3NlcnZlciA9PSAneHZmYic6CisgICAgICAgICAgICAgICAgb3MuZW52aXJvblsnRElTUExB WSddID0gJzo5OScKKworICAgICAgICAgICAgcHJveHkgPSBHaW8uREJ1c1Byb3h5Lm5ld19mb3Jf YnVzX3N5bmMoR2lvLkJ1c1R5cGUuU0VTU0lPTiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIEdpby5EQnVzUHJveHlGbGFncy5OT05FLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTm9uZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdvcmcuYTExeS5C dXMnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Jy9vcmcvYTExeS9idXMnLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgJ29yZy5hMTF5LkJ1cycsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBOb25lKQorCisgICAgICAgICAgICAjIEFmdGVyIHRoaXMg cmV0dXJucyB3ZSBrbm93IHRoZSBidXMgaXMgc2V0dXAsIHRoZSByZXR1cm4gdmFsdWUgZG9lc24n dCBtYXR0ZXIuCisgICAgICAgICAgICBwcm94eS5HZXRBZGRyZXNzKCkKKyAgICAgICAgZXhjZXB0 IEdMaWIuRXJyb3IgYXMgZToKKyAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoIkZhaWxlZCB0 byB0YWxrIHRvIHRoZSBhY2Nlc3NpYmlsaXR5IHNlcnZpY2U6IHt9XG4iLmZvcm1hdChlLm1lc3Nh Z2UpKQogICAgICAgICAgICAgc3lzLnN0ZGVyci5mbHVzaCgpCiAgICAgICAgICAgICByZXR1cm4g RmFsc2UKKyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIG9zLmVudmlyb25bJ0RJU1BMQVkn XSA9IG9yaWdpbmFsX2Rpc3BsYXkKIAogICAgICAgICByZXR1cm4gVHJ1ZQogCkBAIC0xMDgsMTUg KzcxLDExIEBAIGNsYXNzIEd0a1Rlc3RSdW5uZXIoVGVzdFJ1bm5lcik6CiAgICAgICAgIHN1cGVy KEd0a1Rlc3RSdW5uZXIsIHNlbGYpLl9zZXR1cF90ZXN0aW5nX2Vudmlyb25tZW50KCkKIAogICAg ICAgICAjIElmIHdlIGNhbm5vdCBzdGFydCB0aGUgYWNjZXNzaWJpbGl0eSBkYWVtb25zLCB3ZSBj YW4ganVzdCBza2lwIHRoZSBhY2Nlc3NpYmlsaXR5IHRlc3RzLgotICAgICAgICBpZiBub3Qgc2Vs Zi5fc3RhcnRfYWNjZXNzaWJpbGl0eV9kYWVtb25zKCk6CisgICAgICAgIGlmIG5vdCBzZWxmLl9l bnN1cmVfYWNjZXNzaWJpbGl0eV9zZXJ2aWNlX2lzX3J1bm5pbmcoKToKICAgICAgICAgICAgIHBy aW50KCJDb3VsZCBub3Qgc3RhcnQgYWNjZXNzaWJpbGl0eSBidXMsIHNvIGRpc2FibGluZyBUZXN0 V2ViS2l0QWNjZXNzaWJpbGl0eSIpCiAgICAgICAgICAgICBzZWxmLl9kaXNhYmxlZF90ZXN0cy5h cHBlbmQoIldlYktpdDJHdGsvVGVzdFdlYktpdEFjY2Vzc2liaWxpdHkiKQogCiAgICAgZGVmIF90 ZWFyX2Rvd25fdGVzdGluZ19lbnZpcm9ubWVudChzZWxmKToKLSAgICAgICAgaWYgc2VsZi5fc3Bp X3JlZ2lzdHJ5ZDoKLSAgICAgICAgICAgIHNlbGYuX3NwaV9yZWdpc3RyeWQudGVybWluYXRlKCkK LSAgICAgICAgaWYgc2VsZi5fc3BpX2J1c19sYXVuY2hlcjoKLSAgICAgICAgICAgIHNlbGYuX3Nw aV9idXNfbGF1bmNoZXIudGVybWluYXRlKCkKICAgICAgICAgc3VwZXIoR3RrVGVzdFJ1bm5lciwg c2VsZikuX3RlYXJfZG93bl90ZXN0aW5nX2Vudmlyb25tZW50KCkKIAogICAgIGRlZiBpc19nbGli X3Rlc3Qoc2VsZiwgdGVzdF9wcm9ncmFtKToK 436719 2021-08-28 09:20:52 -0700 2021-08-28 09:27:04 -0700 Patch bug-229648-20210828112051.patch text/plain 2067 pgriffis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmNkYzMwYzE2OGQ3ZDA1NmIxZDQwOGY4MDAxM2M0Yzhj MDkxOTg1Zi4uNDkzZThiNzJhYzYwNjc2NDdlZmQ4NWQzMzFmZTY0NTg4MGMxNTE0NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIxLTA4LTI4ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIFNldCBESVNQTEFZIGZvciBELUJ1cyBhY3RpdmF0aW9uIHdoZW4gdXNp bmcgeHZmYiBmb3IgcnVuLWd0ay10ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1ndGstdGVzdHM6CisgICAgICAgIChHdGtU ZXN0UnVubmVyLl9lbnN1cmVfYWNjZXNzaWJpbGl0eV9zZXJ2aWNlX2lzX3J1bm5pbmcpOgorCiAy MDIxLTA4LTI3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdIFNpbXBsaWZ5IHJ1bi1ndGstdGVzdHMgaGFuZGxpbmcgb2YgdGhlIGExMXkgc2Vy dmljZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzCmluZGV4IDY4OGZlMjNlZjVkYmU3ZjY4OGE2OWZiODJhZWFmNDdh ODhmN2NhNmMuLmJlNzBjMzVhNGIwN2QxYzMzZDdjZTY2ZDQ4MDIzZTk1N2NlNWI4MTAgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1 bi1ndGstdGVzdHMKQEAgLTM5LDkgKzM5LDE1IEBAIGNsYXNzIEd0a1Rlc3RSdW5uZXIoVGVzdFJ1 bm5lcik6CiAgICAgICAgIHN1cGVyKEd0a1Rlc3RSdW5uZXIsIHNlbGYpLl9faW5pdF9fKCJndGsi LCBvcHRpb25zLCB0ZXN0cykKIAogICAgIGRlZiBfZW5zdXJlX2FjY2Vzc2liaWxpdHlfc2Vydmlj ZV9pc19ydW5uaW5nKHNlbGYpOgotICAgICAgICAjIFRoZSBhMTF5IHNlcnZpY2UgaXMgREJ1cyBh Y3RpdmF0YWJsZSBzbyB3ZSBzaW1wbHkgbmVlZCB0byBjYWxsIGl0IHRvIGVuc3VyZSBpdAorICAg ICAgICBvcmlnaW5hbF9kaXNwbGF5ID0gb3MuZW52aXJvbi5nZXQoJ0RJU1BMQVknKQorCisgICAg ICAgICMgVGhlIGExMXkgc2VydmljZSBpcyBELUJ1cyBhY3RpdmF0YWJsZSBzbyB3ZSBzaW1wbHkg bmVlZCB0byBjYWxsIGl0IHRvIGVuc3VyZSBpdAogICAgICAgICAjIGhhcyBiZWVuIHN0YXJ0ZWQu CiAgICAgICAgIHRyeToKKyAgICAgICAgICAgICMgV2UgbXVzdCBzZXQgRElTUExBWSBmb3IgRC1C dXMgYXV0b2xhdW5jaCB0byB3b3JrCisgICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmRpc3Bs YXlfc2VydmVyID09ICd4dmZiJzoKKyAgICAgICAgICAgICAgICBvcy5lbnZpcm9uWydESVNQTEFZ J10gPSAnOjk5JworCiAgICAgICAgICAgICBwcm94eSA9IEdpby5EQnVzUHJveHkubmV3X2Zvcl9i dXNfc3luYyhHaW8uQnVzVHlwZS5TRVNTSU9OLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgR2lvLkRCdXNQcm94eUZsYWdzLk5PTkUsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOb25lLApAQCAtNTYs NiArNjIsOCBAQCBjbGFzcyBHdGtUZXN0UnVubmVyKFRlc3RSdW5uZXIpOgogICAgICAgICAgICAg c3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIHRhbGsgdG8gdGhlIGFjY2Vzc2liaWxpdHkgc2Vy dmljZToge31cbiIuZm9ybWF0KGUubWVzc2FnZSkpCiAgICAgICAgICAgICBzeXMuc3RkZXJyLmZs dXNoKCkKICAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICBmaW5hbGx5OgorICAgICAg ICAgICAgb3MuZW52aXJvblsnRElTUExBWSddID0gb3JpZ2luYWxfZGlzcGxheQogCiAgICAgICAg IHJldHVybiBUcnVlCiAK 436720 2021-08-28 09:27:06 -0700 2021-08-28 09:27:06 -0700 Patch bug-229648-20210828112706.patch text/plain 2105 pgriffis U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzM0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmNkYzMwYzE2OGQ3ZDA1NmIxZDQwOGY4MDAxM2M0Yzhj MDkxOTg1Zi4uNDkzZThiNzJhYzYwNjc2NDdlZmQ4NWQzMzFmZTY0NTg4MGMxNTE0NSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIxLTA4LTI4ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgor CisgICAgICAgIFtHVEtdIFNldCBESVNQTEFZIGZvciBELUJ1cyBhY3RpdmF0aW9uIHdoZW4gdXNp bmcgeHZmYiBmb3IgcnVuLWd0ay10ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI5NjQ4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1ndGstdGVzdHM6CisgICAgICAgIChHdGtU ZXN0UnVubmVyLl9lbnN1cmVfYWNjZXNzaWJpbGl0eV9zZXJ2aWNlX2lzX3J1bm5pbmcpOgorCiAy MDIxLTA4LTI3ICBQYXRyaWNrIEdyaWZmaXMgIDxwZ3JpZmZpc0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdIFNpbXBsaWZ5IHJ1bi1ndGstdGVzdHMgaGFuZGxpbmcgb2YgdGhlIGExMXkgc2Vy dmljZQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzIGIvVG9vbHMvU2Ny aXB0cy9ydW4tZ3RrLXRlc3RzCmluZGV4IDY4OGZlMjNlZjVkYmU3ZjY4OGE2OWZiODJhZWFmNDdh ODhmN2NhNmMuLjQ5YjE0ZDk2MGIyY2UxZDM2NTQ0NWZlZGFiOWFlZmM2M2VlZDBjNDYgMTAwNzU1 Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWd0ay10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1 bi1ndGstdGVzdHMKQEAgLTM5LDkgKzM5LDE1IEBAIGNsYXNzIEd0a1Rlc3RSdW5uZXIoVGVzdFJ1 bm5lcik6CiAgICAgICAgIHN1cGVyKEd0a1Rlc3RSdW5uZXIsIHNlbGYpLl9faW5pdF9fKCJndGsi LCBvcHRpb25zLCB0ZXN0cykKIAogICAgIGRlZiBfZW5zdXJlX2FjY2Vzc2liaWxpdHlfc2Vydmlj ZV9pc19ydW5uaW5nKHNlbGYpOgotICAgICAgICAjIFRoZSBhMTF5IHNlcnZpY2UgaXMgREJ1cyBh Y3RpdmF0YWJsZSBzbyB3ZSBzaW1wbHkgbmVlZCB0byBjYWxsIGl0IHRvIGVuc3VyZSBpdAorICAg ICAgICBvcmlnaW5hbF9kaXNwbGF5ID0gb3MuZW52aXJvbi5nZXQoJ0RJU1BMQVknKQorCisgICAg ICAgICMgVGhlIGExMXkgc2VydmljZSBpcyBELUJ1cyBhY3RpdmF0YWJsZSBzbyB3ZSBzaW1wbHkg bmVlZCB0byBjYWxsIGl0IHRvIGVuc3VyZSBpdAogICAgICAgICAjIGhhcyBiZWVuIHN0YXJ0ZWQu CiAgICAgICAgIHRyeToKKyAgICAgICAgICAgICMgV2UgbXVzdCBzZXQgRElTUExBWSBmb3IgRC1C dXMgYXV0b2xhdW5jaCB0byB3b3JrCisgICAgICAgICAgICBpZiBzZWxmLl9vcHRpb25zLmRpc3Bs YXlfc2VydmVyID09ICd4dmZiJzoKKyAgICAgICAgICAgICAgICBvcy5lbnZpcm9uWydESVNQTEFZ J10gPSAnOjk5JworCiAgICAgICAgICAgICBwcm94eSA9IEdpby5EQnVzUHJveHkubmV3X2Zvcl9i dXNfc3luYyhHaW8uQnVzVHlwZS5TRVNTSU9OLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgR2lvLkRCdXNQcm94eUZsYWdzLk5PTkUsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOb25lLApAQCAtNTYs NiArNjIsOSBAQCBjbGFzcyBHdGtUZXN0UnVubmVyKFRlc3RSdW5uZXIpOgogICAgICAgICAgICAg c3lzLnN0ZGVyci53cml0ZSgiRmFpbGVkIHRvIHRhbGsgdG8gdGhlIGFjY2Vzc2liaWxpdHkgc2Vy dmljZToge31cbiIuZm9ybWF0KGUubWVzc2FnZSkpCiAgICAgICAgICAgICBzeXMuc3RkZXJyLmZs dXNoKCkKICAgICAgICAgICAgIHJldHVybiBGYWxzZQorICAgICAgICBmaW5hbGx5OgorICAgICAg ICAgICAgaWYgb3JpZ2luYWxfZGlzcGxheToKKyAgICAgICAgICAgICAgICBvcy5lbnZpcm9uWydE SVNQTEFZJ10gPSBvcmlnaW5hbF9kaXNwbGF5CiAKICAgICAgICAgcmV0dXJuIFRydWUKIAo=