192158 2018-11-29 09:41:34 -0800 webkitpy: Unify device creation 2018-11-29 13:58:39 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue ews-watchlist glenn lforschler simon.fraser webkit-bug-importer oldest_to_newest 1482980 0 jbedard 2018-11-29 09:41:34 -0800 The API for creating simulated devices and physical devices is identical. We should leverage this fact and create all devices in the DevicePort class. 1482982 1 webkit-bug-importer 2018-11-29 09:43:18 -0800 <rdar://problem/46344757> 1483063 2 356031 jbedard 2018-11-29 11:53:47 -0800 Created attachment 356031 Patch 1483074 3 356031 lforschler 2018-11-29 12:15:15 -0800 Comment on attachment 356031 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356031&action=review lgtm with typo fix > Tools/Scripts/webkitpy/port/device_port.py:130 > + raise RuntimeError('Not enought connected devices for {} processes'.format(self.child_processes())) nit: typo enough 1483090 4 356031 simon.fraser 2018-11-29 12:38:50 -0800 Comment on attachment 356031 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=356031&action=review >> Tools/Scripts/webkitpy/port/device_port.py:130 >> + raise RuntimeError('Not enought connected devices for {} processes'.format(self.child_processes())) > > nit: typo enough That should read "too few connected devices". Can this error fire for simulators? 1483101 5 jbedard 2018-11-29 12:52:16 -0800 (In reply to Simon Fraser (smfr) from comment #4) > Comment on attachment 356031 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=356031&action=review > > >> Tools/Scripts/webkitpy/port/device_port.py:130 > >> + raise RuntimeError('Not enought connected devices for {} processes'.format(self.child_processes())) > > > > nit: typo enough > > That should read "too few connected devices". Can this error fire for > simulators? No, it cannot. Simulators will boot enough devices to match the number specified. 1483130 6 356042 jbedard 2018-11-29 13:25:19 -0800 Created attachment 356042 Patch for landing 1483162 7 356042 commit-queue 2018-11-29 13:58:38 -0800 Comment on attachment 356042 Patch for landing Clearing flags on attachment: 356042 Committed r238694: <https://trac.webkit.org/changeset/238694> 1483163 8 commit-queue 2018-11-29 13:58:39 -0800 All reviewed patches have been landed. Closing bug. 356031 2018-11-29 11:53:47 -0800 2018-11-29 13:25:17 -0800 Patch bug-192158-20181129115347.patch text/plain 11753 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzODY3OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE4LTExLTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogVW5pZnkgZGV2aWNlIGNyZWF0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIxNTgKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzQ2MzQ0NzU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2RldmljZV9wb3J0LnB5Ogor ICAgICAgICAoRGV2aWNlUG9ydCk6CisgICAgICAgIChEZXZpY2VQb3J0LnNldHVwX3Rlc3RfcnVu KTogVXNlIERFVklDRV9NQU5BR0VSIHRvIGNyZWF0ZSBkZXZpY2VzIGJhc2VkIG9uIHRoZSBzcGVj aWZpZWQgZGV2aWNlIGNsYXNzLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Mu cHk6CisgICAgICAgIChJT1NQb3J0KTogQWRkIERFRkFVTFRfREVWSUNFX0NMQVNTLgorICAgICAg ICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlLnB5OgorICAgICAgICAoSU9TRGV2 aWNlUG9ydCk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0Ll9jcmVhdGVfZGV2aWNlcyk6IERlbGV0 ZWQuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3IucHk6Cisg ICAgICAgIChJT1NTaW11bGF0b3JQb3J0Ll9jcmVhdGVfZGV2aWNlcyk6IERlbGV0ZWQuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoLnB5OgorICAgICAgICAoV2F0Y2hQb3J0 KTogQWRkIERFRkFVTFRfREVWSUNFX0NMQVNTLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv cG9ydC93YXRjaF9kZXZpY2UucHk6CisgICAgICAgIChXYXRjaERldmljZVBvcnQpOgorICAgICAg ICAoV2F0Y2hEZXZpY2VQb3J0Ll9jcmVhdGVfZGV2aWNlcyk6IERlbGV0ZWQuCisgICAgICAgICog U2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoX3NpbXVsYXRvci5weToKKyAgICAgICAgKFdhdGNo U2ltdWxhdG9yUG9ydC5fY3JlYXRlX2RldmljZXMpOiBEZWxldGVkLgorICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkveGNvZGUvZGV2aWNlX3R5cGVfdW5pdHRlc3QucHk6CisgICAgICAgIChEZXZp Y2VUeXBlVGVzdC50ZXN0X2Zyb21fc3RyaW5nKTogVGVzdCB0aGF0IERldmljZVR5cGVzIHdpdGhv dXQgaGFyZHdhcmUgdHlwZXMgY2FuIGJlIGNvbnN0cnVjdGVkCisgICAgICAgIGZyb20gc3RyaW5n cy4KKwogMjAxOC0xMS0yOSAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAK ICAgICAgICAgd2Via2l0cHk6IFVuaWZ5IGlvc192ZXJzaW9uL3dhdGNob3NfdmVyc2lvbiBjb2Rl CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGV2aWNlX3BvcnQucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RldmljZV9wb3J0LnB5CShyZXZp c2lvbiAyMzg2NzIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGV2aWNlX3BvcnQu cHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDYgKzI3LDggQEAgZnJvbSB3ZWJraXRweS5jb21tb24u bWVtb2l6ZWQgaW1wb3J0IG1lbQogZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRl c3RfY29uZmlndXJhdGlvbiBpbXBvcnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20gd2Via2l0cHku cG9ydC5kYXJ3aW4gaW1wb3J0IERhcndpblBvcnQKIGZyb20gd2Via2l0cHkucG9ydC5zaW11bGF0 b3JfcHJvY2VzcyBpbXBvcnQgU2ltdWxhdG9yUHJvY2VzcworZnJvbSB3ZWJraXRweS54Y29kZS5k ZXZpY2VfdHlwZSBpbXBvcnQgRGV2aWNlVHlwZQorZnJvbSB3ZWJraXRweS54Y29kZS5zaW11bGF0 ZWRfZGV2aWNlIGltcG9ydCBEZXZpY2VSZXF1ZXN0CiAKIAogX2xvZyA9IGxvZ2dpbmcuZ2V0TG9n Z2VyKF9fbmFtZV9fKQpAQCAtMzUsNiArMzcsOCBAQCBfbG9nID0gbG9nZ2luZy5nZXRMb2dnZXIo X19uYW1lX18pCiBjbGFzcyBEZXZpY2VQb3J0KERhcndpblBvcnQpOgogCiAgICAgREVWSUNFX01B TkFHRVIgPSBOb25lCisgICAgREVGQVVMVF9ERVZJQ0VfQ0xBU1MgPSBOb25lCisgICAgTk9fREVW SUNFX01BTkFHRVIgPSAnTm8gZGV2aWNlIG1hbmFnZXIgZm91bmQgZm9yIHBvcnQnCiAKICAgICBk ZWYgX19pbml0X18oc2VsZiwgKmFyZ3MsICoqa3dhcmdzKToKICAgICAgICAgc3VwZXIoRGV2aWNl UG9ydCwgc2VsZikuX19pbml0X18oKmFyZ3MsICoqa3dhcmdzKQpAQCAtMTA2LDcgKzExMCwyNSBA QCBjbGFzcyBEZXZpY2VQb3J0KERhcndpblBvcnQpOgogICAgICAgICAgICAgICAgIHJhaXNlIFJ1 bnRpbWVFcnJvcignRmFpbGVkIHRvIGluc3RhbGwgZHlsaWJzIGF0IHt9IG9uIGRldmljZSB7fScu Zm9ybWF0KHNlbGYuX2J1aWxkX3BhdGgoKSwgZGV2aWNlLnVkaWQpKQogCiAgICAgZGVmIHNldHVw X3Rlc3RfcnVuKHNlbGYsIGRldmljZV9jbGFzcz1Ob25lKToKLSAgICAgICAgc2VsZi5fY3JlYXRl X2RldmljZXMoZGV2aWNlX2NsYXNzKQorICAgICAgICBpZiBub3Qgc2VsZi5ERVZJQ0VfTUFOQUdF UjoKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcihzZWxmLk5PX0RFVklDRV9NQU5BR0VS KQorCisgICAgICAgIGRldmljZV90eXBlID0gRGV2aWNlVHlwZS5mcm9tX3N0cmluZyhkZXZpY2Vf Y2xhc3MgaWYgZGV2aWNlX2NsYXNzIGVsc2Ugc2VsZi5ERUZBVUxUX0RFVklDRV9DTEFTUywgc2Vs Zi5kZXZpY2VfdmVyc2lvbigpKQorICAgICAgICBfbG9nLmRlYnVnKCdcbkNyZWF0aW5nIGRldmlj ZXMgZm9yIHt9Jy5mb3JtYXQoZGV2aWNlX3R5cGUpKQorCisgICAgICAgIHJlcXVlc3QgPSBEZXZp Y2VSZXF1ZXN0KAorICAgICAgICAgICAgZGV2aWNlX3R5cGUsCisgICAgICAgICAgICB1c2VfYm9v dGVkX3NpbXVsYXRvcj1ub3Qgc2VsZi5nZXRfb3B0aW9uKCdkZWRpY2F0ZWRfc2ltdWxhdG9ycycs IEZhbHNlKSwKKyAgICAgICAgICAgIHVzZV9leGlzdGluZ19zaW11bGF0b3I9RmFsc2UsCisgICAg ICAgICAgICBhbGxvd19pbmNvbXBsZXRlX21hdGNoPVRydWUsCisgICAgICAgICkKKyAgICAgICAg c2VsZi5ERVZJQ0VfTUFOQUdFUi5pbml0aWFsaXplX2RldmljZXMoW3JlcXVlc3RdICogc2VsZi5j aGlsZF9wcm9jZXNzZXMoKSwgc2VsZi5ob3N0KQorCisgICAgICAgIGlmIG5vdCBzZWxmLmRldmlj ZXMoKToKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignTm8gZGV2aWNlcyBhcmUgYXZh aWxhYmxlIGZvciB0ZXN0aW5nJykKKyAgICAgICAgaWYgc2VsZi5kZWZhdWx0X2NoaWxkX3Byb2Nl c3NlcygpIDwgc2VsZi5jaGlsZF9wcm9jZXNzZXMoKToKKyAgICAgICAgICAgIHJhaXNlIFJ1bnRp bWVFcnJvcignTm90IGVub3VnaHQgY29ubmVjdGVkIGRldmljZXMgZm9yIHt9IHByb2Nlc3Nlcycu Zm9ybWF0KHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCkpKQorCiAgICAgICAgIHNlbGYuX2luc3RhbGwo KQogCiAgICAgICAgIGZvciBpIGluIHhyYW5nZShzZWxmLmNoaWxkX3Byb2Nlc3NlcygpKToKSW5k ZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQkocmV2aXNpb24gMjM4NjcyKQorKysgVG9v bHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQkod29ya2luZyBjb3B5KQpAQCAtMzgsNiAr MzgsOCBAQCBjbGFzcyBJT1NQb3J0KERldmljZVBvcnQpOgogICAgIHBvcnRfbmFtZSA9ICJpb3Mi CiAKICAgICBDVVJSRU5UX1ZFUlNJT04gPSBWZXJzaW9uKDEyKQorICAgICMgRklYTUU6IFRoaXMg aXMgbm90IGEgY2xlYXIgd2F5IHRvIGRvIHRoaXMgKGFsdGhvdWdoIGl0IHdvcmtzKSBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyMTYwCisgICAgREVGQVVMVF9ERVZJ Q0VfQ0xBU1MgPSAnJwogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwg Kiprd2FyZ3MpOgogICAgICAgICBzdXBlcihJT1NQb3J0LCBzZWxmKS5fX2luaXRfXyhob3N0LCBw b3J0X25hbWUsICoqa3dhcmdzKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lv c19kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lv c19kZXZpY2UucHkJKHJldmlzaW9uIDIzODY3MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9pb3NfZGV2aWNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw4IEBAIGNsYXNz IElPU0RldmljZVBvcnQoSU9TUG9ydCk6CiAgICAgREVWSUNFX01BTkFHRVIgPSBhcHBsZV9hZGRp dGlvbnMoKS5kZXZpY2VfbWFuYWdlcigpIGlmIGFwcGxlX2FkZGl0aW9ucygpIGVsc2UgTm9uZQog CiAgICAgU0RLID0gYXBwbGVfYWRkaXRpb25zKCkuZ2V0X3NkaygnaXBob25lb3MnKSBpZiBhcHBs ZV9hZGRpdGlvbnMoKSBlbHNlICdpcGhvbmVvcycKLSAgICBOT19PTl9ERVZJQ0VfVEVTVElORyA9 ICdPbi1kZXZpY2UgdGVzdGluZyBpcyBub3Qgc3VwcG9ydGVkIG9uIHRoaXMgbWFjaGluZScKKyAg ICBOT19PTl9ERVZJQ0VfVEVTVElORyA9ICdPbi1kZXZpY2UgdGVzdGluZyBpcyBub3Qgc3VwcG9y dGVkIGluIHRoaXMgY29uZmlndXJhdGlvbicKKyAgICBOT19ERVZJQ0VfTUFOQUdFUiA9IE5PX09O X0RFVklDRV9URVNUSU5HCiAKICAgICBAbWVtb2l6ZWQKICAgICBkZWYgZGVmYXVsdF9jaGlsZF9w cm9jZXNzZXMoc2VsZik6CkBAIC0xMTIsMTUgKzExMyw2IEBAIGNsYXNzIElPU0RldmljZVBvcnQo SU9TUG9ydCk6CiAgICAgZGVmIG9wZXJhdGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAgIHJldHVy biAnaW9zLWRldmljZScKIAotICAgIGRlZiBfY3JlYXRlX2RldmljZXMoc2VsZiwgZGV2aWNlX2Ns YXNzKToKLSAgICAgICAgaWYgbm90IGFwcGxlX2FkZGl0aW9ucygpOgotICAgICAgICAgICAgcmFp c2UgUnVudGltZUVycm9yKHNlbGYuTk9fT05fREVWSUNFX1RFU1RJTkcpCi0gICAgICAgIGlmIG5v dCBzZWxmLmRldmljZXMoKToKLSAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignTm8gZGV2 aWNlcyBhcmUgYXZhaWxhYmxlIGZvciB0ZXN0aW5nJykKLQotICAgICAgICBpZiBzZWxmLmRlZmF1 bHRfY2hpbGRfcHJvY2Vzc2VzKCkgPCBzZWxmLmNoaWxkX3Byb2Nlc3NlcygpOgotICAgICAgICAg ICAgcmFpc2UgUnVudGltZUVycm9yKCdOb3QgZW5vdWdodCBjb25uZWN0ZWQgZGV2aWNlcyBmb3Ig e30gcHJvY2Vzc2VzJy5mb3JtYXQoc2VsZi5jaGlsZF9wcm9jZXNzZXMoKSkpCi0KICAgICBkZWYg Y2xlYW5fdXBfdGVzdF9ydW4oc2VsZik6CiAgICAgICAgIHN1cGVyKElPU0RldmljZVBvcnQsIHNl bGYpLmNsZWFuX3VwX3Rlc3RfcnVuKCkKICAgICAgICAgYXBwbGVfYWRkaXRpb25zKCkuaW9zX2Rl dmljZV9jbGVhbl91cF90ZXN0X3J1bihzZWxmLCBzZWxmLl9wYXRoX3RvX2RyaXZlcigpLCBzZWxm Ll9idWlsZF9wYXRoKCkpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3Np bXVsYXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9z X3NpbXVsYXRvci5weQkocmV2aXNpb24gMjM4NjcyKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2lvc19zaW11bGF0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDcgQEAg ZnJvbSB3ZWJraXRweS5jb21tb24udmVyc2lvbiBpbXBvcnQgVmVycwogZnJvbSB3ZWJraXRweS5w b3J0LmNvbmZpZyBpbXBvcnQgYXBwbGVfYWRkaXRpb25zCiBmcm9tIHdlYmtpdHB5LnBvcnQuaW9z IGltcG9ydCBJT1NQb3J0CiBmcm9tIHdlYmtpdHB5Lnhjb2RlLmRldmljZV90eXBlIGltcG9ydCBE ZXZpY2VUeXBlCi1mcm9tIHdlYmtpdHB5Lnhjb2RlLnNpbXVsYXRlZF9kZXZpY2UgaW1wb3J0IERl dmljZVJlcXVlc3QsIFNpbXVsYXRlZERldmljZU1hbmFnZXIKK2Zyb20gd2Via2l0cHkueGNvZGUu c2ltdWxhdGVkX2RldmljZSBpbXBvcnQgU2ltdWxhdGVkRGV2aWNlTWFuYWdlcgogCiAKIF9sb2cg PSBsb2dnaW5nLmdldExvZ2dlcihfX25hbWVfXykKQEAgLTgxLDIwICs4MSw2IEBAIGNsYXNzIElP U1NpbXVsYXRvclBvcnQoSU9TUG9ydCk6CiAgICAgZGVmIF9zZXRfZGV2aWNlX2NsYXNzKHNlbGYs IGRldmljZV9jbGFzcyk6CiAgICAgICAgIHNlbGYuX2RldmljZV9jbGFzcyA9IGRldmljZV9jbGFz cyBpZiBkZXZpY2VfY2xhc3MgZWxzZSBzZWxmLkRFRkFVTFRfREVWSUNFX0NMQVNTCiAKLSAgICBk ZWYgX2NyZWF0ZV9kZXZpY2VzKHNlbGYsIGRldmljZV9jbGFzcyk6Ci0gICAgICAgIHNlbGYuX3Nl dF9kZXZpY2VfY2xhc3MoZGV2aWNlX2NsYXNzKQotICAgICAgICBkZXZpY2VfdHlwZSA9IERldmlj ZVR5cGUuZnJvbV9zdHJpbmcoc2VsZi5fZGV2aWNlX2NsYXNzLCBzZWxmLmRldmljZV92ZXJzaW9u KCkpCi0KLSAgICAgICAgX2xvZy5kZWJ1ZygnXG5DcmVhdGluZyBkZXZpY2VzIGZvciB7fScuZm9y bWF0KGRldmljZV90eXBlKSkKLQotICAgICAgICByZXF1ZXN0ID0gRGV2aWNlUmVxdWVzdCgKLSAg ICAgICAgICAgIGRldmljZV90eXBlLAotICAgICAgICAgICAgdXNlX2Jvb3RlZF9zaW11bGF0b3I9 bm90IHNlbGYuZ2V0X29wdGlvbignZGVkaWNhdGVkX3NpbXVsYXRvcnMnLCBGYWxzZSksCi0gICAg ICAgICAgICB1c2VfZXhpc3Rpbmdfc2ltdWxhdG9yPUZhbHNlLAotICAgICAgICAgICAgYWxsb3df aW5jb21wbGV0ZV9tYXRjaD1UcnVlLAotICAgICAgICApCi0gICAgICAgIFNpbXVsYXRlZERldmlj ZU1hbmFnZXIuaW5pdGlhbGl6ZV9kZXZpY2VzKFtyZXF1ZXN0XSAqIHNlbGYuY2hpbGRfcHJvY2Vz c2VzKCksIHNlbGYuaG9zdCkKLQogICAgIGRlZiBjbGVhbl91cF90ZXN0X3J1bihzZWxmKToKICAg ICAgICAgc3VwZXIoSU9TU2ltdWxhdG9yUG9ydCwgc2VsZikuY2xlYW5fdXBfdGVzdF9ydW4oKQog ICAgICAgICBfbG9nLmRlYnVnKCJjbGVhbl91cF90ZXN0X3J1biIpCkluZGV4OiBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L3BvcnQvd2F0Y2gucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9wb3J0L3dhdGNoLnB5CShyZXZpc2lvbiAyMzg2NzIpCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvd2F0Y2gucHkJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDcgQEAg Y2xhc3MgV2F0Y2hQb3J0KERldmljZVBvcnQpOgogICAgIHBvcnRfbmFtZSA9ICd3YXRjaG9zJwog CiAgICAgQ1VSUkVOVF9WRVJTSU9OID0gVmVyc2lvbig1KQorICAgIERFRkFVTFRfREVWSUNFX0NM QVNTID0gJ0FwcGxlIFdhdGNoJwogCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICphcmdzLCAqKmt3 YXJncyk6CiAgICAgICAgIHN1cGVyKFdhdGNoUG9ydCwgc2VsZikuX19pbml0X18oKmFyZ3MsICoq a3dhcmdzKQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoX2RldmljZS5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F0Y2hfZGV2aWNl LnB5CShyZXZpc2lvbiAyMzg2NzIpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F0 Y2hfZGV2aWNlLnB5CSh3b3JraW5nIGNvcHkpCkBAIC00MCw2ICs0MCw3IEBAIGNsYXNzIFdhdGNo RGV2aWNlUG9ydChXYXRjaFBvcnQpOgogICAgIFNESyA9IGFwcGxlX2FkZGl0aW9ucygpLmdldF9z ZGsoJ3dhdGNob3MnKSBpZiBhcHBsZV9hZGRpdGlvbnMoKSBlbHNlICd3YXRjaG9zJwogICAgIERF VklDRV9NQU5BR0VSID0gYXBwbGVfYWRkaXRpb25zKCkuZGV2aWNlX21hbmFnZXIoKSBpZiBhcHBs ZV9hZGRpdGlvbnMoKSBlbHNlIE5vbmUKICAgICBOT19PTl9ERVZJQ0VfVEVTVElORyA9ICdPbi1k ZXZpY2UgdGVzdGluZyBpcyBub3Qgc3VwcG9ydGVkIGluIHRoaXMgY29uZmlndXJhdGlvbicKKyAg ICBOT19ERVZJQ0VfTUFOQUdFUiA9IE5PX09OX0RFVklDRV9URVNUSU5HCiAKICAgICBAbWVtb2l6 ZWQKICAgICBkZWYgZGVmYXVsdF9jaGlsZF9wcm9jZXNzZXMoc2VsZik6CkBAIC0xMTAsMTUgKzEx MSw2IEBAIGNsYXNzIFdhdGNoRGV2aWNlUG9ydChXYXRjaFBvcnQpOgogICAgIGRlZiBvcGVyYXRp bmdfc3lzdGVtKHNlbGYpOgogICAgICAgICByZXR1cm4gJ3dhdGNob3MtZGV2aWNlJwogCi0gICAg ZGVmIF9jcmVhdGVfZGV2aWNlcyhzZWxmLCBkZXZpY2VfY2xhc3MpOgotICAgICAgICBpZiBub3Qg YXBwbGVfYWRkaXRpb25zKCk6Ci0gICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3Ioc2VsZi5O T19PTl9ERVZJQ0VfVEVTVElORykKLSAgICAgICAgaWYgbm90IGFwcGxlX2FkZGl0aW9ucygpLmRl dmljZV9mb3Jfd29ya2VyX251bWJlcl9tYXAoc2VsZiwgc29mdHdhcmVfdmFyaWFudD0nd2F0Y2hP UycpOgotICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdObyBkZXZpY2VzIGFyZSBhdmFp bGFibGUgZm9yIHRlc3RpbmcnKQotCi0gICAgICAgIGlmIHNlbGYuZGVmYXVsdF9jaGlsZF9wcm9j ZXNzZXMoKSA8IHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCk6Ci0gICAgICAgICAgICByYWlzZSBSdW50 aW1lRXJyb3IoJ05vdCBlbm91Z2h0IGNvbm5lY3RlZCBkZXZpY2VzIGZvciB7fSBwcm9jZXNzZXMn LmZvcm1hdChzZWxmLmNoaWxkX3Byb2Nlc3NlcygpKSkKLQogICAgIGRlZiBjbGVhbl91cF90ZXN0 X3J1bihzZWxmKToKICAgICAgICAgc3VwZXIoV2F0Y2hEZXZpY2VQb3J0LCBzZWxmKS5jbGVhbl91 cF90ZXN0X3J1bigpCiAgICAgICAgIGFwcGxlX2FkZGl0aW9ucygpLmRldmljZV9jbGVhbl91cF90 ZXN0X3J1bihzZWxmLCBzZWxmLl9wYXRoX3RvX2RyaXZlcigpLCBzZWxmLl9idWlsZF9wYXRoKCkp CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F0Y2hfc2ltdWxhdG9yLnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaF9zaW11bGF0b3Iu cHkJKHJldmlzaW9uIDIzODY3MikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRj aF9zaW11bGF0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTI3LDcgKzI3LDcgQEAgZnJvbSB3ZWJr aXRweS5jb21tb24udmVyc2lvbiBpbXBvcnQgVmVycwogZnJvbSB3ZWJraXRweS5wb3J0LmNvbmZp ZyBpbXBvcnQgYXBwbGVfYWRkaXRpb25zCiBmcm9tIHdlYmtpdHB5LnBvcnQud2F0Y2ggaW1wb3J0 IFdhdGNoUG9ydAogZnJvbSB3ZWJraXRweS54Y29kZS5kZXZpY2VfdHlwZSBpbXBvcnQgRGV2aWNl VHlwZQotZnJvbSB3ZWJraXRweS54Y29kZS5zaW11bGF0ZWRfZGV2aWNlIGltcG9ydCBEZXZpY2VS ZXF1ZXN0LCBTaW11bGF0ZWREZXZpY2VNYW5hZ2VyCitmcm9tIHdlYmtpdHB5Lnhjb2RlLnNpbXVs YXRlZF9kZXZpY2UgaW1wb3J0IFNpbXVsYXRlZERldmljZU1hbmFnZXIKIAogX2xvZyA9IGxvZ2dp bmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQogCkBAIC05NCwyMCArOTQsNiBAQCBjbGFzcyBXYXRjaFNp bXVsYXRvclBvcnQoV2F0Y2hQb3J0KToKICAgICBkZWYgX3NldF9kZXZpY2VfY2xhc3Moc2VsZiwg ZGV2aWNlX2NsYXNzKToKICAgICAgICAgc2VsZi5fZGV2aWNlX2NsYXNzID0gZGV2aWNlX2NsYXNz IG9yIHNlbGYuREVGQVVMVF9ERVZJQ0VfQ0xBU1MKIAotICAgIGRlZiBfY3JlYXRlX2RldmljZXMo c2VsZiwgZGV2aWNlX2NsYXNzKToKLSAgICAgICAgc2VsZi5fc2V0X2RldmljZV9jbGFzcyhkZXZp Y2VfY2xhc3MpCi0gICAgICAgIGRldmljZV90eXBlID0gRGV2aWNlVHlwZS5mcm9tX3N0cmluZyhz ZWxmLl9kZXZpY2VfY2xhc3MsIHNlbGYuZGV2aWNlX3ZlcnNpb24oKSkKLQotICAgICAgICBfbG9n LmRlYnVnKCdcbkNyZWF0aW5nIGRldmljZXMgZm9yIHt9Jy5mb3JtYXQoZGV2aWNlX3R5cGUpKQot Ci0gICAgICAgIHJlcXVlc3QgPSBEZXZpY2VSZXF1ZXN0KAotICAgICAgICAgICAgZGV2aWNlX3R5 cGUsCi0gICAgICAgICAgICB1c2VfYm9vdGVkX3NpbXVsYXRvcj1ub3Qgc2VsZi5nZXRfb3B0aW9u KCdkZWRpY2F0ZWRfc2ltdWxhdG9ycycsIEZhbHNlKSwKLSAgICAgICAgICAgIHVzZV9leGlzdGlu Z19zaW11bGF0b3I9RmFsc2UsCi0gICAgICAgICAgICBhbGxvd19pbmNvbXBsZXRlX21hdGNoPVRy dWUsCi0gICAgICAgICkKLSAgICAgICAgU2ltdWxhdGVkRGV2aWNlTWFuYWdlci5pbml0aWFsaXpl X2RldmljZXMoW3JlcXVlc3RdICogc2VsZi5jaGlsZF9wcm9jZXNzZXMoKSwgc2VsZi5ob3N0KQot CiAgICAgZGVmIG9wZXJhdGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAgIHJldHVybiAnd2F0Y2hv cy1zaW11bGF0b3InCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvZGV2aWNl X3R5cGVfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS94 Y29kZS9kZXZpY2VfdHlwZV91bml0dGVzdC5weQkocmV2aXNpb24gMjM4NjcyKQorKysgVG9vbHMv U2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZpY2VfdHlwZV91bml0dGVzdC5weQkod29ya2luZyBj b3B5KQpAQCAtMTAzLDYgKzEwMyw4IEBAIGNsYXNzIERldmljZVR5cGVUZXN0KHVuaXR0ZXN0LlRl c3RDYXNlKToKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnaVBhZCBBaXIgMiBydW5uaW5nIGlP UycsIHN0cihEZXZpY2VUeXBlLmZyb21fc3RyaW5nKCdpUGFkIEFpciAyJykpKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKCdBcHBsZSBXYXRjaCBTZXJpZXMgMiAtIDQybW0gcnVubmluZyB3YXRj aE9TJywgc3RyKERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ0FwcGxlIFdhdGNoIFNlcmllcyAyIC0g NDJtbScpKSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnQXBwbGUgVFYgNEsgcnVubmluZyB0 dk9TJywgc3RyKERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ0FwcGxlIFRWIDRLJykpKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKCdEZXZpY2UgcnVubmluZyBpT1MnLCBzdHIoRGV2aWNlVHlwZS5m cm9tX3N0cmluZygnJykpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdBcHBsZSBXYXRjaCBy dW5uaW5nIHdhdGNoT1MnLCBzdHIoRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnQXBwbGUgV2F0Y2gn KSkpCiAKICAgICBkZWYgdGVzdF9jb21wYXJpc29uKHNlbGYpOgogICAgICAgICAjIGlQaG9uZSBj b21wYXJpc29ucwo= 356042 2018-11-29 13:25:19 -0800 2018-11-29 13:58:38 -0800 Patch for landing bug-192158-20181129132519.patch text/plain 11755 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIzODY4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDMyIEBACisyMDE4LTExLTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogVW5pZnkgZGV2aWNlIGNyZWF0aW9uCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIxNTgKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzQ2MzQ0NzU3PgorCisgICAgICAgIFJldmlld2VkIGJ5IEx1Y2FzIEZvcnNj aGxlci4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2VfcG9ydC5weToK KyAgICAgICAgKERldmljZVBvcnQpOgorICAgICAgICAoRGV2aWNlUG9ydC5zZXR1cF90ZXN0X3J1 bik6IFVzZSBERVZJQ0VfTUFOQUdFUiB0byBjcmVhdGUgZGV2aWNlcyBiYXNlZCBvbiB0aGUgc3Bl Y2lmaWVkIGRldmljZSBjbGFzcy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9z LnB5OgorICAgICAgICAoSU9TUG9ydCk6IEFkZCBERUZBVUxUX0RFVklDRV9DTEFTUy4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weToKKyAgICAgICAgKElPU0Rl dmljZVBvcnQpOgorICAgICAgICAoSU9TRGV2aWNlUG9ydC5fY3JlYXRlX2RldmljZXMpOiBEZWxl dGVkLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5Ogor ICAgICAgICAoSU9TU2ltdWxhdG9yUG9ydC5fY3JlYXRlX2RldmljZXMpOiBEZWxldGVkLgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaC5weToKKyAgICAgICAgKFdhdGNoUG9y dCk6IEFkZCBERUZBVUxUX0RFVklDRV9DTEFTUy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3BvcnQvd2F0Y2hfZGV2aWNlLnB5OgorICAgICAgICAoV2F0Y2hEZXZpY2VQb3J0KToKKyAgICAg ICAgKFdhdGNoRGV2aWNlUG9ydC5fY3JlYXRlX2RldmljZXMpOiBEZWxldGVkLgorICAgICAgICAq IFNjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaF9zaW11bGF0b3IucHk6CisgICAgICAgIChXYXRj aFNpbXVsYXRvclBvcnQuX2NyZWF0ZV9kZXZpY2VzKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3hjb2RlL2RldmljZV90eXBlX3VuaXR0ZXN0LnB5OgorICAgICAgICAoRGV2 aWNlVHlwZVRlc3QudGVzdF9mcm9tX3N0cmluZyk6IFRlc3QgdGhhdCBEZXZpY2VUeXBlcyB3aXRo b3V0IGhhcmR3YXJlIHR5cGVzIGNhbiBiZSBjb25zdHJ1Y3RlZAorICAgICAgICBmcm9tIHN0cmlu Z3MuCisKIDIwMTgtMTEtMjkgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgog CiAgICAgICAgIEVXUyBpT1Mtc2ltIGJvdHMgc29tZXRpbWVzIGZhaWxzIHRvIHNodXRkb3duIHNp bXVsYXRvcgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2RldmljZV9wb3J0LnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2VfcG9ydC5w eQkocmV2aXNpb24gMjM4Njg1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2Rldmlj ZV9wb3J0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yNyw2ICsyNyw4IEBAIGZyb20gd2Via2l0cHku Y29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW0KIGZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1v ZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RDb25maWd1cmF0aW9uCiBmcm9tIHdl YmtpdHB5LnBvcnQuZGFyd2luIGltcG9ydCBEYXJ3aW5Qb3J0CiBmcm9tIHdlYmtpdHB5LnBvcnQu c2ltdWxhdG9yX3Byb2Nlc3MgaW1wb3J0IFNpbXVsYXRvclByb2Nlc3MKK2Zyb20gd2Via2l0cHku eGNvZGUuZGV2aWNlX3R5cGUgaW1wb3J0IERldmljZVR5cGUKK2Zyb20gd2Via2l0cHkueGNvZGUu c2ltdWxhdGVkX2RldmljZSBpbXBvcnQgRGV2aWNlUmVxdWVzdAogCiAKIF9sb2cgPSBsb2dnaW5n LmdldExvZ2dlcihfX25hbWVfXykKQEAgLTM1LDYgKzM3LDggQEAgX2xvZyA9IGxvZ2dpbmcuZ2V0 TG9nZ2VyKF9fbmFtZV9fKQogY2xhc3MgRGV2aWNlUG9ydChEYXJ3aW5Qb3J0KToKIAogICAgIERF VklDRV9NQU5BR0VSID0gTm9uZQorICAgIERFRkFVTFRfREVWSUNFX0NMQVNTID0gTm9uZQorICAg IE5PX0RFVklDRV9NQU5BR0VSID0gJ05vIGRldmljZSBtYW5hZ2VyIGZvdW5kIGZvciBwb3J0Jwog CiAgICAgZGVmIF9faW5pdF9fKHNlbGYsICphcmdzLCAqKmt3YXJncyk6CiAgICAgICAgIHN1cGVy KERldmljZVBvcnQsIHNlbGYpLl9faW5pdF9fKCphcmdzLCAqKmt3YXJncykKQEAgLTEwNiw3ICsx MTAsMjUgQEAgY2xhc3MgRGV2aWNlUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgICAgICAgICBy YWlzZSBSdW50aW1lRXJyb3IoJ0ZhaWxlZCB0byBpbnN0YWxsIGR5bGlicyBhdCB7fSBvbiBkZXZp Y2Uge30nLmZvcm1hdChzZWxmLl9idWlsZF9wYXRoKCksIGRldmljZS51ZGlkKSkKIAogICAgIGRl ZiBzZXR1cF90ZXN0X3J1bihzZWxmLCBkZXZpY2VfY2xhc3M9Tm9uZSk6Ci0gICAgICAgIHNlbGYu X2NyZWF0ZV9kZXZpY2VzKGRldmljZV9jbGFzcykKKyAgICAgICAgaWYgbm90IHNlbGYuREVWSUNF X01BTkFHRVI6CisgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3Ioc2VsZi5OT19ERVZJQ0Vf TUFOQUdFUikKKworICAgICAgICBkZXZpY2VfdHlwZSA9IERldmljZVR5cGUuZnJvbV9zdHJpbmco ZGV2aWNlX2NsYXNzIGlmIGRldmljZV9jbGFzcyBlbHNlIHNlbGYuREVGQVVMVF9ERVZJQ0VfQ0xB U1MsIHNlbGYuZGV2aWNlX3ZlcnNpb24oKSkKKyAgICAgICAgX2xvZy5kZWJ1ZygnXG5DcmVhdGlu ZyBkZXZpY2VzIGZvciB7fScuZm9ybWF0KGRldmljZV90eXBlKSkKKworICAgICAgICByZXF1ZXN0 ID0gRGV2aWNlUmVxdWVzdCgKKyAgICAgICAgICAgIGRldmljZV90eXBlLAorICAgICAgICAgICAg dXNlX2Jvb3RlZF9zaW11bGF0b3I9bm90IHNlbGYuZ2V0X29wdGlvbignZGVkaWNhdGVkX3NpbXVs YXRvcnMnLCBGYWxzZSksCisgICAgICAgICAgICB1c2VfZXhpc3Rpbmdfc2ltdWxhdG9yPUZhbHNl LAorICAgICAgICAgICAgYWxsb3dfaW5jb21wbGV0ZV9tYXRjaD1UcnVlLAorICAgICAgICApCisg ICAgICAgIHNlbGYuREVWSUNFX01BTkFHRVIuaW5pdGlhbGl6ZV9kZXZpY2VzKFtyZXF1ZXN0XSAq IHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCksIHNlbGYuaG9zdCkKKworICAgICAgICBpZiBub3Qgc2Vs Zi5kZXZpY2VzKCk6CisgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ05vIGRldmljZXMg YXJlIGF2YWlsYWJsZSBmb3IgdGVzdGluZycpCisgICAgICAgIGlmIHNlbGYuZGVmYXVsdF9jaGls ZF9wcm9jZXNzZXMoKSA8IHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCk6CisgICAgICAgICAgICByYWlz ZSBSdW50aW1lRXJyb3IoJ1RvIGZldyBjb25uZWN0ZWQgZGV2aWNlcyBmb3Ige30gcHJvY2Vzc2Vz Jy5mb3JtYXQoc2VsZi5jaGlsZF9wcm9jZXNzZXMoKSkpCisKICAgICAgICAgc2VsZi5faW5zdGFs bCgpCiAKICAgICAgICAgZm9yIGkgaW4geHJhbmdlKHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCkpOgpJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CShyZXZpc2lvbiAyMzg2ODUpCisrKyBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2 ICszOCw4IEBAIGNsYXNzIElPU1BvcnQoRGV2aWNlUG9ydCk6CiAgICAgcG9ydF9uYW1lID0gImlv cyIKIAogICAgIENVUlJFTlRfVkVSU0lPTiA9IFZlcnNpb24oMTIpCisgICAgIyBGSVhNRTogVGhp cyBpcyBub3QgYSBjbGVhciB3YXkgdG8gZG8gdGhpcyAoYWx0aG91Z2ggaXQgd29ya3MpIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTIxNjAKKyAgICBERUZBVUxUX0RF VklDRV9DTEFTUyA9ICcnCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgaG9zdCwgcG9ydF9uYW1l LCAqKmt3YXJncyk6CiAgICAgICAgIHN1cGVyKElPU1BvcnQsIHNlbGYpLl9faW5pdF9fKGhvc3Qs IHBvcnRfbmFtZSwgKiprd2FyZ3MpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv aW9zX2RldmljZS5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv aW9zX2RldmljZS5weQkocmV2aXNpb24gMjM4Njg1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2lvc19kZXZpY2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDggQEAgY2xh c3MgSU9TRGV2aWNlUG9ydChJT1NQb3J0KToKICAgICBERVZJQ0VfTUFOQUdFUiA9IGFwcGxlX2Fk ZGl0aW9ucygpLmRldmljZV9tYW5hZ2VyKCkgaWYgYXBwbGVfYWRkaXRpb25zKCkgZWxzZSBOb25l CiAKICAgICBTREsgPSBhcHBsZV9hZGRpdGlvbnMoKS5nZXRfc2RrKCdpcGhvbmVvcycpIGlmIGFw cGxlX2FkZGl0aW9ucygpIGVsc2UgJ2lwaG9uZW9zJwotICAgIE5PX09OX0RFVklDRV9URVNUSU5H ID0gJ09uLWRldmljZSB0ZXN0aW5nIGlzIG5vdCBzdXBwb3J0ZWQgb24gdGhpcyBtYWNoaW5lJwor ICAgIE5PX09OX0RFVklDRV9URVNUSU5HID0gJ09uLWRldmljZSB0ZXN0aW5nIGlzIG5vdCBzdXBw b3J0ZWQgaW4gdGhpcyBjb25maWd1cmF0aW9uJworICAgIE5PX0RFVklDRV9NQU5BR0VSID0gTk9f T05fREVWSUNFX1RFU1RJTkcKIAogICAgIEBtZW1vaXplZAogICAgIGRlZiBkZWZhdWx0X2NoaWxk X3Byb2Nlc3NlcyhzZWxmKToKQEAgLTExMiwxNSArMTEzLDYgQEAgY2xhc3MgSU9TRGV2aWNlUG9y dChJT1NQb3J0KToKICAgICBkZWYgb3BlcmF0aW5nX3N5c3RlbShzZWxmKToKICAgICAgICAgcmV0 dXJuICdpb3MtZGV2aWNlJwogCi0gICAgZGVmIF9jcmVhdGVfZGV2aWNlcyhzZWxmLCBkZXZpY2Vf Y2xhc3MpOgotICAgICAgICBpZiBub3QgYXBwbGVfYWRkaXRpb25zKCk6Ci0gICAgICAgICAgICBy YWlzZSBSdW50aW1lRXJyb3Ioc2VsZi5OT19PTl9ERVZJQ0VfVEVTVElORykKLSAgICAgICAgaWYg bm90IHNlbGYuZGV2aWNlcygpOgotICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9yKCdObyBk ZXZpY2VzIGFyZSBhdmFpbGFibGUgZm9yIHRlc3RpbmcnKQotCi0gICAgICAgIGlmIHNlbGYuZGVm YXVsdF9jaGlsZF9wcm9jZXNzZXMoKSA8IHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCk6Ci0gICAgICAg ICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ05vdCBlbm91Z2h0IGNvbm5lY3RlZCBkZXZpY2VzIGZv ciB7fSBwcm9jZXNzZXMnLmZvcm1hdChzZWxmLmNoaWxkX3Byb2Nlc3NlcygpKSkKLQogICAgIGRl ZiBjbGVhbl91cF90ZXN0X3J1bihzZWxmKToKICAgICAgICAgc3VwZXIoSU9TRGV2aWNlUG9ydCwg c2VsZikuY2xlYW5fdXBfdGVzdF9ydW4oKQogICAgICAgICBhcHBsZV9hZGRpdGlvbnMoKS5pb3Nf ZGV2aWNlX2NsZWFuX3VwX3Rlc3RfcnVuKHNlbGYsIHNlbGYuX3BhdGhfdG9fZHJpdmVyKCksIHNl bGYuX2J1aWxkX3BhdGgoKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nf c2ltdWxhdG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9p b3Nfc2ltdWxhdG9yLnB5CShyZXZpc2lvbiAyMzg2ODUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weQkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBA QCBmcm9tIHdlYmtpdHB5LmNvbW1vbi52ZXJzaW9uIGltcG9ydCBWZXJzCiBmcm9tIHdlYmtpdHB5 LnBvcnQuY29uZmlnIGltcG9ydCBhcHBsZV9hZGRpdGlvbnMKIGZyb20gd2Via2l0cHkucG9ydC5p b3MgaW1wb3J0IElPU1BvcnQKIGZyb20gd2Via2l0cHkueGNvZGUuZGV2aWNlX3R5cGUgaW1wb3J0 IERldmljZVR5cGUKLWZyb20gd2Via2l0cHkueGNvZGUuc2ltdWxhdGVkX2RldmljZSBpbXBvcnQg RGV2aWNlUmVxdWVzdCwgU2ltdWxhdGVkRGV2aWNlTWFuYWdlcgorZnJvbSB3ZWJraXRweS54Y29k ZS5zaW11bGF0ZWRfZGV2aWNlIGltcG9ydCBTaW11bGF0ZWREZXZpY2VNYW5hZ2VyCiAKIAogX2xv ZyA9IGxvZ2dpbmcuZ2V0TG9nZ2VyKF9fbmFtZV9fKQpAQCAtODEsMjAgKzgxLDYgQEAgY2xhc3Mg SU9TU2ltdWxhdG9yUG9ydChJT1NQb3J0KToKICAgICBkZWYgX3NldF9kZXZpY2VfY2xhc3Moc2Vs ZiwgZGV2aWNlX2NsYXNzKToKICAgICAgICAgc2VsZi5fZGV2aWNlX2NsYXNzID0gZGV2aWNlX2Ns YXNzIGlmIGRldmljZV9jbGFzcyBlbHNlIHNlbGYuREVGQVVMVF9ERVZJQ0VfQ0xBU1MKIAotICAg IGRlZiBfY3JlYXRlX2RldmljZXMoc2VsZiwgZGV2aWNlX2NsYXNzKToKLSAgICAgICAgc2VsZi5f c2V0X2RldmljZV9jbGFzcyhkZXZpY2VfY2xhc3MpCi0gICAgICAgIGRldmljZV90eXBlID0gRGV2 aWNlVHlwZS5mcm9tX3N0cmluZyhzZWxmLl9kZXZpY2VfY2xhc3MsIHNlbGYuZGV2aWNlX3ZlcnNp b24oKSkKLQotICAgICAgICBfbG9nLmRlYnVnKCdcbkNyZWF0aW5nIGRldmljZXMgZm9yIHt9Jy5m b3JtYXQoZGV2aWNlX3R5cGUpKQotCi0gICAgICAgIHJlcXVlc3QgPSBEZXZpY2VSZXF1ZXN0KAot ICAgICAgICAgICAgZGV2aWNlX3R5cGUsCi0gICAgICAgICAgICB1c2VfYm9vdGVkX3NpbXVsYXRv cj1ub3Qgc2VsZi5nZXRfb3B0aW9uKCdkZWRpY2F0ZWRfc2ltdWxhdG9ycycsIEZhbHNlKSwKLSAg ICAgICAgICAgIHVzZV9leGlzdGluZ19zaW11bGF0b3I9RmFsc2UsCi0gICAgICAgICAgICBhbGxv d19pbmNvbXBsZXRlX21hdGNoPVRydWUsCi0gICAgICAgICkKLSAgICAgICAgU2ltdWxhdGVkRGV2 aWNlTWFuYWdlci5pbml0aWFsaXplX2RldmljZXMoW3JlcXVlc3RdICogc2VsZi5jaGlsZF9wcm9j ZXNzZXMoKSwgc2VsZi5ob3N0KQotCiAgICAgZGVmIGNsZWFuX3VwX3Rlc3RfcnVuKHNlbGYpOgog ICAgICAgICBzdXBlcihJT1NTaW11bGF0b3JQb3J0LCBzZWxmKS5jbGVhbl91cF90ZXN0X3J1bigp CiAgICAgICAgIF9sb2cuZGVidWcoImNsZWFuX3VwX3Rlc3RfcnVuIikKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L3dlYmtpdHB5L3BvcnQvd2F0Y2gucHkJKHJldmlzaW9uIDIzODY4NSkKKysrIFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC93YXRjaC5weQkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsNyBA QCBjbGFzcyBXYXRjaFBvcnQoRGV2aWNlUG9ydCk6CiAgICAgcG9ydF9uYW1lID0gJ3dhdGNob3Mn CiAKICAgICBDVVJSRU5UX1ZFUlNJT04gPSBWZXJzaW9uKDUpCisgICAgREVGQVVMVF9ERVZJQ0Vf Q0xBU1MgPSAnQXBwbGUgV2F0Y2gnCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKmFyZ3MsICoq a3dhcmdzKToKICAgICAgICAgc3VwZXIoV2F0Y2hQb3J0LCBzZWxmKS5fX2luaXRfXygqYXJncywg Kiprd2FyZ3MpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvd2F0Y2hfZGV2aWNl LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaF9kZXZp Y2UucHkJKHJldmlzaW9uIDIzODY4NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93 YXRjaF9kZXZpY2UucHkJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAgY2xhc3MgV2F0 Y2hEZXZpY2VQb3J0KFdhdGNoUG9ydCk6CiAgICAgU0RLID0gYXBwbGVfYWRkaXRpb25zKCkuZ2V0 X3Nkaygnd2F0Y2hvcycpIGlmIGFwcGxlX2FkZGl0aW9ucygpIGVsc2UgJ3dhdGNob3MnCiAgICAg REVWSUNFX01BTkFHRVIgPSBhcHBsZV9hZGRpdGlvbnMoKS5kZXZpY2VfbWFuYWdlcigpIGlmIGFw cGxlX2FkZGl0aW9ucygpIGVsc2UgTm9uZQogICAgIE5PX09OX0RFVklDRV9URVNUSU5HID0gJ09u LWRldmljZSB0ZXN0aW5nIGlzIG5vdCBzdXBwb3J0ZWQgaW4gdGhpcyBjb25maWd1cmF0aW9uJwor ICAgIE5PX0RFVklDRV9NQU5BR0VSID0gTk9fT05fREVWSUNFX1RFU1RJTkcKIAogICAgIEBtZW1v aXplZAogICAgIGRlZiBkZWZhdWx0X2NoaWxkX3Byb2Nlc3NlcyhzZWxmKToKQEAgLTExMCwxNSAr MTExLDYgQEAgY2xhc3MgV2F0Y2hEZXZpY2VQb3J0KFdhdGNoUG9ydCk6CiAgICAgZGVmIG9wZXJh dGluZ19zeXN0ZW0oc2VsZik6CiAgICAgICAgIHJldHVybiAnd2F0Y2hvcy1kZXZpY2UnCiAKLSAg ICBkZWYgX2NyZWF0ZV9kZXZpY2VzKHNlbGYsIGRldmljZV9jbGFzcyk6Ci0gICAgICAgIGlmIG5v dCBhcHBsZV9hZGRpdGlvbnMoKToKLSAgICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcihzZWxm Lk5PX09OX0RFVklDRV9URVNUSU5HKQotICAgICAgICBpZiBub3QgYXBwbGVfYWRkaXRpb25zKCku ZGV2aWNlX2Zvcl93b3JrZXJfbnVtYmVyX21hcChzZWxmLCBzb2Z0d2FyZV92YXJpYW50PSd3YXRj aE9TJyk6Ci0gICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ05vIGRldmljZXMgYXJlIGF2 YWlsYWJsZSBmb3IgdGVzdGluZycpCi0KLSAgICAgICAgaWYgc2VsZi5kZWZhdWx0X2NoaWxkX3By b2Nlc3NlcygpIDwgc2VsZi5jaGlsZF9wcm9jZXNzZXMoKToKLSAgICAgICAgICAgIHJhaXNlIFJ1 bnRpbWVFcnJvcignTm90IGVub3VnaHQgY29ubmVjdGVkIGRldmljZXMgZm9yIHt9IHByb2Nlc3Nl cycuZm9ybWF0KHNlbGYuY2hpbGRfcHJvY2Vzc2VzKCkpKQotCiAgICAgZGVmIGNsZWFuX3VwX3Rl c3RfcnVuKHNlbGYpOgogICAgICAgICBzdXBlcihXYXRjaERldmljZVBvcnQsIHNlbGYpLmNsZWFu X3VwX3Rlc3RfcnVuKCkKICAgICAgICAgYXBwbGVfYWRkaXRpb25zKCkuZGV2aWNlX2NsZWFuX3Vw X3Rlc3RfcnVuKHNlbGYsIHNlbGYuX3BhdGhfdG9fZHJpdmVyKCksIHNlbGYuX2J1aWxkX3BhdGgo KSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC93YXRjaF9zaW11bGF0b3IucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dhdGNoX3NpbXVsYXRv ci5weQkocmV2aXNpb24gMjM4Njg1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L3dh dGNoX3NpbXVsYXRvci5weQkod29ya2luZyBjb3B5KQpAQCAtMjcsNyArMjcsNyBAQCBmcm9tIHdl YmtpdHB5LmNvbW1vbi52ZXJzaW9uIGltcG9ydCBWZXJzCiBmcm9tIHdlYmtpdHB5LnBvcnQuY29u ZmlnIGltcG9ydCBhcHBsZV9hZGRpdGlvbnMKIGZyb20gd2Via2l0cHkucG9ydC53YXRjaCBpbXBv cnQgV2F0Y2hQb3J0CiBmcm9tIHdlYmtpdHB5Lnhjb2RlLmRldmljZV90eXBlIGltcG9ydCBEZXZp Y2VUeXBlCi1mcm9tIHdlYmtpdHB5Lnhjb2RlLnNpbXVsYXRlZF9kZXZpY2UgaW1wb3J0IERldmlj ZVJlcXVlc3QsIFNpbXVsYXRlZERldmljZU1hbmFnZXIKK2Zyb20gd2Via2l0cHkueGNvZGUuc2lt dWxhdGVkX2RldmljZSBpbXBvcnQgU2ltdWxhdGVkRGV2aWNlTWFuYWdlcgogCiBfbG9nID0gbG9n Z2luZy5nZXRMb2dnZXIoX19uYW1lX18pCiAKQEAgLTk0LDIwICs5NCw2IEBAIGNsYXNzIFdhdGNo U2ltdWxhdG9yUG9ydChXYXRjaFBvcnQpOgogICAgIGRlZiBfc2V0X2RldmljZV9jbGFzcyhzZWxm LCBkZXZpY2VfY2xhc3MpOgogICAgICAgICBzZWxmLl9kZXZpY2VfY2xhc3MgPSBkZXZpY2VfY2xh c3Mgb3Igc2VsZi5ERUZBVUxUX0RFVklDRV9DTEFTUwogCi0gICAgZGVmIF9jcmVhdGVfZGV2aWNl cyhzZWxmLCBkZXZpY2VfY2xhc3MpOgotICAgICAgICBzZWxmLl9zZXRfZGV2aWNlX2NsYXNzKGRl dmljZV9jbGFzcykKLSAgICAgICAgZGV2aWNlX3R5cGUgPSBEZXZpY2VUeXBlLmZyb21fc3RyaW5n KHNlbGYuX2RldmljZV9jbGFzcywgc2VsZi5kZXZpY2VfdmVyc2lvbigpKQotCi0gICAgICAgIF9s b2cuZGVidWcoJ1xuQ3JlYXRpbmcgZGV2aWNlcyBmb3Ige30nLmZvcm1hdChkZXZpY2VfdHlwZSkp Ci0KLSAgICAgICAgcmVxdWVzdCA9IERldmljZVJlcXVlc3QoCi0gICAgICAgICAgICBkZXZpY2Vf dHlwZSwKLSAgICAgICAgICAgIHVzZV9ib290ZWRfc2ltdWxhdG9yPW5vdCBzZWxmLmdldF9vcHRp b24oJ2RlZGljYXRlZF9zaW11bGF0b3JzJywgRmFsc2UpLAotICAgICAgICAgICAgdXNlX2V4aXN0 aW5nX3NpbXVsYXRvcj1GYWxzZSwKLSAgICAgICAgICAgIGFsbG93X2luY29tcGxldGVfbWF0Y2g9 VHJ1ZSwKLSAgICAgICAgKQotICAgICAgICBTaW11bGF0ZWREZXZpY2VNYW5hZ2VyLmluaXRpYWxp emVfZGV2aWNlcyhbcmVxdWVzdF0gKiBzZWxmLmNoaWxkX3Byb2Nlc3NlcygpLCBzZWxmLmhvc3Qp Ci0KICAgICBkZWYgb3BlcmF0aW5nX3N5c3RlbShzZWxmKToKICAgICAgICAgcmV0dXJuICd3YXRj aG9zLXNpbXVsYXRvcicKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9kZXZp Y2VfdHlwZV91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3hjb2RlL2RldmljZV90eXBlX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyMzg2ODUpCisrKyBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL2RldmljZV90eXBlX3VuaXR0ZXN0LnB5CSh3b3JraW5n IGNvcHkpCkBAIC0xMDMsNiArMTAzLDggQEAgY2xhc3MgRGV2aWNlVHlwZVRlc3QodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdpUGFkIEFpciAyIHJ1bm5pbmcg aU9TJywgc3RyKERldmljZVR5cGUuZnJvbV9zdHJpbmcoJ2lQYWQgQWlyIDInKSkpCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoJ0FwcGxlIFdhdGNoIFNlcmllcyAyIC0gNDJtbSBydW5uaW5nIHdh dGNoT1MnLCBzdHIoRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnQXBwbGUgV2F0Y2ggU2VyaWVzIDIg LSA0Mm1tJykpKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdBcHBsZSBUViA0SyBydW5uaW5n IHR2T1MnLCBzdHIoRGV2aWNlVHlwZS5mcm9tX3N0cmluZygnQXBwbGUgVFYgNEsnKSkpCisgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0RldmljZSBydW5uaW5nIGlPUycsIHN0cihEZXZpY2VUeXBl LmZyb21fc3RyaW5nKCcnKSkpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0FwcGxlIFdhdGNo IHJ1bm5pbmcgd2F0Y2hPUycsIHN0cihEZXZpY2VUeXBlLmZyb21fc3RyaW5nKCdBcHBsZSBXYXRj aCcpKSkKIAogICAgIGRlZiB0ZXN0X2NvbXBhcmlzb24oc2VsZik6CiAgICAgICAgICMgaVBob25l IGNvbXBhcmlzb25zCg==