173774 2017-06-23 10:48:07 -0700 Add support for different versions of iOS when loading test expectations 2017-06-30 08:33:21 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=173107 InRadar P2 Normal --- 173775 1 jbedard jbedard aakash_jain buildbot commit-queue dbates ddkilzer glenn lforschler webkit-bug-importer oldest_to_newest 1322339 0 jbedard 2017-06-23 10:48:07 -0700 We should support test expectations for different versions of iOS. 1322340 1 webkit-bug-importer 2017-06-23 10:48:43 -0700 <rdar://problem/32951132> 1322359 2 313730 jbedard 2017-06-23 11:35:05 -0700 Created attachment 313730 Patch 1324132 3 313730 aakash_jain 2017-06-29 16:09:05 -0700 Comment on attachment 313730 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=313730&action=review rs=me. > Tools/Scripts/webkitpy/port/ios_device.py:106 > + if version != device.platform.os_version: I think "device.platform.os_version != version" would be more readable. > Tools/Scripts/webkitpy/port/ios_device.py:107 > + raise RuntimeError('{} has a version of {} which does not match {}'.format(device, device.platform.os_version, version)) This message might be confusing for readers. Should indicate that there are multiple devices connected having different ios versions. > Tools/Scripts/webkitpy/port/ios_device.py:109 > + raise RuntimeError('No devices are available') Can we move this check about "No devices available" before for loop? 1324136 4 314183 jbedard 2017-06-29 16:26:52 -0700 Created attachment 314183 Patch 1324416 5 314183 commit-queue 2017-06-30 08:33:20 -0700 Comment on attachment 314183 Patch Clearing flags on attachment: 314183 Committed r218996: <http://trac.webkit.org/changeset/218996> 1324417 6 commit-queue 2017-06-30 08:33:21 -0700 All reviewed patches have been landed. Closing bug. 313730 2017-06-23 11:35:05 -0700 2017-06-29 16:26:51 -0700 Patch bug-173774-20170623113504.patch text/plain 5645 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxODc1MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE3LTA2LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgZGlmZmVyZW50IHZlcnNpb25zIG9mIGlPUyB3 aGVuIGxvYWRpbmcgdGVzdCBleHBlY3RhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Mzc3NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzI5 NTExMzI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V2hlbiBydW5uaW5nIGxheW91dCB0ZXN0cywgd2Ugc2hvdWxkIHN1cHBvcnQgbXVsdGlwbGUgdmVy c2lvbiBvZiBpT1MgdGhlIHNhbWUgd2F5IHdlIGRvIE1hYy4KKworICAgICAgICAqIFNjcmlwdHMv d2Via2l0cHkvcG9ydC9pb3MucHk6CisgICAgICAgIChJT1NQb3J0LmRlZmF1bHRfYmFzZWxpbmVf c2VhcmNoX3BhdGgpOiBBZGQgaW9zLTxtYWpvciB2ZXJzaW9uPiB0ZXN0IGV4cGVjdGF0aW9uLgor ICAgICAgICAoSU9TUG9ydC50ZXN0X2V4cGVjdGF0aW9uc19maWxlX3Bvc2l0aW9uKTogQWRkZWQg bmV3IGZpbGUgZXhwZWN0YXRpb25zLCBpbmNyZW1lbnQgZXhwZWN0ZWQgZmlsZSBwb3NpdGlvbi4K KyAgICAgICAgKElPU1BvcnQuaW9zX3ZlcnNpb24pOiBpT1MgcG9ydHMgbXVzdCBkZWZpbmUgYSBm dW5jdGlvbiB0byByZXRyaWV2ZSB0aGUgaU9TIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0Lmlvc192 ZXJzaW9uKTogQXNrIGNvbm5lY3RlZCBkZXZpY2VzIGZvciBpbXBsZW1lbnRhdGlvbi4KKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91bml0dGVzdC5weToKKyAgICAg ICAgKElPU0RldmljZVRlc3QudGVzdF9hZGRpdGlvbmFsX3BsYXRmb3JtX2RpcmVjdG9yeSk6IFNr aXAgdGVzdCB1bnRpbCBidWcgMTczNzc1IGlzIGZpbmlzaGVkLgorICAgICAgICAoSU9TRGV2aWNl VGVzdC50ZXN0X2Jhc2VsaW5lX3NlYXJjaHBhdGgpOiBEaXR0by4KKyAgICAgICAgKElPU0Rldmlj ZVRlc3QudGVzdF9leHBlY3RhdGlvbnNfb3JkZXJpbmcpOiBEaXR0by4KKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weToKKyAgICAgICAgKElPU1NpbXVsYXRv clBvcnQuaW9zX3ZlcnNpb24pOiBJZiBhIHJ1bnRpbWUgaXMgc3BlY2lmaWVkLCBhc2sgdGhlIHJ1 bnRpbWUgZm9yIHRoZSBpT1MgdmVyc2lvbi4gT3RoZXJ3aXNlLAorICAgICAgICBhc2sgdGhlIHBs YXRmb3JtLgorCiAyMDE3LTA2LTIzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CiAKICAgICAgICAgQWRkIFNQSSB0byBXS1VSTFNjaGVtZVRhc2sgZm9yIHJlZGly ZWN0aW9uCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5Cj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkJKHJldmlzaW9uIDIxODcw NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkJKHdvcmtpbmcgY29weSkK QEAgLTkzLDYgKzkzLDcgQEAgY2xhc3MgSU9TUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgZmFs bGJhY2tfbmFtZXMgPSBbCiAgICAgICAgICAgICAne30te30nLmZvcm1hdChzZWxmLnBvcnRfbmFt ZSwgd2tfc3RyaW5nKSwKICAgICAgICAgICAgIHNlbGYucG9ydF9uYW1lLAorICAgICAgICAgICAg J3t9LXt9Jy5mb3JtYXQoSU9TUG9ydC5wb3J0X25hbWUsIHNlbGYuaW9zX3ZlcnNpb24oKS5zcGxp dCgnLicpWzBdKSwKICAgICAgICAgICAgICd7fS17fScuZm9ybWF0KElPU1BvcnQucG9ydF9uYW1l LCB3a19zdHJpbmcpLAogICAgICAgICAgICAgSU9TUG9ydC5wb3J0X25hbWUsCiAgICAgICAgIF0K QEAgLTEwMiw3ICsxMDMsMTAgQEAgY2xhc3MgSU9TUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAg cmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0aCwgZmFsbGJhY2tfbmFtZXMpCiAK ICAgICBkZWYgdGVzdF9leHBlY3RhdGlvbnNfZmlsZV9wb3NpdGlvbihzZWxmKToKLSAgICAgICAg cmV0dXJuIDMKKyAgICAgICAgcmV0dXJuIDQKKworICAgIGRlZiBpb3NfdmVyc2lvbihzZWxmKToK KyAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRFcnJvcgogCiAgICAgZGVmIF9jcmVhdGVfZGV2 aWNlcyhzZWxmLCBkZXZpY2VfY2xhc3MpOgogICAgICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVy cm9yCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZS5weQkocmV2 aXNpb24gMjE4NzA1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2Uu cHkJKHdvcmtpbmcgY29weSkKQEAgLTkxLDYgKzkxLDI0IEBAIGNsYXNzIElPU0RldmljZVBvcnQo SU9TUG9ydCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIChzdGRlcnIsIGNyYXNobG9nKQogICAg ICAgICByZXR1cm4gKHN0ZGVyciwgTm9uZSkKIAorICAgIEBtZW1vaXplZAorICAgIGRlZiBpb3Nf dmVyc2lvbihzZWxmKToKKyAgICAgICAgaWYgbm90IGFwcGxlX2FkZGl0aW9ucygpOgorICAgICAg ICAgICAgcmFpc2UgUnVudGltZUVycm9yKHNlbGYuTk9fT05fREVWSUNFX1RFU1RJTkcpCisKKyAg ICAgICAgIyBGSVhNRTogV2Ugc2hvdWxkIHJlcGxhY2UgLS1ydW50aW1lIHdpdGggc29tZXRoaW5n IHdoaWNoIG1ha2VzIHNlbnNlIGZvciBib3RoIFNpbXVsYXRvciBhbmQgRGV2aWNlCisgICAgICAg ICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Mzc3NQorICAgICAg ICB2ZXJzaW9uID0gTm9uZQorICAgICAgICBmb3IgZGV2aWNlIGluIHNlbGYuX2RldmljZV9mb3Jf d29ya2VyX251bWJlcl9tYXAoKToKKyAgICAgICAgICAgIGlmIG5vdCB2ZXJzaW9uOgorICAgICAg ICAgICAgICAgIHZlcnNpb24gPSBkZXZpY2UucGxhdGZvcm0ub3NfdmVyc2lvbgorICAgICAgICAg ICAgZWxzZToKKyAgICAgICAgICAgICAgICBpZiB2ZXJzaW9uICE9IGRldmljZS5wbGF0Zm9ybS5v c192ZXJzaW9uOgorICAgICAgICAgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ3t9IGhh cyBhIHZlcnNpb24gb2Yge30gd2hpY2ggZG9lcyBub3QgbWF0Y2gge30nLmZvcm1hdChkZXZpY2Us IGRldmljZS5wbGF0Zm9ybS5vc192ZXJzaW9uLCB2ZXJzaW9uKSkKKyAgICAgICAgaWYgbm90IHZl cnNpb246CisgICAgICAgICAgICByYWlzZSBSdW50aW1lRXJyb3IoJ05vIGRldmljZXMgYXJlIGF2 YWlsYWJsZScpCisgICAgICAgIHJldHVybiB2ZXJzaW9uCisKICAgICAjIEZJWE1FOiBUaGVzZSBu ZWVkIGRldmljZSBpbXBsZW1lbnRhdGlvbnMgPHJkYXI6Ly9wcm9ibGVtLzMwNDk3OTkxPi4KICAg ICBkZWYgY2hlY2tfZm9yX2xlYWtzKHNlbGYsIHByb2Nlc3NfbmFtZSwgcHJvY2Vzc19waWQpOgog ICAgICAgICBwYXNzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2Rldmlj ZV91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv aW9zX2RldmljZV91bml0dGVzdC5weQkocmV2aXNpb24gMjE4NzA1KQorKysgVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAg LTg3LDMgKzg3LDEzIEBAIGNsYXNzIElPU0RldmljZVRlc3QoaW9zX3Rlc3RjYXNlLklPU1Rlc3QK ICAgICAgICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT1zZWxmLnBvcnRfbmFtZSkK ICAgICAgICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1lRXJyb3IpOgogICAgICAgICAg ICAgcG9ydC5fZ2V0X2NyYXNoX2xvZygnRHVtcFJlbmRlclRyZWUnLCAxMjM0LCBOb25lLCBOb25l LCB0aW1lLnRpbWUoKSwgd2FpdF9mb3JfbG9nPUZhbHNlKQorCisgICAgIyBGSVhNRTogaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Mzc3NQorICAgIGRlZiB0ZXN0X2Fk ZGl0aW9uYWxfcGxhdGZvcm1fZGlyZWN0b3J5KHNlbGYpOgorICAgICAgICBwYXNzCisKKyAgICBk ZWYgdGVzdF9iYXNlbGluZV9zZWFyY2hwYXRoKHNlbGYpOgorICAgICAgICBwYXNzCisKKyAgICBk ZWYgdGVzdF9leHBlY3RhdGlvbnNfb3JkZXJpbmcoc2VsZik6CisgICAgICAgIHBhc3MKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5CShyZXZpc2lv biAyMTg3MDUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5w eQkod29ya2luZyBjb3B5KQpAQCAtMTAwLDYgKzEwMCwxNCBAQCBjbGFzcyBJT1NTaW11bGF0b3JQ b3J0KElPU1BvcnQpOgogICAgICAgICAgICAgcnVudGltZSA9IFJ1bnRpbWUuZnJvbV92ZXJzaW9u X3N0cmluZyhzZWxmLmhvc3QucGxhdGZvcm0ueGNvZGVfc2RrX3ZlcnNpb24oJ2lwaG9uZXNpbXVs YXRvcicpKQogICAgICAgICByZXR1cm4gcnVudGltZQogCisgICAgZGVmIGlvc192ZXJzaW9uKHNl bGYpOgorICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgcmVwbGFjZSAtLXJ1bnRpbWUgd2l0aCBz b21ldGhpbmcgd2hpY2ggbWFrZXMgc2Vuc2UgZm9yIGJvdGggU2ltdWxhdG9yIGFuZCBEZXZpY2UK KyAgICAgICAgIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNzc1 CisgICAgICAgIHJ1bnRpbWVfaWRlbnRpZmllciA9IHNlbGYuZ2V0X29wdGlvbigncnVudGltZScp CisgICAgICAgIGlmIHJ1bnRpbWVfaWRlbnRpZmllcjoKKyAgICAgICAgICAgIHJldHVybiAnLicu am9pbihzdHIoaSkgZm9yIGkgaW4gUnVudGltZS5mcm9tX2lkZW50aWZpZXIocnVudGltZV9pZGVu dGlmaWVyKS52ZXJzaW9uKQorICAgICAgICByZXR1cm4gc2VsZi5ob3N0LnBsYXRmb3JtLnhjb2Rl X3Nka192ZXJzaW9uKCdpcGhvbmVzaW11bGF0b3InKQorCiAgICAgZGVmIHNpbXVsYXRvcl9kZXZp Y2VfdHlwZShzZWxmKToKICAgICAgICAgZGV2aWNlX3R5cGVfaWRlbnRpZmllciA9IHNlbGYuZ2V0 X29wdGlvbignZGV2aWNlX3R5cGUnKQogICAgICAgICBpZiBkZXZpY2VfdHlwZV9pZGVudGlmaWVy Ogo= 314183 2017-06-29 16:26:52 -0700 2017-06-30 08:33:20 -0700 Patch bug-173774-20170629162652.patch text/plain 5696 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxODk2NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI3IEBACisyMDE3LTA2LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBBZGQgc3VwcG9ydCBmb3IgZGlmZmVyZW50IHZlcnNpb25zIG9mIGlPUyB3 aGVuIGxvYWRpbmcgdGVzdCBleHBlY3RhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Mzc3NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzI5 NTExMzI+CisKKyAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgQWFrYXNoIEphaW4uCisKKyAgICAg ICAgV2hlbiBydW5uaW5nIGxheW91dCB0ZXN0cywgd2Ugc2hvdWxkIHN1cHBvcnQgbXVsdGlwbGUg dmVyc2lvbiBvZiBpT1MgdGhlIHNhbWUgd2F5IHdlIGRvIE1hYy4KKworICAgICAgICAqIFNjcmlw dHMvd2Via2l0cHkvcG9ydC9pb3MucHk6CisgICAgICAgIChJT1NQb3J0LmRlZmF1bHRfYmFzZWxp bmVfc2VhcmNoX3BhdGgpOiBBZGQgaW9zLTxtYWpvciB2ZXJzaW9uPiB0ZXN0IGV4cGVjdGF0aW9u LgorICAgICAgICAoSU9TUG9ydC50ZXN0X2V4cGVjdGF0aW9uc19maWxlX3Bvc2l0aW9uKTogQWRk ZWQgbmV3IGZpbGUgZXhwZWN0YXRpb25zLCBpbmNyZW1lbnQgZXhwZWN0ZWQgZmlsZSBwb3NpdGlv bi4KKyAgICAgICAgKElPU1BvcnQuaW9zX3ZlcnNpb24pOiBpT1MgcG9ydHMgbXVzdCBkZWZpbmUg YSBmdW5jdGlvbiB0byByZXRyaWV2ZSB0aGUgaU9TIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0 cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHk6CisgICAgICAgIChJT1NEZXZpY2VQb3J0Lmlv c192ZXJzaW9uKTogQXNrIGNvbm5lY3RlZCBkZXZpY2VzIGZvciBpbXBsZW1lbnRhdGlvbi4KKyAg ICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91bml0dGVzdC5weToKKyAg ICAgICAgKElPU0RldmljZVRlc3QudGVzdF9hZGRpdGlvbmFsX3BsYXRmb3JtX2RpcmVjdG9yeSk6 IFNraXAgdGVzdCB1bnRpbCBidWcgMTczNzc1IGlzIGZpbmlzaGVkLgorICAgICAgICAoSU9TRGV2 aWNlVGVzdC50ZXN0X2Jhc2VsaW5lX3NlYXJjaHBhdGgpOiBEaXR0by4KKyAgICAgICAgKElPU0Rl dmljZVRlc3QudGVzdF9leHBlY3RhdGlvbnNfb3JkZXJpbmcpOiBEaXR0by4KKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weToKKyAgICAgICAgKElPU1NpbXVs YXRvclBvcnQuaW9zX3ZlcnNpb24pOiBJZiBhIHJ1bnRpbWUgaXMgc3BlY2lmaWVkLCBhc2sgdGhl IHJ1bnRpbWUgZm9yIHRoZSBpT1MgdmVyc2lvbi4gT3RoZXJ3aXNlLAorICAgICAgICBhc2sgdGhl IHBsYXRmb3JtLgorCiAyMDE3LTA2LTI5ICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIEZpeCBmb3IgaW50ZXJtaXR0ZW50IExheW91dCBUZXN0IGZhaWwgaHR0 cC90ZXN0cy9sb2FkaW5nL3Jlc291cmNlTG9hZFN0YXRpc3RpY3MvdGVsZW1ldHJ5LWdlbmVyYXRp b24uaHRtbApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CShyZXZpc2lvbiAyMTg5 NjcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CSh3b3JraW5nIGNvcHkp CkBAIC05Myw2ICs5Myw3IEBAIGNsYXNzIElPU1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgIGZh bGxiYWNrX25hbWVzID0gWwogICAgICAgICAgICAgJ3t9LXt9Jy5mb3JtYXQoc2VsZi5wb3J0X25h bWUsIHdrX3N0cmluZyksCiAgICAgICAgICAgICBzZWxmLnBvcnRfbmFtZSwKKyAgICAgICAgICAg ICd7fS17fScuZm9ybWF0KElPU1BvcnQucG9ydF9uYW1lLCBzZWxmLmlvc192ZXJzaW9uKCkuc3Bs aXQoJy4nKVswXSksCiAgICAgICAgICAgICAne30te30nLmZvcm1hdChJT1NQb3J0LnBvcnRfbmFt ZSwgd2tfc3RyaW5nKSwKICAgICAgICAgICAgIElPU1BvcnQucG9ydF9uYW1lLAogICAgICAgICBd CkBAIC0xMDIsNyArMTAzLDEwIEBAIGNsYXNzIElPU1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAg IHJldHVybiBtYXAoc2VsZi5fd2Via2l0X2Jhc2VsaW5lX3BhdGgsIGZhbGxiYWNrX25hbWVzKQog CiAgICAgZGVmIHRlc3RfZXhwZWN0YXRpb25zX2ZpbGVfcG9zaXRpb24oc2VsZik6Ci0gICAgICAg IHJldHVybiAzCisgICAgICAgIHJldHVybiA0CisKKyAgICBkZWYgaW9zX3ZlcnNpb24oc2VsZik6 CisgICAgICAgIHJhaXNlIE5vdEltcGxlbWVudGVkRXJyb3IKIAogICAgIGRlZiBfY3JlYXRlX2Rl dmljZXMoc2VsZiwgZGV2aWNlX2NsYXNzKToKICAgICAgICAgcmFpc2UgTm90SW1wbGVtZW50ZWRF cnJvcgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19kZXZpY2UucHkJKHJl dmlzaW9uIDIxODk2NykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNl LnB5CSh3b3JraW5nIGNvcHkpCkBAIC05MSw2ICs5MSwyNSBAQCBjbGFzcyBJT1NEZXZpY2VQb3J0 KElPU1BvcnQpOgogICAgICAgICAgICAgICAgIHJldHVybiAoc3RkZXJyLCBjcmFzaGxvZykKICAg ICAgICAgcmV0dXJuIChzdGRlcnIsIE5vbmUpCiAKKyAgICBAbWVtb2l6ZWQKKyAgICBkZWYgaW9z X3ZlcnNpb24oc2VsZik6CisgICAgICAgIGlmIG5vdCBhcHBsZV9hZGRpdGlvbnMoKToKKyAgICAg ICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcihzZWxmLk5PX09OX0RFVklDRV9URVNUSU5HKQorCisg ICAgICAgICMgRklYTUU6IFdlIHNob3VsZCByZXBsYWNlIC0tcnVudGltZSB3aXRoIHNvbWV0aGlu ZyB3aGljaCBtYWtlcyBzZW5zZSBmb3IgYm90aCBTaW11bGF0b3IgYW5kIERldmljZQorICAgICAg ICAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzM3NzUKKyAgICAg ICAgaWYgbGVuKHNlbGYuX2RldmljZV9mb3Jfd29ya2VyX251bWJlcl9tYXAoKSkgPT0gMDoKKyAg ICAgICAgICAgIHJhaXNlIFJ1bnRpbWVFcnJvcignTm8gZGV2aWNlcyBhcmUgYXZhaWxhYmxlJykK KyAgICAgICAgdmVyc2lvbiA9IE5vbmUKKyAgICAgICAgZm9yIGRldmljZSBpbiBzZWxmLl9kZXZp Y2VfZm9yX3dvcmtlcl9udW1iZXJfbWFwKCk6CisgICAgICAgICAgICBpZiBub3QgdmVyc2lvbjoK KyAgICAgICAgICAgICAgICB2ZXJzaW9uID0gZGV2aWNlLnBsYXRmb3JtLm9zX3ZlcnNpb24KKyAg ICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgaWYgZGV2aWNlLnBsYXRmb3JtLm9zX3Zl cnNpb24gIT0gdmVyc2lvbjoKKyAgICAgICAgICAgICAgICAgICAgcmFpc2UgUnVudGltZUVycm9y KCdNdWx0aXBsZSBjb25uZWN0ZWQgZGV2aWNlcyBoYXZlIGRpZmZlcmVudCBpT1MgdmVyc2lvbnMn KQorCisgICAgICAgIHJldHVybiB2ZXJzaW9uCisKICAgICAjIEZJWE1FOiBUaGVzZSBuZWVkIGRl dmljZSBpbXBsZW1lbnRhdGlvbnMgPHJkYXI6Ly9wcm9ibGVtLzMwNDk3OTkxPi4KICAgICBkZWYg Y2hlY2tfZm9yX2xlYWtzKHNlbGYsIHByb2Nlc3NfbmFtZSwgcHJvY2Vzc19waWQpOgogICAgICAg ICBwYXNzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91bml0 dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2Rl dmljZV91bml0dGVzdC5weQkocmV2aXNpb24gMjE4OTY3KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2lvc19kZXZpY2VfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTg3LDMg Kzg3LDEzIEBAIGNsYXNzIElPU0RldmljZVRlc3QoaW9zX3Rlc3RjYXNlLklPU1Rlc3QKICAgICAg ICAgcG9ydCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT1zZWxmLnBvcnRfbmFtZSkKICAgICAg ICAgd2l0aCBzZWxmLmFzc2VydFJhaXNlcyhSdW50aW1lRXJyb3IpOgogICAgICAgICAgICAgcG9y dC5fZ2V0X2NyYXNoX2xvZygnRHVtcFJlbmRlclRyZWUnLCAxMjM0LCBOb25lLCBOb25lLCB0aW1l LnRpbWUoKSwgd2FpdF9mb3JfbG9nPUZhbHNlKQorCisgICAgIyBGSVhNRTogaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Mzc3NQorICAgIGRlZiB0ZXN0X2FkZGl0aW9u YWxfcGxhdGZvcm1fZGlyZWN0b3J5KHNlbGYpOgorICAgICAgICBwYXNzCisKKyAgICBkZWYgdGVz dF9iYXNlbGluZV9zZWFyY2hwYXRoKHNlbGYpOgorICAgICAgICBwYXNzCisKKyAgICBkZWYgdGVz dF9leHBlY3RhdGlvbnNfb3JkZXJpbmcoc2VsZik6CisgICAgICAgIHBhc3MKSW5kZXg6IFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5CShyZXZpc2lvbiAyMTg5 NjcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weQkod29y a2luZyBjb3B5KQpAQCAtMTAwLDYgKzEwMCwxNCBAQCBjbGFzcyBJT1NTaW11bGF0b3JQb3J0KElP U1BvcnQpOgogICAgICAgICAgICAgcnVudGltZSA9IFJ1bnRpbWUuZnJvbV92ZXJzaW9uX3N0cmlu ZyhzZWxmLmhvc3QucGxhdGZvcm0ueGNvZGVfc2RrX3ZlcnNpb24oJ2lwaG9uZXNpbXVsYXRvcicp KQogICAgICAgICByZXR1cm4gcnVudGltZQogCisgICAgZGVmIGlvc192ZXJzaW9uKHNlbGYpOgor ICAgICAgICAjIEZJWE1FOiBXZSBzaG91bGQgcmVwbGFjZSAtLXJ1bnRpbWUgd2l0aCBzb21ldGhp bmcgd2hpY2ggbWFrZXMgc2Vuc2UgZm9yIGJvdGggU2ltdWxhdG9yIGFuZCBEZXZpY2UKKyAgICAg ICAgIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTczNzc1CisgICAg ICAgIHJ1bnRpbWVfaWRlbnRpZmllciA9IHNlbGYuZ2V0X29wdGlvbigncnVudGltZScpCisgICAg ICAgIGlmIHJ1bnRpbWVfaWRlbnRpZmllcjoKKyAgICAgICAgICAgIHJldHVybiAnLicuam9pbihz dHIoaSkgZm9yIGkgaW4gUnVudGltZS5mcm9tX2lkZW50aWZpZXIocnVudGltZV9pZGVudGlmaWVy KS52ZXJzaW9uKQorICAgICAgICByZXR1cm4gc2VsZi5ob3N0LnBsYXRmb3JtLnhjb2RlX3Nka192 ZXJzaW9uKCdpcGhvbmVzaW11bGF0b3InKQorCiAgICAgZGVmIHNpbXVsYXRvcl9kZXZpY2VfdHlw ZShzZWxmKToKICAgICAgICAgZGV2aWNlX3R5cGVfaWRlbnRpZmllciA9IHNlbGYuZ2V0X29wdGlv bignZGV2aWNlX3R5cGUnKQogICAgICAgICBpZiBkZXZpY2VfdHlwZV9pZGVudGlmaWVyOgo=