172374 2017-05-19 12:13:55 -0700 webkitpy: Use simctl boot to run multiple simulators at once 2019-04-05 14:36:49 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard ap buildbot glenn lforschler webkit-bug-importer oldest_to_newest 1310702 0 jbedard 2017-05-19 12:13:55 -0700 Newer versions of Xcode support running multiple simulated devices from a single Simulator.app. Use this functionality instead of copying Simulator.app. 1310703 1 webkit-bug-importer 2017-05-19 12:14:57 -0700 <rdar://problem/32299645> 1310716 2 310684 jbedard 2017-05-19 12:39:45 -0700 Created attachment 310684 Patch 1310717 3 310684 ap 2017-05-19 12:43:30 -0700 Comment on attachment 310684 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=310684&action=review > Tools/Scripts/webkitpy/port/ios_simulator.py:173 > + def has_old_xcode(self): I'd call this use_multiple_simulator_apps. > Tools/Scripts/webkitpy/port/ios_simulator.py:235 > + _log.info('Simulators have booted.') Maybe this would be more clear: "All simulators have booted." 1310734 4 310691 jbedard 2017-05-19 13:10:25 -0700 Created attachment 310691 Patch 1310756 5 jbedard 2017-05-19 13:48:27 -0700 Landed in <https://trac.webkit.org/r217147>. 310684 2017-05-19 12:39:45 -0700 2017-05-19 13:10:23 -0700 Patch bug-172374-20170519123944.patch text/plain 4959 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNzE0MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE3LTA1LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogVXNlIHNpbWN0bCBib290IHRvIHJ1biBtdWx0aXBsZSBz aW11bGF0b3JzIGF0IG9uY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MjM3NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5w eToKKyAgICAgICAgKFBsYXRmb3JtSW5mby54Y29kZV92ZXJzaW9uKTogUmV0dXJuIHRoZSBjdXJy ZW50IHZlcnNpb24gb2YgWGNvZGUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9jb21tb24v c3lzdGVtL3BsYXRmb3JtaW5mb19tb2NrLnB5OgorICAgICAgICAoTW9ja1BsYXRmb3JtSW5mby54 Y29kZV92ZXJzaW9uKTogUmV0dXJuIHZlcnNpb24gOC4wIGZvciB0ZXN0aW5nLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5OgorICAgICAgICAoSU9TU2lt dWxhdG9yUG9ydC5oYXNfb2xkX3hjb2RlKTogQ2hlY2sgaWYgd2UgaGF2ZSBhbiBvbGRlciB2ZXJz aW9uIG9mIFhjb2RlLgorICAgICAgICAoSU9TU2ltdWxhdG9yUG9ydC5fY3JlYXRlX3NpbXVsYXRv cnMpOiBPbmx5IGNvcHkgdGhlIHNpbXVsYXRvciBhcHAgZm9yIG9sZGVyCisgICAgICAgIHZlcnNp b25zIG9mIFhjb2RlLgorICAgICAgICAoSU9TU2ltdWxhdG9yUG9ydC5fY3JlYXRlX2RldmljZXMp OiBVc2UgJ3NpbWN0bCBib290JyBkaXJlY3RseSB1bmxlc3MgdXNpbmcKKyAgICAgICAgYW4gb2xk ZXIgdmVyc2lvbiBvZiBYY29kZS4KKwogMjAxNy0wNS0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggdGhlIGJ1aWxkIG9u IHRoZSBsYXRlc3QgaW50ZXJuYWwgU0RLLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL3BsYXRmb3JtaW5mby5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CShyZXZpc2lvbiAyMTcxMzEp CisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5 CSh3b3JraW5nIGNvcHkpCkBAIC0xMzMsNiArMTMzLDExIEBAIGNsYXNzIFBsYXRmb3JtSW5mbyhv YmplY3QpOgogICAgICAgICBvdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWyd4 Y3J1bicsICdzaW1jdGwnLCAnbGlzdCddLCByZXR1cm5fc3RkZXJyPUZhbHNlKQogICAgICAgICBy ZXR1cm4gKGxpbmUgZm9yIGxpbmUgaW4gb3V0cHV0LnNwbGl0bGluZXMoKSkKIAorICAgIGRlZiB4 Y29kZV92ZXJzaW9uKHNlbGYpOgorICAgICAgICBpZiBub3Qgc2VsZi5pc19tYWMoKToKKyAgICAg ICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IKKyAgICAgICAgcmV0dXJuIGZsb2F0KHNl bGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ3hjb2RlYnVpbGQnLCAnLXZlcnNpb24nXSkuc3Bs aXQoKVsxXSkKKwogICAgIGRlZiBfZGV0ZXJtaW5lX29zX25hbWUoc2VsZiwgc3lzX3BsYXRmb3Jt KToKICAgICAgICAgaWYgc3lzX3BsYXRmb3JtID09ICdkYXJ3aW4nOgogICAgICAgICAgICAgcmV0 dXJuICdtYWMnCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxh dGZvcm1pbmZvX21vY2sucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9j b21tb24vc3lzdGVtL3BsYXRmb3JtaW5mb19tb2NrLnB5CShyZXZpc2lvbiAyMTcxMzEpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX21vY2sucHkJ KHdvcmtpbmcgY29weSkKQEAgLTYwLDUgKzYwLDggQEAgY2xhc3MgTW9ja1BsYXRmb3JtSW5mbyhv YmplY3QpOgogICAgIGRlZiB4Y29kZV9zZGtfdmVyc2lvbihzZWxmLCBzZGtfbmFtZSk6CiAgICAg ICAgIHJldHVybiAnOC4xJwogCisgICAgZGVmIHhjb2RlX3ZlcnNpb24oc2VsZik6CisgICAgICAg IHJldHVybiA4LjAKKwogICAgIGRlZiB4Y29kZV9zaW1jdGxfbGlzdChzZWxmKToKICAgICAgICAg cmV0dXJuIHNlbGYuZXhwZWN0ZWRfeGNvZGVfc2ltY3RsX2xpc3QKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5CShyZXZpc2lvbiAyMTcxMzEpCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weQkod29ya2luZyBj b3B5KQpAQCAtMTcwLDYgKzE3MCw5IEBAIGNsYXNzIElPU1NpbXVsYXRvclBvcnQoSU9TUG9ydCk6 CiAgICAgICAgICAgICBleGNlcHQ6CiAgICAgICAgICAgICAgICAgX2xvZy53YXJuaW5nKCdVbmFi bGUgdG8gcmVtb3ZlIFNpbXVsYXRvcicgKyBzdHIoaSkpCiAKKyAgICBkZWYgaGFzX29sZF94Y29k ZShzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuaG9zdC5wbGF0Zm9ybS54Y29kZV92ZXJzaW9u KCkgPCA5LjAKKwogICAgIGRlZiBfY3JlYXRlX3NpbXVsYXRvcnMoc2VsZik6CiAgICAgICAgIGlm IChzZWxmLmRlZmF1bHRfY2hpbGRfcHJvY2Vzc2VzKCkgPCBzZWxmLmNoaWxkX3Byb2Nlc3Nlcygp KToKICAgICAgICAgICAgIF9sb2cud2FybignWW91IGhhdmUgc3BlY2lmaWVkIHZlcnkgaGlnaCB2 YWx1ZSh7MH0pIGZvciAtLWNoaWxkLXByb2Nlc3NlcycuZm9ybWF0KHNlbGYuY2hpbGRfcHJvY2Vz c2VzKCkpKQpAQCAtMTc4LDcgKzE4MSw5IEBAIGNsYXNzIElPU1NpbXVsYXRvclBvcnQoSU9TUG9y dCk6CiAKICAgICAgICAgaWYgc2VsZi5fdXNpbmdfZGVkaWNhdGVkX3NpbXVsYXRvcnMoKToKICAg ICAgICAgICAgIGF0ZXhpdC5yZWdpc3RlcihsYW1iZGE6IHNlbGYuX3RlYXJkb3duX21hbmFnZWRf c2ltdWxhdG9ycygpKQotICAgICAgICAgICAgc2VsZi5fY3JlYXRlU2ltdWxhdG9yQXBwcygpCisK KyAgICAgICAgICAgIGlmIHNlbGYuaGFzX29sZF94Y29kZSgpOgorICAgICAgICAgICAgICAgIHNl bGYuX2NyZWF0ZVNpbXVsYXRvckFwcHMoKQogCiAgICAgICAgICAgICBmb3IgaSBpbiB4cmFuZ2Uo c2VsZi5jaGlsZF9wcm9jZXNzZXMoKSk6CiAgICAgICAgICAgICAgICAgc2VsZi5fY3JlYXRlX2Rl dmljZShpKQpAQCAtMjExLDE2ICsyMTYsMjMgQEAgY2xhc3MgSU9TU2ltdWxhdG9yUG9ydChJT1NQ b3J0KToKICAgICAgICAgICAgIF9sb2cuZGVidWcoJ3Rlc3RpbmcgZGV2aWNlICVzIGhhcyB1ZGlk ICVzJywgaSwgZGV2aWNlX3VkaWQpCiAKICAgICAgICAgICAgICMgRklYTUU6IDxyZGFyOi8vcHJv YmxlbS8yMDkxNjE0MD4gU3dpdGNoIHRvIHVzaW5nIENvcmVTaW11bGF0b3IuZnJhbWV3b3JrIGZv ciBsYXVuY2hpbmcgYW5kIHF1aXR0aW5nIGlPUyBTaW11bGF0b3IKLSAgICAgICAgICAgIHNlbGYu X2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbCi0gICAgICAgICAgICAgICAgJ29wZW4nLCAnLWcnLCAn LWInLCBzZWxmLlNJTVVMQVRPUl9CVU5ETEVfSUQgKyBzdHIoaSksCi0gICAgICAgICAgICAgICAg Jy0tYXJncycsICctQ3VycmVudERldmljZVVESUQnLCBkZXZpY2VfdWRpZF0pCisgICAgICAgICAg ICBpZiBzZWxmLmhhc19vbGRfeGNvZGUoKToKKyAgICAgICAgICAgICAgICBzZWxmLl9leGVjdXRp dmUucnVuX2NvbW1hbmQoWworICAgICAgICAgICAgICAgICAgICAnb3BlbicsICctZycsICctYics IHNlbGYuU0lNVUxBVE9SX0JVTkRMRV9JRCArIHN0cihpKSwKKyAgICAgICAgICAgICAgICAgICAg Jy0tYXJncycsICctQ3VycmVudERldmljZVVESUQnLCBkZXZpY2VfdWRpZF0pCisgICAgICAgICAg ICBlbHNlOgorICAgICAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ3hj cnVuJywgJ3NpbWN0bCcsICdib290JywgZGV2aWNlX3VkaWRdKQogCiAgICAgICAgICAgICBpZiBt YWNfb3NfdmVyc2lvbiBpbiBbJ2VsY2FwaXRhbicsICd5b3NlbWl0ZScsICdtYXZlcmlja3MnXToK ICAgICAgICAgICAgICAgICB0aW1lLnNsZWVwKDIuNSkKIAorICAgICAgICBpZiBub3Qgc2VsZi5o YXNfb2xkX3hjb2RlKCk6CisgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQo WydvcGVuJywgJy1nJywgJy1iJywgc2VsZi5TSU1VTEFUT1JfQlVORExFX0lEXSkKKwogICAgICAg ICBfbG9nLmluZm8oJ1dhaXRpbmcgZm9yIGFsbCBpT1MgU2ltdWxhdG9ycyB0byBmaW5pc2ggYm9v dGluZy4nKQogICAgICAgICBmb3IgaSBpbiB4cmFuZ2Uoc2VsZi5jaGlsZF9wcm9jZXNzZXMoKSk6 CiAgICAgICAgICAgICBTaW11bGF0b3Iud2FpdF91bnRpbF9kZXZpY2VfaXNfYm9vdGVkKFNpbXVs YXRvci5tYW5hZ2VkX2RldmljZXNbaV0udWRpZCkKKyAgICAgICAgX2xvZy5pbmZvKCdTaW11bGF0 b3JzIGhhdmUgYm9vdGVkLicpCiAKICAgICAgICAgSU9TU2ltdWxhdG9yUG9ydC5fREVWSUNFX01B UCA9IHt9CiAgICAgICAgIGZvciBpIGluIHhyYW5nZShzZWxmLmNoaWxkX3Byb2Nlc3NlcygpKToK 310691 2017-05-19 13:10:25 -0700 2017-05-19 13:11:57 -0700 Patch bug-172374-20170519131024.patch text/plain 5079 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNzE0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDE3LTA1LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogVXNlIHNpbWN0bCBib290IHRvIHJ1biBtdWx0aXBsZSBz aW11bGF0b3JzIGF0IG9uY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3MjM3NAorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFr b3YuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1p bmZvLnB5OgorICAgICAgICAoUGxhdGZvcm1JbmZvLnhjb2RlX3ZlcnNpb24pOiBSZXR1cm4gdGhl IGN1cnJlbnQgdmVyc2lvbiBvZiBYY29kZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2Nv bW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvX21vY2sucHk6CisgICAgICAgIChNb2NrUGxhdGZvcm1J bmZvLnhjb2RlX3ZlcnNpb24pOiBSZXR1cm4gdmVyc2lvbiA4LjAgZm9yIHRlc3RpbmcuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3IucHk6CisgICAgICAgIChJ T1NTaW11bGF0b3JQb3J0LnVzZV9tdWx0aXBsZV9zaW11bGF0b3JfYXBwcyk6IFJldHVybiB0cnVl IGlmIHdlIG5lZWQgdG8KKyAgICAgICAgcnVuIG11bHRpcGxlIFNpbXVsYXRvci5hcHAgaW5zdGFu Y2VzLgorICAgICAgICAoSU9TU2ltdWxhdG9yUG9ydC5fY3JlYXRlX3NpbXVsYXRvcnMpOiBPbmx5 IGNvcHkgdGhlIHNpbXVsYXRvciBhcHAgZm9yIG9sZGVyCisgICAgICAgIHZlcnNpb25zIG9mIFhj b2RlLgorICAgICAgICAoSU9TU2ltdWxhdG9yUG9ydC5fY3JlYXRlX2RldmljZXMpOiBVc2UgJ3Np bWN0bCBib290JyBkaXJlY3RseSB1bmxlc3MgdXNpbmcKKyAgICAgICAgYW4gb2xkZXIgdmVyc2lv biBvZiBYY29kZS4KKwogMjAxNy0wNS0xOSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggdGhlIGJ1aWxkIG9uIHRoZSBsYXRl c3QgaW50ZXJuYWwgU0RLLgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lz dGVtL3BsYXRmb3JtaW5mby5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CShyZXZpc2lvbiAyMTcxNDMpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxhdGZvcm1pbmZvLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0xMzMsNiArMTMzLDExIEBAIGNsYXNzIFBsYXRmb3JtSW5mbyhvYmplY3QpOgog ICAgICAgICBvdXRwdXQgPSBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWyd4Y3J1bicsICdz aW1jdGwnLCAnbGlzdCddLCByZXR1cm5fc3RkZXJyPUZhbHNlKQogICAgICAgICByZXR1cm4gKGxp bmUgZm9yIGxpbmUgaW4gb3V0cHV0LnNwbGl0bGluZXMoKSkKIAorICAgIGRlZiB4Y29kZV92ZXJz aW9uKHNlbGYpOgorICAgICAgICBpZiBub3Qgc2VsZi5pc19tYWMoKToKKyAgICAgICAgICAgIHJh aXNlIE5vdEltcGxlbWVudGVkRXJyb3IKKyAgICAgICAgcmV0dXJuIHNlbGYuX2V4ZWN1dGl2ZS5y dW5fY29tbWFuZChbJ3hjb2RlYnVpbGQnLCAnLXZlcnNpb24nXSkuc3BsaXQoKVsxXQorCiAgICAg ZGVmIF9kZXRlcm1pbmVfb3NfbmFtZShzZWxmLCBzeXNfcGxhdGZvcm0pOgogICAgICAgICBpZiBz eXNfcGxhdGZvcm0gPT0gJ2Rhcndpbic6CiAgICAgICAgICAgICByZXR1cm4gJ21hYycKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fbW9jay5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vcGxh dGZvcm1pbmZvX21vY2sucHkJKHJldmlzaW9uIDIxNzE0MykKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvY29tbW9uL3N5c3RlbS9wbGF0Zm9ybWluZm9fbW9jay5weQkod29ya2luZyBjb3B5KQpA QCAtNjAsNSArNjAsOCBAQCBjbGFzcyBNb2NrUGxhdGZvcm1JbmZvKG9iamVjdCk6CiAgICAgZGVm IHhjb2RlX3Nka192ZXJzaW9uKHNlbGYsIHNka19uYW1lKToKICAgICAgICAgcmV0dXJuICc4LjEn CiAKKyAgICBkZWYgeGNvZGVfdmVyc2lvbihzZWxmKToKKyAgICAgICAgcmV0dXJuICc4LjAnCisK ICAgICBkZWYgeGNvZGVfc2ltY3RsX2xpc3Qoc2VsZik6CiAgICAgICAgIHJldHVybiBzZWxmLmV4 cGVjdGVkX3hjb2RlX3NpbWN0bF9saXN0CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv cnQvaW9zX3NpbXVsYXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvaW9zX3NpbXVsYXRvci5weQkocmV2aXNpb24gMjE3MTQzKQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw2 ICsxNzAsOSBAQCBjbGFzcyBJT1NTaW11bGF0b3JQb3J0KElPU1BvcnQpOgogICAgICAgICAgICAg ZXhjZXB0OgogICAgICAgICAgICAgICAgIF9sb2cud2FybmluZygnVW5hYmxlIHRvIHJlbW92ZSBT aW11bGF0b3InICsgc3RyKGkpKQogCisgICAgZGVmIHVzZV9tdWx0aXBsZV9zaW11bGF0b3JfYXBw cyhzZWxmKToKKyAgICAgICAgcmV0dXJuIGludChzZWxmLmhvc3QucGxhdGZvcm0ueGNvZGVfdmVy c2lvbigpLnNwbGl0KCcuJylbMF0pIDwgOQorCiAgICAgZGVmIF9jcmVhdGVfc2ltdWxhdG9ycyhz ZWxmKToKICAgICAgICAgaWYgKHNlbGYuZGVmYXVsdF9jaGlsZF9wcm9jZXNzZXMoKSA8IHNlbGYu Y2hpbGRfcHJvY2Vzc2VzKCkpOgogICAgICAgICAgICAgX2xvZy53YXJuKCdZb3UgaGF2ZSBzcGVj aWZpZWQgdmVyeSBoaWdoIHZhbHVlKHswfSkgZm9yIC0tY2hpbGQtcHJvY2Vzc2VzJy5mb3JtYXQo c2VsZi5jaGlsZF9wcm9jZXNzZXMoKSkpCkBAIC0xNzgsNyArMTgxLDkgQEAgY2xhc3MgSU9TU2lt dWxhdG9yUG9ydChJT1NQb3J0KToKIAogICAgICAgICBpZiBzZWxmLl91c2luZ19kZWRpY2F0ZWRf c2ltdWxhdG9ycygpOgogICAgICAgICAgICAgYXRleGl0LnJlZ2lzdGVyKGxhbWJkYTogc2VsZi5f dGVhcmRvd25fbWFuYWdlZF9zaW11bGF0b3JzKCkpCi0gICAgICAgICAgICBzZWxmLl9jcmVhdGVT aW11bGF0b3JBcHBzKCkKKworICAgICAgICAgICAgaWYgc2VsZi51c2VfbXVsdGlwbGVfc2ltdWxh dG9yX2FwcHMoKToKKyAgICAgICAgICAgICAgICBzZWxmLl9jcmVhdGVTaW11bGF0b3JBcHBzKCkK IAogICAgICAgICAgICAgZm9yIGkgaW4geHJhbmdlKHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCkpOgog ICAgICAgICAgICAgICAgIHNlbGYuX2NyZWF0ZV9kZXZpY2UoaSkKQEAgLTIxMSwxNiArMjE2LDIz IEBAIGNsYXNzIElPU1NpbXVsYXRvclBvcnQoSU9TUG9ydCk6CiAgICAgICAgICAgICBfbG9nLmRl YnVnKCd0ZXN0aW5nIGRldmljZSAlcyBoYXMgdWRpZCAlcycsIGksIGRldmljZV91ZGlkKQogCiAg ICAgICAgICAgICAjIEZJWE1FOiA8cmRhcjovL3Byb2JsZW0vMjA5MTYxNDA+IFN3aXRjaCB0byB1 c2luZyBDb3JlU2ltdWxhdG9yLmZyYW1ld29yayBmb3IgbGF1bmNoaW5nIGFuZCBxdWl0dGluZyBp T1MgU2ltdWxhdG9yCi0gICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1hbmQoWwot ICAgICAgICAgICAgICAgICdvcGVuJywgJy1nJywgJy1iJywgc2VsZi5TSU1VTEFUT1JfQlVORExF X0lEICsgc3RyKGkpLAotICAgICAgICAgICAgICAgICctLWFyZ3MnLCAnLUN1cnJlbnREZXZpY2VV RElEJywgZGV2aWNlX3VkaWRdKQorICAgICAgICAgICAgaWYgc2VsZi51c2VfbXVsdGlwbGVfc2lt dWxhdG9yX2FwcHMoKToKKyAgICAgICAgICAgICAgICBzZWxmLl9leGVjdXRpdmUucnVuX2NvbW1h bmQoWworICAgICAgICAgICAgICAgICAgICAnb3BlbicsICctZycsICctYicsIHNlbGYuU0lNVUxB VE9SX0JVTkRMRV9JRCArIHN0cihpKSwKKyAgICAgICAgICAgICAgICAgICAgJy0tYXJncycsICct Q3VycmVudERldmljZVVESUQnLCBkZXZpY2VfdWRpZF0pCisgICAgICAgICAgICBlbHNlOgorICAg ICAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFuZChbJ3hjcnVuJywgJ3NpbWN0 bCcsICdib290JywgZGV2aWNlX3VkaWRdKQogCiAgICAgICAgICAgICBpZiBtYWNfb3NfdmVyc2lv biBpbiBbJ2VsY2FwaXRhbicsICd5b3NlbWl0ZScsICdtYXZlcmlja3MnXToKICAgICAgICAgICAg ICAgICB0aW1lLnNsZWVwKDIuNSkKIAorICAgICAgICBpZiBub3Qgc2VsZi51c2VfbXVsdGlwbGVf c2ltdWxhdG9yX2FwcHMoKToKKyAgICAgICAgICAgIHNlbGYuX2V4ZWN1dGl2ZS5ydW5fY29tbWFu ZChbJ29wZW4nLCAnLWcnLCAnLWInLCBzZWxmLlNJTVVMQVRPUl9CVU5ETEVfSURdKQorCiAgICAg ICAgIF9sb2cuaW5mbygnV2FpdGluZyBmb3IgYWxsIGlPUyBTaW11bGF0b3JzIHRvIGZpbmlzaCBi b290aW5nLicpCiAgICAgICAgIGZvciBpIGluIHhyYW5nZShzZWxmLmNoaWxkX3Byb2Nlc3Nlcygp KToKICAgICAgICAgICAgIFNpbXVsYXRvci53YWl0X3VudGlsX2RldmljZV9pc19ib290ZWQoU2lt dWxhdG9yLm1hbmFnZWRfZGV2aWNlc1tpXS51ZGlkKQorICAgICAgICBfbG9nLmluZm8oJ0FsbCBz aW11bGF0b3JzIGhhdmUgYm9vdGVkLicpCiAKICAgICAgICAgSU9TU2ltdWxhdG9yUG9ydC5fREVW SUNFX01BUCA9IHt9CiAgICAgICAgIGZvciBpIGluIHhyYW5nZShzZWxmLmNoaWxkX3Byb2Nlc3Nl cygpKToK