167613 2017-01-30 15:56:22 -0800 Workaround for simctl launch bug 2017-01-30 20:52:08 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jbedard jbedard ap commit-queue dbates glenn lforschler oldest_to_newest 1271458 0 jbedard 2017-01-30 15:56:22 -0800 The combination of simctl install and simctl launch creates race conditions when using multiple simulators. This should both mitigate the effect of these race conditions and provide adequate information and logging for debugging when they do occur. 1271459 1 300155 jbedard 2017-01-30 16:03:38 -0800 Created attachment 300155 Patch 1271481 2 300155 dbates 2017-01-30 16:52:58 -0800 Comment on attachment 300155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300155&action=review > Tools/ChangeLog:3 > + Work around for simctl install/simctl launch bugs Work around => Workaround Is this title still correct? > Tools/ChangeLog:7 > + Please explain the bug that this patch is addressing, how it is addressing it (by adding a workaround), and what the workaround is. > Tools/Scripts/webkitpy/xcode/simulator.py:272 > + output = self._host.executive.run_command(['xcrun', 'simctl', 'listapps', self.udid]) > + if '/{}";\n'.format(os.path.basename(app_path)) in output: > + return True > + raise RuntimeError('Could not find {} installed on {}'.format(app_path, self.udid)) We should not need to do this. simctl install should guarantee that the app was installed upon return. If not, then this is a bug with "simctl install" and we should file it. > Tools/Scripts/webkitpy/xcode/simulator.py:284 > + # FIXME: This seems to be a bug in CoreSimulator, at least partially Please file a bug and reference the bug URL here. > Tools/Scripts/webkitpy/xcode/simulator.py:293 > + counter = 0 It would be more idiomatic to break out the loop here instead of setting counter to 0 and checking the loop condition again. 1271493 3 300155 jbedard 2017-01-30 17:11:11 -0800 Comment on attachment 300155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300155&action=review >> Tools/ChangeLog:3 >> + Work around for simctl install/simctl launch bugs > > Work around => Workaround > > Is this title still correct? I believe so. At least from a usage perspective, the bug involves using these too commands very close together, it's not just a bug in one or the other. 1271494 4 300164 jbedard 2017-01-30 17:16:36 -0800 Created attachment 300164 Patch 1271517 5 300164 dbates 2017-01-30 17:45:14 -0800 Comment on attachment 300164 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300164&action=review > Tools/ChangeLog:3 > + Workaround for simctl install/simctl launch bugs As far as I can tell we are working around a single bug here, <rdar://problem/30273973>. If there is a second bug then please explain it and/or reference its bug URL. If there is only one bug then please update the title of this bug and update this ChangeLog line. > Tools/ChangeLog:7 > + As I mentioned in comment 2, "please explain the bug that this patch is addressing, how it is addressing it (by adding a workaround), and what the workaround is." When explaining the bug it would be useful to note the error message that we are seeing when the bug occurs. > Tools/Scripts/webkitpy/xcode/simulator.py:278 > + # FIXME: This is a workaround for <rdar://problem/30273973>, Racey failure of simctl launch Very Minor: Please use complete sentences that end with a period. > Tools/Scripts/webkitpy/xcode/simulator.py:279 > + def error_handler(error): Minor: This is OK as-is. I would have defined this as a staticmethod named _log_debug_error() to avoid creating a function on each invocation of install_app. Hopefully a person will realize that this logging function is unused and will remove it when it comes time to remove the workaround assuming no other code makes use of it. > Tools/Scripts/webkitpy/xcode/simulator.py:283 > + for x in range(0, 3): Minor: This is OK as-is. Note that range() will allocate a list. I prefer your old approach of using a while loop. Alternatively we can use xrange() [1] that returns an iterator to be more efficient. Hopefully this workaround is short lived. [1] <https://docs.python.org/2/library/functions.html#xrange> > Tools/Scripts/webkitpy/xcode/simulator.py:291 > + ) > + match = re.match(r'(?P<bundle>[^:]+): (?P<pid>\d+)\n', output) > + if match: > + break Very Minor: This is OK as-is. Unlike your previous approach of special casing the workaround logic to a known failure message the approach in this patch will cause us to try to launch the app three times regardless of the simctl failure, logging the thrown exception to the debug log. I hope this workaround is short lived. Otherwise we should likely adopt your former approach and be more precise when we apply the workaround. 1271555 6 300180 jbedard 2017-01-30 19:41:47 -0800 Created attachment 300180 Patch 1271564 7 300180 commit-queue 2017-01-30 20:52:03 -0800 Comment on attachment 300180 Patch Clearing flags on attachment: 300180 Committed r211405: <http://trac.webkit.org/changeset/211405> 1271565 8 commit-queue 2017-01-30 20:52:08 -0800 All reviewed patches have been landed. Closing bug. 300155 2017-01-30 16:03:38 -0800 2017-01-30 17:16:34 -0800 Patch bug-167613-20170130160128.patch text/plain 3281 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMTM5MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTAxLTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBXb3JrIGFyb3VuZCBmb3Igc2ltY3RsIGluc3RhbGwvc2ltY3RsIGxhdW5j aCBidWdzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x Njc2MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdG9yLnB5OgorICAgICAgICAoRGV2aWNlLmlu c3RhbGxfYXBwKTogQ2hlY2sgaWYgdGhlIGFwcCBpcyBpbnN0YWxsZWQgYWZ0ZXIgaW5zdGFsbGlu Zy4KKyAgICAgICAgKERldmljZS5sYXVuY2hfYXBwKTogRXhlY3V0ZSBtdWx0aXBsZSBsYXVuY2gg YXR0ZW1wdHMsIGJldHRlciBsb2dnaW5nIG9mIGZhaWx1cmVzLgorCiAyMDE3LTAxLTMwICBBYWth c2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBRdWV1ZVN0YXR1c1Nl cnZlciBzaG91bGQgaGF2ZSBhbiBleHBsaWNpdCB0aW1lb3V0IGZvciBfZmV0Y2hfdXJsCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQkocmV2aXNpb24gMjEx MzcxKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHkJKHdvcmtp bmcgY29weSkKQEAgLTMwLDYgKzMwLDcgQEAgaW1wb3J0IHRpbWUKIAogZnJvbSB3ZWJraXRweS5i ZW5jaG1hcmtfcnVubmVyLnV0aWxzIGltcG9ydCB0aW1lb3V0CiBmcm9tIHdlYmtpdHB5LmNvbW1v bi5ob3N0IGltcG9ydCBIb3N0Citmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZXhlY3V0aXZl IGltcG9ydCBTY3JpcHRFcnJvcgogCiBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIoX19uYW1lX18p CiAKQEAgLTI2NCw3ICsyNjUsMTIgQEAgY2xhc3MgRGV2aWNlKG9iamVjdCk6CiAgICAgICAgICAg ICByYWlzZSBSdW50aW1lRXJyb3IoJyJ4Y3J1biBzaW1jdGwgZXJhc2UiIGZhaWxlZDogZGV2aWNl IHN0YXRlIGlzIHt9Jy5mb3JtYXQoU2ltdWxhdG9yLmRldmljZV9zdGF0ZSh1ZGlkKSkpCiAKICAg ICBkZWYgaW5zdGFsbF9hcHAoc2VsZiwgYXBwX3BhdGgpOgotICAgICAgICByZXR1cm4gbm90IHNl bGYuX2hvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsneGNydW4nLCAnc2ltY3RsJywgJ2luc3Rh bGwnLCBzZWxmLnVkaWQsIGFwcF9wYXRoXSwgcmV0dXJuX2V4aXRfY29kZT1UcnVlKQorICAgICAg ICBpZiBub3Qgc2VsZi5faG9zdC5leGVjdXRpdmUucnVuX2NvbW1hbmQoWyd4Y3J1bicsICdzaW1j dGwnLCAnaW5zdGFsbCcsIHNlbGYudWRpZCwgYXBwX3BhdGhdLCByZXR1cm5fZXhpdF9jb2RlPVRy dWUpOgorICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5faG9zdC5leGVjdXRpdmUucnVuX2NvbW1h bmQoWyd4Y3J1bicsICdzaW1jdGwnLCAnbGlzdGFwcHMnLCBzZWxmLnVkaWRdKQorICAgICAgICAg ICAgaWYgJy97fSI7XG4nLmZvcm1hdChvcy5wYXRoLmJhc2VuYW1lKGFwcF9wYXRoKSkgaW4gb3V0 cHV0OgorICAgICAgICAgICAgICAgIHJldHVybiBUcnVlCisgICAgICAgICAgICByYWlzZSBSdW50 aW1lRXJyb3IoJ0NvdWxkIG5vdCBmaW5kIHt9IGluc3RhbGxlZCBvbiB7fScuZm9ybWF0KGFwcF9w YXRoLCBzZWxmLnVkaWQpKQorICAgICAgICByZXR1cm4gRmFsc2UKIAogICAgIGRlZiBsYXVuY2hf YXBwKHNlbGYsIGJ1bmRsZV9pZCwgYXJncywgZW52PU5vbmUpOgogICAgICAgICBlbnZpcm9ubWVu dF90b191c2UgPSB7fQpAQCAtMjc1LDEwICsyODEsMjMgQEAgY2xhc3MgRGV2aWNlKG9iamVjdCk6 CiAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAgIGVudmlyb25tZW50X3RvX3VzZVt2 YWx1ZV0gPSBlbnZbdmFsdWVdCiAKLSAgICAgICAgb3V0cHV0ID0gc2VsZi5faG9zdC5leGVjdXRp dmUucnVuX2NvbW1hbmQoCi0gICAgICAgICAgICBbJ3hjcnVuJywgJ3NpbWN0bCcsICdsYXVuY2gn LCBzZWxmLnVkaWQsIGJ1bmRsZV9pZF0gKyBhcmdzLAotICAgICAgICAgICAgZW52PWVudmlyb25t ZW50X3RvX3VzZSwKLSAgICAgICAgKQorICAgICAgICAjIEZJWE1FOiBUaGlzIHNlZW1zIHRvIGJl IGEgYnVnIGluIENvcmVTaW11bGF0b3IsIGF0IGxlYXN0IHBhcnRpYWxseQorICAgICAgICBjb3Vu dGVyID0gMworICAgICAgICB3aGlsZSBjb3VudGVyOgorICAgICAgICAgICAgY291bnRlciAtPSAx CisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgb3V0cHV0ID0gc2VsZi5faG9zdC5l eGVjdXRpdmUucnVuX2NvbW1hbmQoCisgICAgICAgICAgICAgICAgICAgIFsneGNydW4nLCAnc2lt Y3RsJywgJ2xhdW5jaCcsIHNlbGYudWRpZCwgYnVuZGxlX2lkXSArIGFyZ3MsCisgICAgICAgICAg ICAgICAgICAgIGVudj1lbnZpcm9ubWVudF90b191c2UsCisgICAgICAgICAgICAgICAgKQorICAg ICAgICAgICAgICAgIGNvdW50ZXIgPSAwCisgICAgICAgICAgICBleGNlcHQgU2NyaXB0RXJyb3Ig YXMgZToKKyAgICAgICAgICAgICAgICBtYXRjaCA9IHJlLm1hdGNoKHInVGhlIHJlcXVlc3Qgd2Fz IGRlbmllZCBieSBzZXJ2aWNlIGRlbGVnYXRlIFwoKD9QPGRlbGVnYXRlPi4rKVwpIGZvciByZWFz b246ICg/UDxyZWFzb24+LispXG4nLCBlLm91dHB1dCkKKyAgICAgICAgICAgICAgICBpZiBub3Qg bWF0Y2g6CisgICAgICAgICAgICAgICAgICAgIHJhaXNlCisgICAgICAgICAgICAgICAgaWYgbm90 IGNvdW50ZXI6CisgICAgICAgICAgICAgICAgICAgIHJhaXNlIEV4Y2VwdGlvbihlLm1lc3NhZ2Vf d2l0aF9vdXRwdXQoKSkKKyAgICAgICAgICAgICAgICBfbG9nLmRlYnVnKGUubWVzc2FnZV93aXRo X291dHB1dCgpKQogCiAgICAgICAgIG1hdGNoID0gcmUubWF0Y2gocicoP1A8YnVuZGxlPlteOl0r KTogKD9QPHBpZD5cZCspXG4nLCBvdXRwdXQpCiAgICAgICAgIGlmIG5vdCBtYXRjaCBvciBtYXRj aC5ncm91cCgnYnVuZGxlJykgIT0gYnVuZGxlX2lkOgo= 300164 2017-01-30 17:16:36 -0800 2017-01-30 19:41:47 -0800 Patch bug-167613-20170130171426.patch text/plain 2067 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMTM5NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAxLTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBXb3JrYXJvdW5kIGZvciBzaW1jdGwgaW5zdGFsbC9zaW1jdGwgbGF1bmNo IGJ1Z3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2 NzYxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHk6CisgICAgICAgIChEZXZpY2UubGF1 bmNoX2FwcCk6IEV4ZWN1dGUgbXVsdGlwbGUgbGF1bmNoIGF0dGVtcHRzLCBiZXR0ZXIgbG9nZ2lu ZyBvZiBmYWlsdXJlcy4KKwogMjAxNy0wMS0zMCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBh cHBsZS5jb20+CiAKICAgICAgICAgUXVldWVTdGF0dXNTZXJ2ZXIgc2hvdWxkIGhhdmUgYW4gZXhw bGljaXQgdGltZW91dCBmb3IgX2ZldGNoX3VybApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRw eS94Y29kZS9zaW11bGF0b3IucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS94Y29kZS9zaW11bGF0b3IucHkJKHJldmlzaW9uIDIxMTM5NSkKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkveGNvZGUvc2ltdWxhdG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNzUsMTIgKzI3 NSwyMSBAQCBjbGFzcyBEZXZpY2Uob2JqZWN0KToKICAgICAgICAgICAgIGVsc2U6CiAgICAgICAg ICAgICAgICAgZW52aXJvbm1lbnRfdG9fdXNlW3ZhbHVlXSA9IGVudlt2YWx1ZV0KIAotICAgICAg ICBvdXRwdXQgPSBzZWxmLl9ob3N0LmV4ZWN1dGl2ZS5ydW5fY29tbWFuZCgKLSAgICAgICAgICAg IFsneGNydW4nLCAnc2ltY3RsJywgJ2xhdW5jaCcsIHNlbGYudWRpZCwgYnVuZGxlX2lkXSArIGFy Z3MsCi0gICAgICAgICAgICBlbnY9ZW52aXJvbm1lbnRfdG9fdXNlLAotICAgICAgICApCisgICAg ICAgICMgRklYTUU6IFRoaXMgaXMgYSB3b3JrYXJvdW5kIGZvciA8cmRhcjovL3Byb2JsZW0vMzAy NzM5NzM+LCBSYWNleSBmYWlsdXJlIG9mIHNpbWN0bCBsYXVuY2gKKyAgICAgICAgZGVmIGVycm9y X2hhbmRsZXIoZXJyb3IpOgorICAgICAgICAgICAgX2xvZy5kZWJ1ZyhlcnJvci5tZXNzYWdlX3dp dGhfb3V0cHV0KCkpCisKKyAgICAgICAgb3V0cHV0ID0gTm9uZQorICAgICAgICBmb3IgeCBpbiBy YW5nZSgwLCAzKToKKyAgICAgICAgICAgIG91dHB1dCA9IHNlbGYuX2hvc3QuZXhlY3V0aXZlLnJ1 bl9jb21tYW5kKAorICAgICAgICAgICAgICAgIFsneGNydW4nLCAnc2ltY3RsJywgJ2xhdW5jaCcs IHNlbGYudWRpZCwgYnVuZGxlX2lkXSArIGFyZ3MsCisgICAgICAgICAgICAgICAgZW52PWVudmly b25tZW50X3RvX3VzZSwKKyAgICAgICAgICAgICAgICBlcnJvcl9oYW5kbGVyPWVycm9yX2hhbmRs ZXIsCisgICAgICAgICAgICApCisgICAgICAgICAgICBtYXRjaCA9IHJlLm1hdGNoKHInKD9QPGJ1 bmRsZT5bXjpdKyk6ICg/UDxwaWQ+XGQrKVxuJywgb3V0cHV0KQorICAgICAgICAgICAgaWYgbWF0 Y2g6CisgICAgICAgICAgICAgICAgYnJlYWsKIAotICAgICAgICBtYXRjaCA9IHJlLm1hdGNoKHIn KD9QPGJ1bmRsZT5bXjpdKyk6ICg/UDxwaWQ+XGQrKVxuJywgb3V0cHV0KQogICAgICAgICBpZiBu b3QgbWF0Y2ggb3IgbWF0Y2guZ3JvdXAoJ2J1bmRsZScpICE9IGJ1bmRsZV9pZDoKICAgICAgICAg ICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignRmFpbGVkIHRvIGZpbmQgcHJvY2VzcyBpZCBmb3Ige306 IHt9Jy5mb3JtYXQoYnVuZGxlX2lkLCBvdXRwdXQpKQogICAgICAgICByZXR1cm4gaW50KG1hdGNo Lmdyb3VwKCdwaWQnKSkK 300180 2017-01-30 19:41:47 -0800 2017-01-30 20:52:03 -0800 Patch bugFix.patch text/plain 2382 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMTQwMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE3LTAxLTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBXb3JrYXJvdW5kIGZvciBzaW1jdGwgbGF1bmNoIGJ1ZworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NjEzCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgRGFuaWVsIEJhdGVzLgorCisgICAgICAgIHNpbWN0bCBsYXVuY2ggd2lsbCBz b21ldGltZXMgZmFpbCBiZWNhdXNlIG9mIGEgcmFjZSBjb25kaXRpb24gd2hlbiBtYW55CisgICAg ICAgIHNpbXVsYXRvcnMgYXJlIGJlaW5nIHJ1biBzaW11bHRhbmVvdXNseS4gVGhlc2UgZmFpbHVy ZXMgd2lsbCBhbHdheXMgaGF2ZQorICAgICAgICBhbiBleGl0IGNvZGUgb2YgMS4gVGhpcyBjaGFu Z2UgYXR0ZW1wdHMgdG8gbGF1bmNoIGFuIGFwcCBtdWx0aXBsZSB0aW1lcworICAgICAgICBiZWZv cmUgcmVwb3J0aW5nIGEgZmFpbHVyZSB0byB3b3JrYXJvdW5kIHRoaXMgYnVnLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHk6CisgICAgICAgIChEZXZpY2Uu bGF1bmNoX2FwcCk6IEV4ZWN1dGUgbXVsdGlwbGUgbGF1bmNoIGF0dGVtcHRzLCBiZXR0ZXIgbG9n Z2luZyBvZiBmYWlsdXJlcy4KKwogMjAxNy0wMS0zMCAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFw QGFwcGxlLmNvbT4KIAogICAgICAgICBDb21taXQgcXVldWUgZmFpbHMgdG8gbG9vayBhdCByZWFs IG5hbWUgYWxpYXNlcyBmb3IgdGhlIHJldmlld2VyCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3hjb2RlL3NpbXVsYXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3hjb2RlL3NpbXVsYXRvci5weQkocmV2aXNpb24gMjExNDAyKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3NSwxMiAr Mjc1LDIyIEBAIGNsYXNzIERldmljZShvYmplY3QpOgogICAgICAgICAgICAgZWxzZToKICAgICAg ICAgICAgICAgICBlbnZpcm9ubWVudF90b191c2VbdmFsdWVdID0gZW52W3ZhbHVlXQogCi0gICAg ICAgIG91dHB1dCA9IHNlbGYuX2hvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKAotICAgICAgICAg ICAgWyd4Y3J1bicsICdzaW1jdGwnLCAnbGF1bmNoJywgc2VsZi51ZGlkLCBidW5kbGVfaWRdICsg YXJncywKLSAgICAgICAgICAgIGVudj1lbnZpcm9ubWVudF90b191c2UsCi0gICAgICAgICkKKyAg ICAgICAgIyBGSVhNRTogVGhpcyBpcyBhIHdvcmthcm91bmQgZm9yIDxyZGFyOi8vcHJvYmxlbS8z MDI3Mzk3Mz4sIFJhY2V5IGZhaWx1cmUgb2Ygc2ltY3RsIGxhdW5jaC4KKyAgICAgICAgQHN0YXRp Y21ldGhvZAorICAgICAgICBkZWYgX2xvZ19kZWJ1Z19lcnJvcihlcnJvcik6CisgICAgICAgICAg ICBfbG9nLmRlYnVnKGVycm9yLm1lc3NhZ2Vfd2l0aF9vdXRwdXQoKSkKKworICAgICAgICBvdXRw dXQgPSBOb25lCisgICAgICAgIGZvciB4IGluIHhyYW5nZSgzKToKKyAgICAgICAgICAgIG91dHB1 dCA9IHNlbGYuX2hvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKAorICAgICAgICAgICAgICAgIFsn eGNydW4nLCAnc2ltY3RsJywgJ2xhdW5jaCcsIHNlbGYudWRpZCwgYnVuZGxlX2lkXSArIGFyZ3Ms CisgICAgICAgICAgICAgICAgZW52PWVudmlyb25tZW50X3RvX3VzZSwKKyAgICAgICAgICAgICAg ICBlcnJvcl9oYW5kbGVyPV9sb2dfZGVidWdfZXJyb3IsCisgICAgICAgICAgICApCisgICAgICAg ICAgICBtYXRjaCA9IHJlLm1hdGNoKHInKD9QPGJ1bmRsZT5bXjpdKyk6ICg/UDxwaWQ+XGQrKVxu Jywgb3V0cHV0KQorICAgICAgICAgICAgaWYgbWF0Y2g6CisgICAgICAgICAgICAgICAgYnJlYWsK IAotICAgICAgICBtYXRjaCA9IHJlLm1hdGNoKHInKD9QPGJ1bmRsZT5bXjpdKyk6ICg/UDxwaWQ+ XGQrKVxuJywgb3V0cHV0KQogICAgICAgICBpZiBub3QgbWF0Y2ggb3IgbWF0Y2guZ3JvdXAoJ2J1 bmRsZScpICE9IGJ1bmRsZV9pZDoKICAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignRmFp bGVkIHRvIGZpbmQgcHJvY2VzcyBpZCBmb3Ige306IHt9Jy5mb3JtYXQoYnVuZGxlX2lkLCBvdXRw dXQpKQogICAgICAgICByZXR1cm4gaW50KG1hdGNoLmdyb3VwKCdwaWQnKSkK