211903 2020-05-14 10:02:41 -0700 run-webkit-tests shouldn't need Xcode to run Mac tests 2020-05-14 16:38:27 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap ews-watchlist glenn ryanhaddad slewis webkit-bug-importer oldest_to_newest 1652677 0 jbedard 2020-05-14 10:02:41 -0700 A number of commands in run-webkit-tests require Xcode when running on Mac, despite the fact that actually running layout tests doesn't require Xcode. 1652678 1 jbedard 2020-05-14 10:03:10 -0700 <rdar://problem/63205839> 1652681 2 399373 jbedard 2020-05-14 10:06:30 -0700 Created attachment 399373 Patch 1652682 3 399373 ap 2020-05-14 10:12:09 -0700 Comment on attachment 399373 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399373&action=review > Tools/Scripts/webkitpy/common/system/platforminfo.py:169 > + self._executive.run_command(['xcrun', '--version']) I don't think that this is going to fail in all configurations that we care about. 1652708 4 399381 jbedard 2020-05-14 11:24:23 -0700 Created attachment 399381 Patch 1652737 5 399381 slewis 2020-05-14 12:10:03 -0700 Comment on attachment 399381 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399381&action=review > Tools/Scripts/webkitpy/common/system/platforminfo.py:181 > raise NotImplementedError This seems like a change in behavior that could cause an exception. For my own understanding Is there any chance this could be called in cases where there is no Xcode installed and it wouldn't be a hard failure? 1652764 6 jbedard 2020-05-14 13:10:50 -0700 (In reply to Stephanie Lewis from comment #5) > Comment on attachment 399381 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=399381&action=review > > > Tools/Scripts/webkitpy/common/system/platforminfo.py:181 > > raise NotImplementedError > > This seems like a change in behavior that could cause an exception. For my > own understanding Is there any chance this could be called in cases where > there is no Xcode installed and it wouldn't be a hard failure? From what I've seen, if you don't have a macosx SDK, you won't have xcodebuild anyways, so the next command will fail with an exception. The only thing we're changing here is the exception raised. 1652800 7 399413 jbedard 2020-05-14 14:40:53 -0700 Created attachment 399413 Patch 1652865 8 ews-feeder 2020-05-14 16:38:27 -0700 Committed r261722: <https://trac.webkit.org/changeset/261722> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399413. 399373 2020-05-14 10:06:30 -0700 2020-05-14 11:24:21 -0700 Patch bug-211903-20200514100629.patch text/plain 3361 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MTY5NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTA1LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIHNob3VsZG4ndCBuZWVkIFhjb2RlIHRvIHJ1 biBNYWMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMTkwMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjMyMDU4Mzk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5OgorICAgICAgICAoUGxhdGZvcm1JbmZvKToK KyAgICAgICAgKFBsYXRmb3JtSW5mby5oYXNfeGNvZGUpOiBDaGVjayBpZiBhIG1hY2hpbmUgaGFz IFhjb2RlLgorICAgICAgICAoUGxhdGZvcm1JbmZvLnhjb2RlX3Nka192ZXJzaW9uKTogQ2hlY2sg Zm9yIFhjb2RlLCBub3QganVzdCBNYWNPUy4KKyAgICAgICAgKFBsYXRmb3JtSW5mby54Y29kZV9z aW1jdGxfbGlzdCk6IERpdHRvLgorICAgICAgICAoUGxhdGZvcm1JbmZvLnhjb2RlX3ZlcnNpb24p OiBEaXR0by4KKyAgICAgICAgKFBsYXRmb3JtSW5mby5hdmFpbGFibGVfc2Rrcyk6IERpdHRvLgor CiAyMDIwLTA1LTE0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgog CiAgICAgICAgIHN0cmVzcy9hcnJheS1idWZmZXItdmlldy13YXRjaHBvaW50LWNhbi1iZS1maXJl ZC1pbi1yZWFsbHktYWRkLWluLWRmZy5qcyBmYWlsaW5nIG9uIHBwYzY0bGUgYW5kIHMzOTB4Cklu ZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0 Zm9ybWluZm8ucHkJKHJldmlzaW9uIDI2MTU2NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv Y29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkJKHdvcmtpbmcgY29weSkKQEAgLTMxLDkgKzMx LDEwIEBAIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUKIGltcG9ydCBzeXMKIAorZnJvbSB3ZWJr aXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi52ZXJzaW9uIGltcG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi52ZXJzaW9uX25h bWVfbWFwIGltcG9ydCBQVUJMSUNfVEFCTEUsIElOVEVSTkFMX1RBQkxFLCBWZXJzaW9uTmFtZU1h cAotZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgRXhlY3V0aXZl Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUs IFNjcmlwdEVycm9yCiAKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAt MTU5LDggKzE2MCwyMCBAQCBjbGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICAgICAgICAg IHJldHVybiBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWycvdXNyL2Jpbi9zd192ZXJzJywg Jy1idWlsZFZlcnNpb24nXSwgcmV0dXJuX3N0ZGVycj1GYWxzZSwgaWdub3JlX2Vycm9ycz1UcnVl KS5yc3RyaXAoKQogICAgICAgICByZXR1cm4gTm9uZQogCisgICAgQG1lbW9pemVkCisgICAgZGVm IGhhc194Y29kZShzZWxmKToKKyAgICAgICAgaWYgbm90IHNlbGYuaXNfbWFjKCk6CisgICAgICAg ICAgICByZXR1cm4gRmFsc2UKKworICAgICAgICB0cnk6CisgICAgICAgICAgICBzZWxmLl9leGVj dXRpdmUucnVuX2NvbW1hbmQoWyd4Y3J1bicsICctLXZlcnNpb24nXSkKKyAgICAgICAgZXhjZXB0 IChPU0Vycm9yLCBTY3JpcHRFcnJvcik6CisgICAgICAgICAgICByZXR1cm4gRmFsc2UKKyAgICAg ICAgcmV0dXJuIFRydWUKKworICAgIEBtZW1vaXplZAogICAgIGRlZiB4Y29kZV9zZGtfdmVyc2lv bihzZWxmLCBzZGtfbmFtZSk6Ci0gICAgICAgIGlmIHNlbGYuaXNfbWFjKCk6CisgICAgICAgIGlm IHNlbGYuaGFzX3hjb2RlKCk6CiAgICAgICAgICAgICAjIEFzc3VtZXMgdGhhdCB4Y3J1biBkb2Vz IG5vdCB3cml0ZSB0byBzdGFuZGFyZCBvdXRwdXQgb24gZmFpbHVyZSAoZS5nLiBTREsgZG9lcyBu b3QgZXhpc3QpLgogICAgICAgICAgICAgeGNydW5fb3V0cHV0ID0gc2VsZi5fZXhlY3V0aXZlLnJ1 bl9jb21tYW5kKFsneGNydW4nLCAnLS1zZGsnLCBzZGtfbmFtZSwgJy0tc2hvdy1zZGstdmVyc2lv biddLCByZXR1cm5fc3RkZXJyPUZhbHNlLCBpZ25vcmVfZXJyb3JzPVRydWUpLnJzdHJpcCgpCiAg ICAgICAgICAgICBpZiB4Y3J1bl9vdXRwdXQ6CkBAIC0xNjgsMTggKzE4MSwyMCBAQCBjbGFzcyBQ bGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICAgICAgcmV0dXJuIE5vbmUKIAogICAgIGRlZiB4Y29k ZV9zaW1jdGxfbGlzdChzZWxmKToKLSAgICAgICAgaWYgbm90IHNlbGYuaXNfbWFjKCk6CisgICAg ICAgIGlmIG5vdCBzZWxmLmhhc194Y29kZSgpOgogICAgICAgICAgICAgcmV0dXJuICgpCiAgICAg ICAgIG91dHB1dCA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ3hjcnVuJywgJ3NpbWN0 bCcsICdsaXN0J10sIHJldHVybl9zdGRlcnI9RmFsc2UpCiAgICAgICAgIHJldHVybiAobGluZSBm b3IgbGluZSBpbiBvdXRwdXQuc3BsaXRsaW5lcygpKQogCisgICAgQG1lbW9pemVkCiAgICAgZGVm IHhjb2RlX3ZlcnNpb24oc2VsZik6Ci0gICAgICAgIGlmIG5vdCBzZWxmLmlzX21hYygpOgorICAg ICAgICBpZiBub3Qgc2VsZi5oYXNfeGNvZGUoKToKICAgICAgICAgICAgIHJhaXNlIE5vdEltcGxl bWVudGVkRXJyb3IKICAgICAgICAgcmV0dXJuIFZlcnNpb24uZnJvbV9zdHJpbmcoc2VsZi5fZXhl Y3V0aXZlLnJ1bl9jb21tYW5kKFsneGNvZGVidWlsZCcsICctdmVyc2lvbiddKS5zcGxpdCgpWzFd KQogCisgICAgQG1lbW9pemVkCiAgICAgZGVmIGF2YWlsYWJsZV9zZGtzKHNlbGYpOgotICAgICAg ICBpZiBub3Qgc2VsZi5pc19tYWMoKToKKyAgICAgICAgaWYgbm90IHNlbGYuaGFzX3hjb2RlKCk6 CiAgICAgICAgICAgICByZXR1cm4gW10KIAogICAgICAgICBYQ09ERV9TREtfUkVHRVggPSByZS5j b21waWxlKCdcLXNkayAoP1A8c2RrPlxEKylcZCtcLlxkKyg/UDxzcGVjaWZpZXI+XEQqKScpCg== 399381 2020-05-14 11:24:23 -0700 2020-05-14 14:40:51 -0700 Patch bug-211903-20200514112422.patch text/plain 2573 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MTY5NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIwLTA1LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIHNob3VsZG4ndCBuZWVkIFhjb2RlIHRvIHJ1 biBNYWMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMTkwMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjMyMDU4Mzk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5OgorICAgICAgICAoUGxhdGZvcm1JbmZvKToK KyAgICAgICAgKFBsYXRmb3JtSW5mby54Y29kZV9zZGtfdmVyc2lvbik6IE1lbW9pemUgU0RLIHZl cnNpb24gcmV0cmlldmFsLgorICAgICAgICAoUGxhdGZvcm1JbmZvLnhjb2RlX3ZlcnNpb24pOiBP bmx5IHJ1biB4Y29kZWJ1aWxkIGlmIG1hY29zeCBTREsgaXMgcHJlc2VudC4KKyAgICAgICAgKFBs YXRmb3JtSW5mby5hdmFpbGFibGVfc2Rrcyk6IERpdHRvLgorCiAyMDIwLTA1LTE0ICBNaWNoYWVs IENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgogCiAgICAgICAgIHN0cmVzcy9hcnJh eS1idWZmZXItdmlldy13YXRjaHBvaW50LWNhbi1iZS1maXJlZC1pbi1yZWFsbHktYWRkLWluLWRm Zy5qcyBmYWlsaW5nIG9uIHBwYzY0bGUgYW5kIHMzOTB4CkluZGV4OiBUb29scy9TY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm8ucHkJKHJldmlzaW9u IDI2MTU2NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9y bWluZm8ucHkJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDcgQEAgaW1wb3J0IGxvZ2dpbmcK IGltcG9ydCByZQogaW1wb3J0IHN5cwogCitmcm9tIHdlYmtpdHB5LmNvbW1vbi5tZW1vaXplZCBp bXBvcnQgbWVtb2l6ZWQKIGZyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb24gaW1wb3J0IFZlcnNp b24KIGZyb20gd2Via2l0cHkuY29tbW9uLnZlcnNpb25fbmFtZV9tYXAgaW1wb3J0IFBVQkxJQ19U QUJMRSwgSU5URVJOQUxfVEFCTEUsIFZlcnNpb25OYW1lTWFwCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBFeGVjdXRpdmUKQEAgLTE1OSw2ICsxNjAsNyBAQCBj bGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICAgICAgICAgIHJldHVybiBzZWxmLl9leGVj dXRpdmUucnVuX2NvbW1hbmQoWycvdXNyL2Jpbi9zd192ZXJzJywgJy1idWlsZFZlcnNpb24nXSwg cmV0dXJuX3N0ZGVycj1GYWxzZSwgaWdub3JlX2Vycm9ycz1UcnVlKS5yc3RyaXAoKQogICAgICAg ICByZXR1cm4gTm9uZQogCisgICAgQG1lbW9pemVkCiAgICAgZGVmIHhjb2RlX3Nka192ZXJzaW9u KHNlbGYsIHNka19uYW1lKToKICAgICAgICAgaWYgc2VsZi5pc19tYWMoKToKICAgICAgICAgICAg ICMgQXNzdW1lcyB0aGF0IHhjcnVuIGRvZXMgbm90IHdyaXRlIHRvIHN0YW5kYXJkIG91dHB1dCBv biBmYWlsdXJlIChlLmcuIFNESyBkb2VzIG5vdCBleGlzdCkuCkBAIC0xNzMsMTMgKzE3NSwxNSBA QCBjbGFzcyBQbGF0Zm9ybUluZm8ob2JqZWN0KToKICAgICAgICAgb3V0cHV0ID0gc2VsZi5fZXhl Y3V0aXZlLnJ1bl9jb21tYW5kKFsneGNydW4nLCAnc2ltY3RsJywgJ2xpc3QnXSwgcmV0dXJuX3N0 ZGVycj1GYWxzZSkKICAgICAgICAgcmV0dXJuIChsaW5lIGZvciBsaW5lIGluIG91dHB1dC5zcGxp dGxpbmVzKCkpCiAKKyAgICBAbWVtb2l6ZWQKICAgICBkZWYgeGNvZGVfdmVyc2lvbihzZWxmKToK LSAgICAgICAgaWYgbm90IHNlbGYuaXNfbWFjKCk6CisgICAgICAgIGlmIG5vdCBzZWxmLnhjb2Rl X3Nka192ZXJzaW9uKCdtYWNvc3gnKToKICAgICAgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVk RXJyb3IKICAgICAgICAgcmV0dXJuIFZlcnNpb24uZnJvbV9zdHJpbmcoc2VsZi5fZXhlY3V0aXZl LnJ1bl9jb21tYW5kKFsneGNvZGVidWlsZCcsICctdmVyc2lvbiddKS5zcGxpdCgpWzFdKQogCisg ICAgQG1lbW9pemVkCiAgICAgZGVmIGF2YWlsYWJsZV9zZGtzKHNlbGYpOgotICAgICAgICBpZiBu b3Qgc2VsZi5pc19tYWMoKToKKyAgICAgICAgaWYgbm90IHNlbGYueGNvZGVfc2RrX3ZlcnNpb24o J21hY29zeCcpOgogICAgICAgICAgICAgcmV0dXJuIFtdCiAKICAgICAgICAgWENPREVfU0RLX1JF R0VYID0gcmUuY29tcGlsZSgnXC1zZGsgKD9QPHNkaz5cRCspXGQrXC5cZCsoP1A8c3BlY2lmaWVy PlxEKiknKQo= 399413 2020-05-14 14:40:53 -0700 2020-05-14 16:38:27 -0700 Patch bug-211903-20200514144052.patch text/plain 3900 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2MTcwOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDIwLTA1LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzIHNob3VsZG4ndCBuZWVkIFhjb2RlIHRvIHJ1 biBNYWMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIxMTkwMworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjMyMDU4Mzk+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgU3RlcGhhbmllIExld2lzLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weToKKyAgICAgICAgKFBsYXRmb3JtSW5mbyk6 CisgICAgICAgIChQbGF0Zm9ybUluZm8ueGNvZGVfc2RrX3ZlcnNpb24pOiBNZW1vaXplIFNESyB2 ZXJzaW9uIHJldHJpZXZhbC4KKyAgICAgICAgKFBsYXRmb3JtSW5mby54Y29kZV92ZXJzaW9uKTog T25seSBydW4geGNvZGVidWlsZCBpZiBtYWNvc3ggU0RLIGlzIHByZXNlbnQuCisgICAgICAgIChQ bGF0Zm9ybUluZm8uYXZhaWxhYmxlX3Nka3MpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL3dl YmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX3VuaXR0ZXN0LnB5OgorICAgICAgICAo VGVzdFBsYXRmb3JtSW5mby50ZXN0X2F2YWlsYWJsZV9zZGtzKToKKwogMjAyMC0wNS0xNCAgQW5k cmVzIEdvbnphbGV6ICA8YW5kcmVzZ18yMkBhcHBsZS5jb20+CiAKICAgICAgICAgRml4IGZvciBj cmFzaGVzIGluIExheW91dFRlc3RzIHJlbGF0ZWQgdG8gVGV4dE1hcmtlcnMgaW4gaXNvbGF0ZWQg dHJlZSBtb2RlLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3Bs YXRmb3JtaW5mby5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1v bi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CShyZXZpc2lvbiAyNjE1NjUpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CSh3b3JraW5nIGNvcHkp CkBAIC0zMSw2ICszMSw3IEBAIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUKIGltcG9ydCBzeXMK IAorZnJvbSB3ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCiBmcm9tIHdl YmtpdHB5LmNvbW1vbi52ZXJzaW9uIGltcG9ydCBWZXJzaW9uCiBmcm9tIHdlYmtpdHB5LmNvbW1v bi52ZXJzaW9uX25hbWVfbWFwIGltcG9ydCBQVUJMSUNfVEFCTEUsIElOVEVSTkFMX1RBQkxFLCBW ZXJzaW9uTmFtZU1hcAogZnJvbSB3ZWJraXRweS5jb21tb24uc3lzdGVtLmV4ZWN1dGl2ZSBpbXBv cnQgRXhlY3V0aXZlCkBAIC0xNTksNiArMTYwLDcgQEAgY2xhc3MgUGxhdGZvcm1JbmZvKG9iamVj dCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5fZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsnL3Vz ci9iaW4vc3dfdmVycycsICctYnVpbGRWZXJzaW9uJ10sIHJldHVybl9zdGRlcnI9RmFsc2UsIGln bm9yZV9lcnJvcnM9VHJ1ZSkucnN0cmlwKCkKICAgICAgICAgcmV0dXJuIE5vbmUKIAorICAgIEBt ZW1vaXplZAogICAgIGRlZiB4Y29kZV9zZGtfdmVyc2lvbihzZWxmLCBzZGtfbmFtZSk6CiAgICAg ICAgIGlmIHNlbGYuaXNfbWFjKCk6CiAgICAgICAgICAgICAjIEFzc3VtZXMgdGhhdCB4Y3J1biBk b2VzIG5vdCB3cml0ZSB0byBzdGFuZGFyZCBvdXRwdXQgb24gZmFpbHVyZSAoZS5nLiBTREsgZG9l cyBub3QgZXhpc3QpLgpAQCAtMTczLDEzICsxNzUsMTUgQEAgY2xhc3MgUGxhdGZvcm1JbmZvKG9i amVjdCk6CiAgICAgICAgIG91dHB1dCA9IHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ3hj cnVuJywgJ3NpbWN0bCcsICdsaXN0J10sIHJldHVybl9zdGRlcnI9RmFsc2UpCiAgICAgICAgIHJl dHVybiAobGluZSBmb3IgbGluZSBpbiBvdXRwdXQuc3BsaXRsaW5lcygpKQogCisgICAgQG1lbW9p emVkCiAgICAgZGVmIHhjb2RlX3ZlcnNpb24oc2VsZik6Ci0gICAgICAgIGlmIG5vdCBzZWxmLmlz X21hYygpOgorICAgICAgICBpZiBub3Qgc2VsZi54Y29kZV9zZGtfdmVyc2lvbignbWFjb3N4Jyk6 CiAgICAgICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yCiAgICAgICAgIHJldHVybiBW ZXJzaW9uLmZyb21fc3RyaW5nKHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ3hjb2RlYnVp bGQnLCAnLXZlcnNpb24nXSkuc3BsaXQoKVsxXSkKIAorICAgIEBtZW1vaXplZAogICAgIGRlZiBh dmFpbGFibGVfc2RrcyhzZWxmKToKLSAgICAgICAgaWYgbm90IHNlbGYuaXNfbWFjKCk6CisgICAg ICAgIGlmIG5vdCBzZWxmLnhjb2RlX3Nka192ZXJzaW9uKCdtYWNvc3gnKToKICAgICAgICAgICAg IHJldHVybiBbXQogCiAgICAgICAgIFhDT0RFX1NES19SRUdFWCA9IHJlLmNvbXBpbGUoJ1wtc2Rr ICg/UDxzZGs+XEQrKVxkK1wuXGQrKD9QPHNwZWNpZmllcj5cRCopJykKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fdW5pdHRlc3QucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3Jt aW5mb191bml0dGVzdC5weQkocmV2aXNpb24gMjYxNTY1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb191bml0dGVzdC5weQkod29ya2luZyBjb3B5 KQpAQCAtMTYwLDYgKzE2MCwxMCBAQCBjbGFzcyBUZXN0UGxhdGZvcm1JbmZvKHVuaXR0ZXN0LlRl c3RDYXNlCiAgICAgICAgIHNlbGYuYXNzZXJ0SXNOb25lKGluZm8udG90YWxfYnl0ZXNfbWVtb3J5 KCkpCiAKICAgICBkZWYgdGVzdF9hdmFpbGFibGVfc2RrcyhzZWxmKToKKyAgICAgICAgc2RrX3Zl cnNpb25fb3V0cHV0ID0gJzEwLjE2XG4nCisgICAgICAgIGluZm8gPSBzZWxmLm1ha2VfaW5mbyhm YWtlX3N5cygnZGFyd2luJyksIGZha2VfcGxhdGZvcm0oJzEwLjE0LjAnKSwgZmFrZV9leGVjdXRp dmUoc2RrX3ZlcnNpb25fb3V0cHV0KSkKKyAgICAgICAgaW5mby54Y29kZV9zZGtfdmVyc2lvbign bWFjb3N4JykKKwogICAgICAgICBzaG93X3Nka3Nfb3V0cHV0ID0gIiIiaU9TIFNES3M6CiAgICAg aU9TIDEyLjAgICAgICAgICAgICAgICAgICAgICAgICAgIC1zZGsgaXBob25lb3MxMi4wCiAKQEAg LTE3Nyw3ICsxODEsNyBAQCB3YXRjaE9TIFNpbXVsYXRvciBTREtzOgogICAgIFNpbXVsYXRvciAt IHdhdGNoT1MgNS4wICAgICAgICAgICAtc2RrIHdhdGNoc2ltdWxhdG9yNS4wCiAgICAgU2ltdWxh dG9yIC0gd2F0Y2hPUyA1LjAgSW50ZXJuYWwgICAgLXNkayB3YXRjaHNpbXVsYXRvcjUuMC50eXBl CiAiIiIKLSAgICAgICAgaW5mbyA9IHNlbGYubWFrZV9pbmZvKGZha2Vfc3lzKCdkYXJ3aW4nKSwg ZmFrZV9wbGF0Zm9ybSgnMTAuMTQuMCcpLCBmYWtlX2V4ZWN1dGl2ZShzaG93X3Nka3Nfb3V0cHV0 KSkKKyAgICAgICAgaW5mby5fZXhlY3V0aXZlID0gZmFrZV9leGVjdXRpdmUoc2hvd19zZGtzX291 dHB1dCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpbmZvLmF2YWlsYWJsZV9zZGtzKCksIFsK ICAgICAgICAgICAgICdpcGhvbmVvcycsCiAgICAgICAgICAgICAnaXBob25lc2ltdWxhdG9yJywg J2lwaG9uZXNpbXVsYXRvci50eXBlJywK