210854 2020-04-22 04:57:49 -0700 [GTK][WPE] White-list more GStreamer environment variables in webkitpy 2020-04-24 07:22:15 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210919 210924 1 pnormand pnormand aperez clopez commit-queue ews-watchlist glenn jbedard vjaquez webkit-bug-importer oldest_to_newest 1644267 0 pnormand 2020-04-22 04:57:49 -0700 So that layout tests can run in a gst-build uninstalled environment. 1644268 1 397186 pnormand 2020-04-22 05:02:02 -0700 Created attachment 397186 Patch 1644269 2 vjaquez 2020-04-22 05:16:43 -0700 informal r+ 1644718 3 397186 aperez 2020-04-23 02:11:05 -0700 Comment on attachment 397186 Patch Patch LGTM. Related comment, but not for addressing in this patch: It would be neat if we could unify the list of whitelisted environment variables for both the GTK and WPE ports, keep them in a list, then iterate over it in common code instead of repeating a bunch of calls to “_copy_value_from_environ_if_set()” 🤔️ 1644719 4 pnormand 2020-04-23 02:13:27 -0700 Yeah I agree. I'm not sure why this was duplicated in the first place. 1644720 5 pnormand 2020-04-23 02:18:00 -0700 Committed r260562: <https://trac.webkit.org/changeset/260562> 1644721 6 webkit-bug-importer 2020-04-23 02:18:12 -0700 <rdar://problem/62238305> 1644845 7 commit-queue 2020-04-23 10:35:16 -0700 Re-opened since this is blocked by bug 210924 1645139 8 397442 pnormand 2020-04-24 02:41:45 -0700 Created attachment 397442 Patch 1645140 9 pnormand 2020-04-24 03:04:50 -0700 api-gtk green whoohoooo 1645156 10 clopez 2020-04-24 05:00:28 -0700 So the issue was because GST_PLUGIN_PATH_1_0 missing? BTW, maybe you also want to add REGISTRY_1_0 to the list. My WebKit internal JHBuild defines this: $ Tools/jhbuild/jhbuild-wrapper --gtk run env|grep GST GST_PLUGIN_SYSTEM_PATH= GST_REGISTRY=/home/clopez/webkit/webkit/WebKitBuild/DependenciesGTK/Root/_jhbuild/gstreamer-0.10.registry GST_REGISTRY_1_0=/home/clopez/webkit/webkit/WebKitBuild/DependenciesGTK/Root/_jhbuild/gstreamer-1.0.registry GST_PLUGIN_PATH_1_0=/home/clopez/webkit/webkit/WebKitBuild/DependenciesGTK/Root/lib/gstreamer-1.0 1645169 11 pnormand 2020-04-24 06:45:24 -0700 (In reply to Carlos Alberto Lopez Perez from comment #10) > So the issue was because GST_PLUGIN_PATH_1_0 missing? > Yep. > BTW, maybe you also want to add REGISTRY_1_0 to the list. My WebKit internal > JHBuild defines this: > > $ Tools/jhbuild/jhbuild-wrapper --gtk run env|grep GST > GST_PLUGIN_SYSTEM_PATH= > GST_REGISTRY=/home/clopez/webkit/webkit/WebKitBuild/DependenciesGTK/Root/ > _jhbuild/gstreamer-0.10.registry > GST_REGISTRY_1_0=/home/clopez/webkit/webkit/WebKitBuild/DependenciesGTK/Root/ > _jhbuild/gstreamer-1.0.registry > GST_PLUGIN_PATH_1_0=/home/clopez/webkit/webkit/WebKitBuild/DependenciesGTK/ > Root/lib/gstreamer-1.0 Well, I don't think so. Seems like some unmaintained jhbuild stuff to me :) Here gstreamer-1.0.registry doesn't exist and gstreamer-0.10.registry is actually the registry for 1.x... :P 1645186 12 ews-feeder 2020-04-24 07:22:14 -0700 Committed r260641: <https://trac.webkit.org/changeset/260641> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397442. 397186 2020-04-22 05:02:02 -0700 2020-04-24 02:41:40 -0700 Patch bug-210854-20200422130201.patch text/plain 4171 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTA1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOThiMjY1ZmM4MzUwYjFmMmM3NzBjNmYzOWFkZWM4YTQ1 ZGJkY2FmMy4uMGQ2OGI0Y2Q0NDNiZjk0NGUwMjc2YjY4MTNkNjg1MmM0MzBjMTBmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIz IEBACisyMDIwLTA0LTIyICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXVtXUEVdIFdoaXRlLWxpc3QgbW9yZSBHU3RyZWFtZXIgZW52aXJvbm1l bnQgdmFyaWFibGVzIGluIHdlYmtpdHB5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTA4NTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBFeHRyYSB2YXJpYWJsZXMgbmVlZCB0byBiZSB3aGl0ZS1saXN0ZWQg d2hlbiB0aGUgd2Via2l0cHkgdG9vbGluZworICAgICAgICBydW5zIGluc2lkZSBhIGdzdC1idWls ZCBlbnZpcm9ubWVudCwgdGhvc2UgdmFyaWFibGVzIGFyZSBuZWVkZWQgc28KKyAgICAgICAgdGhh dCB1bmluc3RhbGxlZCBHU3RyZWFtZXIgcGx1Z2lucyBhcmUgY29ycmVjdGx5IHBpY2tlZCB1cC4K KworICAgICAgICBBZGRpdGlvbmFsbHkgd2Ugbm93IGNvcnJlY3RseSB3aGl0ZS1saXN0IHRoZQor ICAgICAgICBXRUJLSVRfR1NUX1VTRV9QTEFZQklOMyBlbnYgdmFyLiBVU0VfUExBWUJJTjMgc2hv dWxkbid0IGJlIHVzZWQKKyAgICAgICAgYW55bW9yZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Vi a2l0cHkvcG9ydC9ndGsucHk6CisgICAgICAgIChHdGtQb3J0LnNldHVwX2Vudmlyb25fZm9yX3Nl cnZlcik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weToKKyAgICAgICAg KFdQRVBvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKToKKwogMjAyMC0wNC0yMSAgUnlhbiBI YWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZl cnRpbmcgcjI2MDQxMC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9n dGsucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5CmluZGV4IDBjZThhYTQ4 NzQ1OTA5Yzc5NzM2ODgzYjM2ZDM0ZTg3NDA5OGQ0NzMuLmQyN2Q5MjNjNzM0NjEzOWE5MGFjNWVl Yzg4MmI5M2Q4ZTU3ZDg2ZjQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y dC9ndGsucHkKKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weQpAQCAtMTI0 LDExICsxMjQsMTAgQEAgY2xhc3MgR3RrUG9ydChQb3J0KToKICAgICAgICAgc2VsZi5fY29weV92 YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnV0VCS0lUX09VVFBVVERJUicp CiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVu dCwgJ1dFQktJVF9KSEJVSUxEJykKICAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmly b25faWZfc2V0KGVudmlyb25tZW50LCAnV0VCS0lUX1RPUF9MRVZFTCcpCi0gICAgICAgIHNlbGYu X2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1VTRV9QTEFZQklO MycpCi0gICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9u bWVudCwgJ0dTVF9ERUJVRycpCi0gICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9u X2lmX3NldChlbnZpcm9ubWVudCwgJ0dTVF9ERUJVR19EVU1QX0RPVF9ESVInKQotICAgICAgICBz ZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdHU1RfREVC VUdfRklMRScpCi0gICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChl bnZpcm9ubWVudCwgJ0dTVF9ERUJVR19OT19DT0xPUicpCisgICAgICAgIHNlbGYuX2NvcHlfdmFs dWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJVF9HU1RfVVNFX1BMQVlC SU4zJykKKyAgICAgICAgZm9yIGdzdF92YXJpYWJsZSBpbiAoJ0RFQlVHJywgJ0RFQlVHX0RVTVBf RE9UX0RJUicsICdERUJVR19GSUxFJywgJ0RFQlVHX05PX0NPTE9SJywKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ1BMVUdJTl9TQ0FOTkVSJywgJ1BMVUdJTl9QQVRIJywgJ1BMVUdJTl9T WVNURU1fUEFUSCcsICdSRUdJU1RSWScpOgorICAgICAgICAgICAgc2VsZi5fY29weV92YWx1ZV9m cm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnR1NUXyVzJyAlIGdzdF92YXJpYWJsZSkK IAogICAgICAgICAjIENvbmZpZ3VyZSB0aGUgc29mdHdhcmUgbGliZ2wgcmVuZGVyZXIgaWYgamhi dWlsZCByZWFkeSBhbmQgd2UgdGVzdCBpbnNpZGUgYSB2aXJ0dWFsaXplZCB3aW5kb3cgc3lzdGVt CiAgICAgICAgIGlmIHNlbGYuX2RyaXZlcl9jbGFzcygpIGluIFtYdmZiRHJpdmVyLCBXZXN0b25E cml2ZXJdIGFuZCAoc2VsZi5fc2hvdWxkX3VzZV9qaGJ1aWxkKCkgb3Igc2VsZi5faXNfZmxhdHBh aygpKToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkgYi9U b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5CmluZGV4IGRjN2ZjYmViMzYzN2M3NzBk ZWQxOGI5OTgzOTc1MTg0NTg3YzZiODkuLjQ0ZTE4MGQxNGE5NGQ5NTUxNzA0YzUwMzUzNTljM2Fk Mzg3MTdkNDkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkK KysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weQpAQCAtNzksMTMgKzc5LDEy IEBAIGNsYXNzIFdQRVBvcnQoUG9ydCk6CiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9l bnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJVF9PVVRQVVRESVInKQogICAgICAgICBz ZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRf SkhCVUlMRCcpCiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChl bnZpcm9ubWVudCwgJ1dFQktJVF9UT1BfTEVWRUwnKQotICAgICAgICBzZWxmLl9jb3B5X3ZhbHVl X2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdVU0VfUExBWUJJTjMnKQotICAgICAg ICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdHU1Rf REVCVUcnKQotICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52 aXJvbm1lbnQsICdHU1RfREVCVUdfRFVNUF9ET1RfRElSJykKLSAgICAgICAgc2VsZi5fY29weV92 YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnR1NUX0RFQlVHX0ZJTEUnKQot ICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQs ICdHU1RfREVCVUdfTk9fQ09MT1InKQogICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52 aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdMSUJHTF9BTFdBWVNfU09GVFdBUkUnKQogICAgICAg ICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdYUl9S VU5USU1FX0pTT04nKQorICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9z ZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfR1NUX1VTRV9QTEFZQklOMycpCisgICAgICAgIGZvciBn c3RfdmFyaWFibGUgaW4gKCdERUJVRycsICdERUJVR19EVU1QX0RPVF9ESVInLCAnREVCVUdfRklM RScsICdERUJVR19OT19DT0xPUicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdQTFVH SU5fU0NBTk5FUicsICdQTFVHSU5fUEFUSCcsICdQTFVHSU5fU1lTVEVNX1BBVEgnLCAnUkVHSVNU UlknKToKKyAgICAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChl bnZpcm9ubWVudCwgJ0dTVF8lcycgJSBnc3RfdmFyaWFibGUpCiAgICAgICAgIHJldHVybiBlbnZp cm9ubWVudAogCiAgICAgZGVmIHNob3dfcmVzdWx0c19odG1sX2ZpbGUoc2VsZiwgcmVzdWx0c19m aWxlbmFtZSk6Cg== 397442 2020-04-24 02:41:45 -0700 2020-04-24 07:22:15 -0700 Patch bug-210854-20200424094143.patch text/plain 4331 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNjI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDc3YWY4NjI0YTQ0ZTUyZTgwNTI3YzQzZmE3Nzg2Mjc3 ZWMyZWZlYy4uOWM3Y2FkOWU3MzE4ZDhhZjMyM2VkZDQxMmFlNzYzYjZiYmQxNjlhYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIwLTA0LTI0ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXVtXUEVdIFdoaXRlLWxpc3QgbW9yZSBHU3RyZWFtZXIgZW52aXJvbm1l bnQgdmFyaWFibGVzIGluIHdlYmtpdHB5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTA4NTQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYyMjM4MzA1 PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV4dHJh IHZhcmlhYmxlcyBuZWVkIHRvIGJlIHdoaXRlLWxpc3RlZCB3aGVuIHRoZSB3ZWJraXRweSB0b29s aW5nCisgICAgICAgIHJ1bnMgaW5zaWRlIGEgZ3N0LWJ1aWxkIGVudmlyb25tZW50LCB0aG9zZSB2 YXJpYWJsZXMgYXJlIG5lZWRlZCBzbworICAgICAgICB0aGF0IHVuaW5zdGFsbGVkIEdTdHJlYW1l ciBwbHVnaW5zIGFyZSBjb3JyZWN0bHkgcGlja2VkIHVwLgorCisgICAgICAgIEFkZGl0aW9uYWxs eSB3ZSBub3cgY29ycmVjdGx5IHdoaXRlLWxpc3QgdGhlCisgICAgICAgIFdFQktJVF9HU1RfVVNF X1BMQVlCSU4zIGVudiB2YXIuIFVTRV9QTEFZQklOMyBzaG91bGRuJ3QgYmUgdXNlZAorICAgICAg ICBhbnltb3JlLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2d0ay5weToKKyAg ICAgICAgKEd0a1BvcnQuc2V0dXBfZW52aXJvbl9mb3Jfc2VydmVyKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5OgorICAgICAgICAoV1BFUG9ydC5zZXR1cF9lbnZpcm9u X2Zvcl9zZXJ2ZXIpOgorCiAyMDIwLTA0LTIzICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBs ZS5jb20+CiAKICAgICAgICAgc3RyZXNzL2Vuc3VyZS1jcmFzaC5qcyBzaG91bGRuJ3Qgc3BldyBz dHVmZiBvbnRvIG15IHNjcmVlbgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2d0ay5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9ndGsucHkKaW5kZXggMGNl OGFhNDg3NDU5MDljNzk3MzY4ODNiMzZkMzRlODc0MDk4ZDQ3My4uZDEyN2M2MDk5ZmFjZDY4YmJm NGEyNWMxMjNhOGM0Yzc5N2RlYjExZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2d0ay5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZ3RrLnB5CkBA IC0xMjQsMTEgKzEyNCwxMSBAQCBjbGFzcyBHdGtQb3J0KFBvcnQpOgogICAgICAgICBzZWxmLl9j b3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfT1VUUFVU RElSJykKICAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmly b25tZW50LCAnV0VCS0lUX0pIQlVJTEQnKQogICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21f ZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfVE9QX0xFVkVMJykKLSAgICAgICAg c2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnVVNFX1BM QVlCSU4zJykKLSAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVu dmlyb25tZW50LCAnR1NUX0RFQlVHJykKLSAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vu dmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnR1NUX0RFQlVHX0RVTVBfRE9UX0RJUicpCi0gICAg ICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ0dT VF9ERUJVR19GSUxFJykKLSAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9tX2Vudmlyb25faWZf c2V0KGVudmlyb25tZW50LCAnR1NUX0RFQlVHX05PX0NPTE9SJykKKyAgICAgICAgc2VsZi5fY29w eV92YWx1ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnV0VCS0lUX0dTVF9VU0Vf UExBWUJJTjMnKQorICAgICAgICBmb3IgZ3N0X3ZhcmlhYmxlIGluICgnREVCVUcnLCAnREVCVUdf RFVNUF9ET1RfRElSJywgJ0RFQlVHX0ZJTEUnLCAnREVCVUdfTk9fQ09MT1InLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAnUExVR0lOX1NDQU5ORVInLCAnUExVR0lOX1BBVEgnLCAnUExV R0lOX1NZU1RFTV9QQVRIJywgJ1JFR0lTVFJZJywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJ1BMVUdJTl9QQVRIXzFfMCcpOgorICAgICAgICAgICAgc2VsZi5fY29weV92YWx1ZV9mcm9t X2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnR1NUXyVzJyAlIGdzdF92YXJpYWJsZSkKIAog ICAgICAgICAjIENvbmZpZ3VyZSB0aGUgc29mdHdhcmUgbGliZ2wgcmVuZGVyZXIgaWYgamhidWls ZCByZWFkeSBhbmQgd2UgdGVzdCBpbnNpZGUgYSB2aXJ0dWFsaXplZCB3aW5kb3cgc3lzdGVtCiAg ICAgICAgIGlmIHNlbGYuX2RyaXZlcl9jbGFzcygpIGluIFtYdmZiRHJpdmVyLCBXZXN0b25Ecml2 ZXJdIGFuZCAoc2VsZi5fc2hvdWxkX3VzZV9qaGJ1aWxkKCkgb3Igc2VsZi5faXNfZmxhdHBhaygp KToKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd3BlLnB5CmluZGV4IGRjN2ZjYmViMzYzN2M3NzBkZWQx OGI5OTgzOTc1MTg0NTg3YzZiODkuLjA5ZTk5OTAyOTQ2YWY0MjI4YjViNjQ2OTdhNzIyNzQ2ZTQ0 ZDBjOGQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93cGUucHkKKysr IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dwZS5weQpAQCAtNzksMTMgKzc5LDEzIEBA IGNsYXNzIFdQRVBvcnQoUG9ydCk6CiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZp cm9uX2lmX3NldChlbnZpcm9ubWVudCwgJ1dFQktJVF9PVVRQVVRESVInKQogICAgICAgICBzZWxm Ll9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdXRUJLSVRfSkhC VUlMRCcpCiAgICAgICAgIHNlbGYuX2NvcHlfdmFsdWVfZnJvbV9lbnZpcm9uX2lmX3NldChlbnZp cm9ubWVudCwgJ1dFQktJVF9UT1BfTEVWRUwnKQotICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zy b21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdVU0VfUExBWUJJTjMnKQotICAgICAgICBz ZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdHU1RfREVC VUcnKQotICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJv bm1lbnQsICdHU1RfREVCVUdfRFVNUF9ET1RfRElSJykKLSAgICAgICAgc2VsZi5fY29weV92YWx1 ZV9mcm9tX2Vudmlyb25faWZfc2V0KGVudmlyb25tZW50LCAnR1NUX0RFQlVHX0ZJTEUnKQotICAg ICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdH U1RfREVCVUdfTk9fQ09MT1InKQogICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJv bl9pZl9zZXQoZW52aXJvbm1lbnQsICdMSUJHTF9BTFdBWVNfU09GVFdBUkUnKQogICAgICAgICBz ZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQsICdYUl9SVU5U SU1FX0pTT04nKQorICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQo ZW52aXJvbm1lbnQsICdXRUJLSVRfR1NUX1VTRV9QTEFZQklOMycpCisgICAgICAgIGZvciBnc3Rf dmFyaWFibGUgaW4gKCdERUJVRycsICdERUJVR19EVU1QX0RPVF9ESVInLCAnREVCVUdfRklMRScs ICdERUJVR19OT19DT0xPUicsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICdQTFVHSU5f U0NBTk5FUicsICdQTFVHSU5fUEFUSCcsICdQTFVHSU5fU1lTVEVNX1BBVEgnLCAnUkVHSVNUUlkn LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAnUExVR0lOX1BBVEhfMV8wJyk6CisgICAg ICAgICAgICBzZWxmLl9jb3B5X3ZhbHVlX2Zyb21fZW52aXJvbl9pZl9zZXQoZW52aXJvbm1lbnQs ICdHU1RfJXMnICUgZ3N0X3ZhcmlhYmxlKQogICAgICAgICByZXR1cm4gZW52aXJvbm1lbnQKIAog ICAgIGRlZiBzaG93X3Jlc3VsdHNfaHRtbF9maWxlKHNlbGYsIHJlc3VsdHNfZmlsZW5hbWUpOgo=