205775 2020-01-05 01:55:55 -0800 [GTK][WPE] Prepare bots for Flatpak migration 2020-01-10 05:26:36 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 205658 1 pnormand pnormand aakash_jain clopez ews-watchlist oldest_to_newest 1602833 0 pnormand 2020-01-05 01:55:55 -0800 Bots should have a WEBKIT_JHBUILD=1 env var set. See bug 205658 1602835 1 386784 pnormand 2020-01-05 02:41:10 -0800 Created attachment 386784 Patch 1603085 2 386784 clopez 2020-01-06 09:28:14 -0800 Comment on attachment 386784 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386784&action=review > Tools/BuildSlaveSupport/build.webkit.org-config/steps.py:224 > +def appendCustomEnvironmentVariables(step, platform): > + if platform in ('gtk', 'wpe'): > + step.slaveEnvironment['WEBKIT_JHBUILD'] = '1' > + Please don't add this environment variable from the buildbot master config. Each worker defines its own environment variables at startup. This is something that the admin of the bot does (on a systemd unit file usually) Before landing this patch you need to talk with the admins of the GTK/EWS bots to add this environment variable to each of the bots environment. > Tools/BuildSlaveSupport/ews-build/steps.py:782 > +def appendCustomEnvironmentVariables(step, platform): > + if platform in ('gtk', 'wpe'): > + step.slaveEnvironment['WEBKIT_JHBUILD'] = '1' > + Ditto > Tools/BuildSlaveSupport/gtk/buildbot/run:71 > + WEBKIT_JHBUILD=1 \ Ditto 1603087 3 pnormand 2020-01-06 09:30:53 -0800 Aakash, any thoughts about this? 386784 2020-01-05 02:41:10 -0800 2020-01-06 09:28:14 -0800 Patch bug-205775-20200105104108.patch text/plain 11014 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDMxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggNjkwMWExMjY3MzA4ZDc0MDdiYTNhMjI1MzUzZjQ2ZWVl MDRiZTc4MC4uYzZlZjE2ODg3MWYwZWRlMmI2OGUwMTkxZmFlMjJiNjg3OTkwOGU3NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4 IEBACisyMDIwLTAxLTA1ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbR1RLXVtXUEVdIFByZXBhcmUgYm90cyBmb3IgRmxhdHBhayBtaWdyYXRpb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTc3NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCB0aGUg V0VCS0lUX0pIQlVJTEQ9MSBlbnZpcm9ubWVudCB2YXJpYWJsZSBvbiBHVEsgYW5kIFdQRSBib3Rz LgorICAgICAgICBGb3Igbm93IHRoaXMgaGFzIG5vIGVmZmVjdCBidXQgb25jZSB0aGUgcGF0Y2gg ZnJvbSBCdWcgMjA1NjU4CisgICAgICAgIGxhbmRzLCBoYXZpbmcgdGhpcyB2YXJpYWJsZSBzZXQg d2lsbCBlbnN1cmUgdGhlIGJvdHMga2VlcCB1c2luZworICAgICAgICBKSEJ1aWxkIGZvciB0aGUg dGltZSBiZWluZy4KKworICAgICAgICAqIEJ1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5v cmctY29uZmlnL3N0ZXBzLnB5OgorICAgICAgICAoSW5zdGFsbEd0a0RlcGVuZGVuY2llcy5zdGFy dCk6CisgICAgICAgIChJbnN0YWxsV3BlRGVwZW5kZW5jaWVzLnN0YXJ0KToKKyAgICAgICAgKGFw cGVuZEN1c3RvbUVudmlyb25tZW50VmFyaWFibGVzKToKKyAgICAgICAgKENvbXBpbGVXZWJLaXQu c3RhcnQpOgorICAgICAgICAoUnVuSmF2YVNjcmlwdENvcmVUZXN0cy5zdGFydCk6CisgICAgICAg IChSdW5XZWJLaXRUZXN0cy5zdGFydCk6CisgICAgICAgIChSdW5EYXNoYm9hcmRUZXN0cy5zdGFy dCk6CisgICAgICAgIChSdW5BUElUZXN0cy5zdGFydCk6CisgICAgICAgIChSdW5QeXRob25UZXN0 cy5zdGFydCk6CisgICAgICAgIChSdW5QZXJsVGVzdHMuc3RhcnQpOgorICAgICAgICAoUnVuR0xp YkFQSVRlc3RzLnN0YXJ0KToKKyAgICAgICAgKFJ1bldlYkRyaXZlclRlc3RzLnN0YXJ0KToKKyAg ICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ld3MtYnVpbGQvc3RlcHMucHk6CisgICAgICAgIChJ bnN0YWxsR3RrRGVwZW5kZW5jaWVzLnN0YXJ0KToKKyAgICAgICAgKEluc3RhbGxXcGVEZXBlbmRl bmNpZXMuc3RhcnQpOgorICAgICAgICAoYXBwZW5kQ3VzdG9tRW52aXJvbm1lbnRWYXJpYWJsZXMp OgorICAgICAgICAoQ29tcGlsZVdlYktpdC5zdGFydCk6CisgICAgICAgIChSdW5KYXZhU2NyaXB0 Q29yZVRlc3RzLnN0YXJ0KToKKyAgICAgICAgKFJ1bldlYktpdFRlc3RzLnN0YXJ0KToKKyAgICAg ICAgKFJ1bkFQSVRlc3RzLnN0YXJ0KToKKyAgICAgICAgKiBCdWlsZFNsYXZlU3VwcG9ydC9ndGsv YnVpbGRib3QvcnVuOgorCiAyMDIwLTAxLTAzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IDE1MCsgZmxha3kgZmFpbHVyZXMgb24g c29tZSBib3RzIChjb2xvciBtaXNtYXRjaGVzKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2 ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvc3RlcHMucHkgYi9Ub29scy9CdWlsZFNs YXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9zdGVwcy5weQppbmRleCAwZWViZmU3 ZTFlY2I4NzY0ODE1ZjFlNjFmZjRhZDkwM2U1ZjljYTIzLi5kMjI1NTAwYWQzNTlkNGFlMDUxMjJk Y2E2YjFjZWJhNDMyZjQ4ZmZhIDEwMDY0NAotLS0gYS9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9i dWlsZC53ZWJraXQub3JnLWNvbmZpZy9zdGVwcy5weQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3Vw cG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9zdGVwcy5weQpAQCAtMTgxLDYgKzE4MSw5IEBA IGNsYXNzIEluc3RhbGxHdGtEZXBlbmRlbmNpZXMoc2hlbGwuU2hlbGxDb21tYW5kKToKICAgICBj b21tYW5kID0gWyJwZXJsIiwgIi4vVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0Z3RrLWxpYnMi XQogICAgIGhhbHRPbkZhaWx1cmUgPSBUcnVlCiAKKyAgICBkZWYgc3RhcnQoc2VsZik6CisgICAg ICAgIGFwcGVuZEN1c3RvbUVudmlyb25tZW50VmFyaWFibGVzKHNlbGYsIHNlbGYuZ2V0UHJvcGVy dHkoJ3BsYXRmb3JtJykpCisgICAgICAgIHJldHVybiBzaGVsbC5Db21waWxlLnN0YXJ0KHNlbGYp CiAKIGNsYXNzIEluc3RhbGxXcGVEZXBlbmRlbmNpZXMoc2hlbGwuU2hlbGxDb21tYW5kKToKICAg ICBuYW1lID0gImpoYnVpbGQiCkBAIC0xODksNiArMTkyLDkgQEAgY2xhc3MgSW5zdGFsbFdwZURl cGVuZGVuY2llcyhzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIGNvbW1hbmQgPSBbInBlcmwiLCAi Li9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXR3cGUtbGlicyJdCiAgICAgaGFsdE9uRmFpbHVy ZSA9IFRydWUKIAorICAgIGRlZiBzdGFydChzZWxmKToKKyAgICAgICAgYXBwZW5kQ3VzdG9tRW52 aXJvbm1lbnRWYXJpYWJsZXMoc2VsZiwgc2VsZi5nZXRQcm9wZXJ0eSgncGxhdGZvcm0nKSkKKyAg ICAgICAgcmV0dXJuIHNoZWxsLkNvbXBpbGUuc3RhcnQoc2VsZikKIAogZGVmIGFwcGVuZEN1c3Rv bUJ1aWxkRmxhZ3Moc3RlcCwgcGxhdGZvcm0sIGZ1bGxQbGF0Zm9ybSk6CiAgICAgaWYgcGxhdGZv cm0gbm90IGluICgnZ3RrJywgJ3dpbmNhaXJvJywgJ2lvcycsICdqc2Mtb25seScsICd3cGUnKToK QEAgLTIxMiw2ICsyMTgsMTEgQEAgZGVmIGFwcGVuZEN1c3RvbVRlc3RpbmdGbGFncyhzdGVwLCBw bGF0Zm9ybSwgZGV2aWNlX21vZGVsKToKICAgICBzdGVwLnNldENvbW1hbmQoc3RlcC5jb21tYW5k ICsgWyctLScgKyBkZXZpY2VfbW9kZWxdKQogCiAKK2RlZiBhcHBlbmRDdXN0b21FbnZpcm9ubWVu dFZhcmlhYmxlcyhzdGVwLCBwbGF0Zm9ybSk6CisgICAgaWYgcGxhdGZvcm0gaW4gKCdndGsnLCAn d3BlJyk6CisgICAgICAgIHN0ZXAuc2xhdmVFbnZpcm9ubWVudFsnV0VCS0lUX0pIQlVJTEQnXSA9 ICcxJworCisKIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAgICAgY29tbWFu ZCA9IFsicGVybCIsICIuL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IiwgV2l0aFByb3BlcnRp ZXMoIi0tJShjb25maWd1cmF0aW9uKXMiKV0KICAgICBlbnYgPSB7J01GTEFHUyc6ICcnfQpAQCAt MjM4LDggKzI0OSw4IEBAIGNsYXNzIENvbXBpbGVXZWJLaXQoc2hlbGwuQ29tcGlsZSk6CiAgICAg ICAgICAgICAjIHRoaXMgbXVjaCBmYXN0ZXIgdGhhbiBmdWxsIGRlYnVnIGluZm8sIGFuZCBjcmFz aCBsb2dzIHN0aWxsIGhhdmUgbGluZSBudW1iZXJzLgogICAgICAgICAgICAgc2VsZi5zZXRDb21t YW5kKHNlbGYuY29tbWFuZCArIFsnREVCVUdfSU5GT1JNQVRJT05fRk9STUFUPWR3YXJmLXdpdGgt ZHN5bSddKQogICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIFsnQ0xB TkdfREVCVUdfSU5GT1JNQVRJT05fTEVWRUw9bGluZS10YWJsZXMtb25seSddKQotCiAgICAgICAg IGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Moc2VsZiwgcGxhdGZvcm0sIHNlbGYuZ2V0UHJvcGVydHko J2Z1bGxQbGF0Zm9ybScpKQorICAgICAgICBhcHBlbmRDdXN0b21FbnZpcm9ubWVudFZhcmlhYmxl cyhzZWxmLCBwbGF0Zm9ybSkKIAogICAgICAgICByZXR1cm4gc2hlbGwuQ29tcGlsZS5zdGFydChz ZWxmKQogCkBAIC0zNzcsNiArMzg4LDcgQEAgY2xhc3MgUnVuSmF2YVNjcmlwdENvcmVUZXN0cyhU ZXN0V2l0aEZhaWx1cmVDb3VudCk6CiAgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5j b21tYW5kICsgWyctLXRlc3Qtd3JpdGVyPXJ1YnknXSkKIAogICAgICAgICBhcHBlbmRDdXN0b21C dWlsZEZsYWdzKHNlbGYsIHBsYXRmb3JtLCBzZWxmLmdldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0n KSkKKyAgICAgICAgYXBwZW5kQ3VzdG9tRW52aXJvbm1lbnRWYXJpYWJsZXMoc2VsZiwgcGxhdGZv cm0pCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCiAKICAgICBkZWYgY291 bnRGYWlsdXJlcyhzZWxmLCBjbWQpOgpAQCAtNDYzLDYgKzQ3NSw3IEBAIGNsYXNzIFJ1bldlYktp dFRlc3RzKHNoZWxsLlRlc3QpOgogCiAgICAgICAgIGlmIGFkZGl0aW9uYWxBcmd1bWVudHM6CiAg ICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgYWRkaXRpb25hbEFyZ3Vt ZW50cykKKyAgICAgICAgYXBwZW5kQ3VzdG9tRW52aXJvbm1lbnRWYXJpYWJsZXMoc2VsZiwgcGxh dGZvcm0pCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCiAKICAgICAjIEZJ WE1FOiBUaGlzIHdpbGwgYnJlYWsgaWYgcnVuLXdlYmtpdC10ZXN0cyBjaGFuZ2VzIGl0cyBkZWZh dWx0IGxvZyBmb3JtYXR0ZXIuCkBAIC01NTEsNiArNTY0LDcgQEAgY2xhc3MgUnVuRGFzaGJvYXJk VGVzdHMoUnVuV2ViS2l0VGVzdHMpOgogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBz ZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyItLWxheW91dC10ZXN0cy1kaXJlY3Rvcnki LCAiLi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9wdWJs aWNfaHRtbC9kYXNoYm9hcmQvU2NyaXB0cy90ZXN0cyJdKQorICAgICAgICBhcHBlbmRDdXN0b21F bnZpcm9ubWVudFZhcmlhYmxlcyhzZWxmLCBzZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScpKQog ICAgICAgICByZXR1cm4gUnVuV2ViS2l0VGVzdHMuc3RhcnQoc2VsZikKIAogCkBAIC01ODEsNyAr NTk1LDkgQEAgY2xhc3MgUnVuQVBJVGVzdHMoVGVzdFdpdGhGYWlsdXJlQ291bnQpOgogCiAgICAg ZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLnNsYXZlRW52aXJvbm1lbnRbUkVTVUxUU19T RVJWRVJfQVBJX0tFWV0gPSBvcy5nZXRlbnYoUkVTVUxUU19TRVJWRVJfQVBJX0tFWSkKLSAgICAg ICAgYXBwZW5kQ3VzdG9tVGVzdGluZ0ZsYWdzKHNlbGYsIHNlbGYuZ2V0UHJvcGVydHkoJ3BsYXRm b3JtJyksIHNlbGYuZ2V0UHJvcGVydHkoJ2RldmljZV9tb2RlbCcpKQorICAgICAgICBwbGF0Zm9y bSA9IHNlbGYuZ2V0UHJvcGVydHkoJ3BsYXRmb3JtJykKKyAgICAgICAgYXBwZW5kQ3VzdG9tVGVz dGluZ0ZsYWdzKHNlbGYsIHBsYXRmb3JtLCBzZWxmLmdldFByb3BlcnR5KCdkZXZpY2VfbW9kZWwn KSkKKyAgICAgICAgYXBwZW5kQ3VzdG9tRW52aXJvbm1lbnRWYXJpYWJsZXMoc2VsZiwgcGxhdGZv cm0pCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCiAKICAgICBkZWYgY291 bnRGYWlsdXJlcyhzZWxmLCBjbWQpOgpAQCAtNjA1LDYgKzYyMSw3IEBAIGNsYXNzIFJ1blB5dGhv blRlc3RzKFRlc3RXaXRoRmFpbHVyZUNvdW50KToKICAgICAgICAgIyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTc0NjUKICAgICAgICAgaWYgcGxhdGZvcm0gPT0gJ3dp bic6CiAgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyctLWNoaWxk LXByb2Nlc3NlcycsICcxJ10pCisgICAgICAgIGFwcGVuZEN1c3RvbUVudmlyb25tZW50VmFyaWFi bGVzKHNlbGYsIHBsYXRmb3JtKQogICAgICAgICByZXR1cm4gc2hlbGwuVGVzdC5zdGFydChzZWxm KQogCiAgICAgZGVmIGNvdW50RmFpbHVyZXMoc2VsZiwgY21kKToKQEAgLTY2NCw2ICs2ODEsMTAg QEAgY2xhc3MgUnVuUGVybFRlc3RzKFRlc3RXaXRoRmFpbHVyZUNvdW50KToKICAgICBjb21tYW5k ID0gWyJwZXJsIiwgIi4vVG9vbHMvU2NyaXB0cy90ZXN0LXdlYmtpdHBlcmwiXQogICAgIGZhaWxl ZFRlc3RzRm9ybWF0U3RyaW5nID0gIiVkIHBlcmwgdGVzdCVzIGZhaWxlZCIKIAorICAgIGRlZiBz dGFydChzZWxmKToKKyAgICAgICAgYXBwZW5kQ3VzdG9tRW52aXJvbm1lbnRWYXJpYWJsZXMoc2Vs Ziwgc2VsZi5nZXRQcm9wZXJ0eSgncGxhdGZvcm0nKSkKKyAgICAgICAgcmV0dXJuIHNoZWxsLlRl c3Quc3RhcnQoc2VsZikKKwogICAgIGRlZiBjb3VudEZhaWx1cmVzKHNlbGYsIGNtZCk6CiAgICAg ICAgIGxvZ1RleHQgPSBjbWQubG9nc1snc3RkaW8nXS5nZXRUZXh0KCkKICAgICAgICAgIyBXZSdy ZSBsb29raW5nIGZvciB0aGUgbGluZSB0aGF0IGxvb2tzIGxpa2UgdGhpczogRmFpbGVkIDIvMTkg dGVzdCBwcm9ncmFtcy4gNS8zNjMgc3VidGVzdHMgZmFpbGVkLgpAQCAtNzgwLDYgKzgwMSw3IEBA IGNsYXNzIFJ1bkdMaWJBUElUZXN0cyhzaGVsbC5UZXN0KToKICAgICAgICAgaWYgYWRkaXRpb25h bEFyZ3VtZW50czoKICAgICAgICAgICAgIHNlbGYuY29tbWFuZCArPSBhZGRpdGlvbmFsQXJndW1l bnRzCiAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQpCisgICAgICAgIGFwcGVu ZEN1c3RvbUVudmlyb25tZW50VmFyaWFibGVzKHNlbGYsIHNlbGYuZ2V0UHJvcGVydHkoJ3BsYXRm b3JtJykpCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNlbGYpCiAKICAgICBkZWYg Y29tbWFuZENvbXBsZXRlKHNlbGYsIGNtZCk6CkBAIC04NTgsNiArODgwLDcgQEAgY2xhc3MgUnVu V2ViRHJpdmVyVGVzdHMoc2hlbGwuVGVzdCk6CiAgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQo c2VsZi5jb21tYW5kICsgYWRkaXRpb25hbEFyZ3VtZW50cykKIAogICAgICAgICBhcHBlbmRDdXN0 b21CdWlsZEZsYWdzKHNlbGYsIHNlbGYuZ2V0UHJvcGVydHkoJ3BsYXRmb3JtJyksIHNlbGYuZ2V0 UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScpKQorICAgICAgICBhcHBlbmRDdXN0b21FbnZpcm9ubWVu dFZhcmlhYmxlcyhzZWxmLCBzZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScpKQogICAgICAgICBy ZXR1cm4gc2hlbGwuVGVzdC5zdGFydChzZWxmKQogCiAgICAgZGVmIGNvbW1hbmRDb21wbGV0ZShz ZWxmLCBjbWQpOgpkaWZmIC0tZ2l0IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxk L3N0ZXBzLnB5IGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZXdzLWJ1aWxkL3N0ZXBzLnB5Cmlu ZGV4IGM1ZWM4MDhmMGQ3YTU3OWM3YTg3NTZiOGFkNjcyN2I0ZjcwMDdmZGIuLjNiNDlkMTIyZGNi ZmY3ODRmMzJlYjNhMzcyNWY4OGY3MDJiNDdiOGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xh dmVTdXBwb3J0L2V3cy1idWlsZC9zdGVwcy5weQorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9y dC9ld3MtYnVpbGQvc3RlcHMucHkKQEAgLTc0Niw2ICs3NDYsOSBAQCBjbGFzcyBJbnN0YWxsR3Rr RGVwZW5kZW5jaWVzKHNoZWxsLlNoZWxsQ29tbWFuZCk6CiAgICAgZGVmIF9faW5pdF9fKHNlbGYs ICoqa3dhcmdzKToKICAgICAgICAgc3VwZXIoSW5zdGFsbEd0a0RlcGVuZGVuY2llcywgc2VsZiku X19pbml0X18obG9nRW52aXJvbj1GYWxzZSwgKiprd2FyZ3MpCiAKKyAgICBkZWYgc3RhcnQoc2Vs Zik6CisgICAgICAgIGFwcGVuZEN1c3RvbUVudmlyb25tZW50VmFyaWFibGVzKHNlbGYsIHNlbGYu Z2V0UHJvcGVydHkoJ3BsYXRmb3JtJykpCisgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1h bmQuc3RhcnQoc2VsZikKIAogY2xhc3MgSW5zdGFsbFdwZURlcGVuZGVuY2llcyhzaGVsbC5TaGVs bENvbW1hbmQpOgogICAgIG5hbWUgPSAnamhidWlsZCcKQEAgLTc1Nyw2ICs3NjAsMTAgQEAgY2xh c3MgSW5zdGFsbFdwZURlcGVuZGVuY2llcyhzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIGRlZiBf X2luaXRfXyhzZWxmLCAqKmt3YXJncyk6CiAgICAgICAgIHN1cGVyKEluc3RhbGxXcGVEZXBlbmRl bmNpZXMsIHNlbGYpLl9faW5pdF9fKGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQogCisgICAg ZGVmIHN0YXJ0KHNlbGYpOgorICAgICAgICBhcHBlbmRDdXN0b21FbnZpcm9ubWVudFZhcmlhYmxl cyhzZWxmLCBzZWxmLmdldFByb3BlcnR5KCdwbGF0Zm9ybScpKQorICAgICAgICByZXR1cm4gc2hl bGwuU2hlbGxDb21tYW5kLnN0YXJ0KHNlbGYpCisKIAogZGVmIGFwcGVuZEN1c3RvbUJ1aWxkRmxh Z3Moc3RlcCwgcGxhdGZvcm0sIGZ1bGxQbGF0Zm9ybSk6CiAgICAgIyBGSVhNRTogTWFrZSBhIGNv bW1vbiAnc3VwcG9ydGVkIHBsYXRmb3JtcycgbGlzdC4KQEAgLTc2OSw2ICs3NzYsMTEgQEAgZGVm IGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Moc3RlcCwgcGxhdGZvcm0sIGZ1bGxQbGF0Zm9ybSk6CiAg ICAgc3RlcC5zZXRDb21tYW5kKHN0ZXAuY29tbWFuZCArIFsnLS0nICsgcGxhdGZvcm1dKQogCiAK K2RlZiBhcHBlbmRDdXN0b21FbnZpcm9ubWVudFZhcmlhYmxlcyhzdGVwLCBwbGF0Zm9ybSk6Cisg ICAgaWYgcGxhdGZvcm0gaW4gKCdndGsnLCAnd3BlJyk6CisgICAgICAgIHN0ZXAuc2xhdmVFbnZp cm9ubWVudFsnV0VCS0lUX0pIQlVJTEQnXSA9ICcxJworCisKIGNsYXNzIEJ1aWxkTG9nTGluZU9i c2VydmVyKGxvZ29ic2VydmVyLkxvZ0xpbmVPYnNlcnZlciwgb2JqZWN0KToKICAgICBkZWYgX19p bml0X18oc2VsZiwgZXJyb3JSZWNlaXZlZD1Ob25lKToKICAgICAgICAgc2VsZi5lcnJvclJlY2Vp dmVkID0gZXJyb3JSZWNlaXZlZApAQCAtODIzLDYgKzgzNSw3IEBAIGNsYXNzIENvbXBpbGVXZWJL aXQoc2hlbGwuQ29tcGlsZSk6CiAgICAgICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21t YW5kICsgWydERUJVR19JTkZPUk1BVElPTl9GT1JNQVQ9ZHdhcmYtd2l0aC1kc3ltJ10pCiAgICAg ICAgICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWydDTEFOR19ERUJVR19JTkZP Uk1BVElPTl9MRVZFTD1saW5lLXRhYmxlcy1vbmx5J10pCiAKKyAgICAgICAgYXBwZW5kQ3VzdG9t RW52aXJvbm1lbnRWYXJpYWJsZXMoc2VsZiwgcGxhdGZvcm0pCiAgICAgICAgIGFwcGVuZEN1c3Rv bUJ1aWxkRmxhZ3Moc2VsZiwgcGxhdGZvcm0sIHNlbGYuZ2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9y bScpKQogCiAgICAgICAgIHJldHVybiBzaGVsbC5Db21waWxlLnN0YXJ0KHNlbGYpCkBAIC05NjQs NiArOTc3LDcgQEAgY2xhc3MgUnVuSmF2YVNjcmlwdENvcmVUZXN0cyhzaGVsbC5UZXN0KToKICAg ICAgICAgaWYgcGxhdGZvcm0gPT0gJ2pzYy1vbmx5JyBhbmQgcmVtb3Rlc2ZpbGU6CiAgICAgICAg ICAgICBzZWxmLmNvbW1hbmQuZXh0ZW5kKFsnLS1uby10ZXN0bWFzbScsICctLW5vLXRlc3RhaXIn LCAnLS1uby10ZXN0YjMnLCAnLS1uby10ZXN0ZGZnJywgJy0tbm8tdGVzdGFwaScsICctLW1lbW9y eS1saW1pdGVkJ10pCiAgICAgICAgIGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Moc2VsZiwgc2VsZi5n ZXRQcm9wZXJ0eSgncGxhdGZvcm0nKSwgc2VsZi5nZXRQcm9wZXJ0eSgnZnVsbFBsYXRmb3JtJykp CisgICAgICAgIGFwcGVuZEN1c3RvbUVudmlyb25tZW50VmFyaWFibGVzKHNlbGYsIHNlbGYuZ2V0 UHJvcGVydHkoJ3BsYXRmb3JtJykpCiAgICAgICAgIHJldHVybiBzaGVsbC5UZXN0LnN0YXJ0KHNl bGYpCiAKICAgICBkZWYgZXZhbHVhdGVDb21tYW5kKHNlbGYsIGNtZCk6CkBAIC0xMjA1LDYgKzEy MTksNyBAQCBjbGFzcyBSdW5XZWJLaXRUZXN0cyhzaGVsbC5UZXN0KToKIAogICAgICAgICBpZiBh ZGRpdGlvbmFsQXJndW1lbnRzOgogICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29t bWFuZCArIGFkZGl0aW9uYWxBcmd1bWVudHMpCisgICAgICAgIGFwcGVuZEN1c3RvbUVudmlyb25t ZW50VmFyaWFibGVzKHNlbGYsIHBsYXRmb3JtKQogICAgICAgICByZXR1cm4gc2hlbGwuVGVzdC5z dGFydChzZWxmKQogCiAgICAgIyBGSVhNRTogVGhpcyB3aWxsIGJyZWFrIGlmIHJ1bi13ZWJraXQt dGVzdHMgY2hhbmdlcyBpdHMgZGVmYXVsdCBsb2cgZm9ybWF0dGVyLgpAQCAtMTYxNyw3ICsxNjMy LDkgQEAgY2xhc3MgUnVuQVBJVGVzdHMoVGVzdFdpdGhGYWlsdXJlQ291bnQpOgogICAgICAgICBz dXBlcihSdW5BUElUZXN0cywgc2VsZikuX19pbml0X18obG9nRW52aXJvbj1GYWxzZSwgKiprd2Fy Z3MpCiAKICAgICBkZWYgc3RhcnQoc2VsZik6Ci0gICAgICAgIGFwcGVuZEN1c3RvbUJ1aWxkRmxh Z3Moc2VsZiwgc2VsZi5nZXRQcm9wZXJ0eSgncGxhdGZvcm0nKSwgc2VsZi5nZXRQcm9wZXJ0eSgn ZnVsbFBsYXRmb3JtJykpCisgICAgICAgIHBsYXRmb3JtID0gc2VsZi5nZXRQcm9wZXJ0eSgncGxh dGZvcm0nKQorICAgICAgICBhcHBlbmRDdXN0b21CdWlsZEZsYWdzKHNlbGYsIHBsYXRmb3JtLCBz ZWxmLmdldFByb3BlcnR5KCdmdWxsUGxhdGZvcm0nKSkKKyAgICAgICAgYXBwZW5kQ3VzdG9tRW52 aXJvbm1lbnRWYXJpYWJsZXMoc2VsZiwgcGxhdGZvcm0pCiAgICAgICAgIHJldHVybiBUZXN0V2l0 aEZhaWx1cmVDb3VudC5zdGFydChzZWxmKQogCiAgICAgZGVmIGNvdW50RmFpbHVyZXMoc2VsZiwg Y21kKToKZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2d0ay9idWlsZGJvdC9y dW4gYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9ndGsvYnVpbGRib3QvcnVuCmluZGV4IDE2NmMz ODNlYThlNmMxMGZjYzA1ZWYwN2VkNGY0ODg5YmJiYjllYWEuLjBhNzQ0MTE5NmIzODhlOGJjZDdh NTY3Y2I5Y2IxZDFjZDNlOTA0OTAgMTAwNzU1Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0 L2d0ay9idWlsZGJvdC9ydW4KKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvZ3RrL2J1aWxk Ym90L3J1bgpAQCAtNjgsNiArNjgsNyBAQCBleGVjIC91c3IvYmluL2VudiAtICAgICAgICAgIFwK IAkJU0hFTEw9L2Jpbi9iYXNoICAgICAgICAgICAgICBcCiAJCUxBTkc9ZW5fVVMuVVRGLTggICAg ICAgICAgICAgIFwKIAkJVVNFUj0iJHtidWlsZGJvdF91c2VyfSIgICAgICAgIFwKKwkJV0VCS0lU X0pIQlVJTEQ9MSBcCiAJCUxPR05BTUU9IiR7YnVpbGRib3RfdXNlcn0iICAgICAgXAogCQlIT01F PSIvaG9tZS8ke2J1aWxkYm90X3VzZXJ9IiAgICBcCiAJCURJU1BMQVk9IiR7eHZmYl9kaXNwbGF5 Oi0nOjEwJ30iICBcCg==