176962 2017-09-14 15:35:01 -0700 webkitpy: Provide accessor for device type 2018-03-27 16:40:57 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED https://bugs.webkit.org/show_bug.cgi?id=175987 InRadar P2 Normal --- 1 jbedard jbedard buildbot dbates glenn lforschler webkit-bug-importer oldest_to_newest 1349043 0 jbedard 2017-09-14 15:35:01 -0700 Provide a function to ask a device what type it is. The device type will be of the form 'iPhone 5s' or 'iPad Air.' For simulator, this device type will be derivative of the device name. For example, 'iPhone 5s WebKit Tester 1' has a device type of 'iPhone 5s'. 1349046 1 webkit-bug-importer 2017-09-14 15:35:43 -0700 <rdar://problem/34444987> 1349048 2 320836 jbedard 2017-09-14 15:37:52 -0700 Created attachment 320836 Patch 1349950 3 320836 dbates 2017-09-18 09:57:56 -0700 Comment on attachment 320836 Patch This patch assumes the convention that the name of the simulator will contain the name of the device. This is a convention. The name of a simulator device is arbitrary; => we should not parse the device name to determine the device type it corresponds to. Moreover, we do not have to resort to such manipulation. The command "simctl list" prints the list of device types under the "== Device Types ==" section and the parsing code in simulator.py knows how to parse this section. We need to teach the parsing code to pass the human readable name corresponding to the device type when instantiating a SimulatedDevice object. 1349967 4 jbedard 2017-09-18 10:22:23 -0700 (In reply to Daniel Bates from comment #3) > Comment on attachment 320836 [details] > Patch > > This patch assumes the convention that the name of the simulator will > contain the name of the device. This is a convention. The name of a > simulator device is arbitrary; => we should not parse the device name to > determine the device type it corresponds to. Moreover, we do not have to > resort to such manipulation. The command "simctl list" prints the list of > device types under the "== Device Types ==" section and the parsing code in > simulator.py knows how to parse this section. We need to teach the parsing > code to pass the human readable name corresponding to the device type when > instantiating a SimulatedDevice object. We need a map of device UDIDs to device types. The 'device types' section only provides a mapping of device type to simulator runtime type. I discovered this morning that this information is stored in the device.plist, which seems like the best place to retrieve this information from, I will update this patch. 1349987 5 321110 jbedard 2017-09-18 11:00:58 -0700 Created attachment 321110 Patch 1349992 6 321111 jbedard 2017-09-18 11:07:32 -0700 Created attachment 321111 Patch 1349993 7 jbedard 2017-09-18 11:07:56 -0700 (In reply to Jonathan Bedard from comment #6) > Created attachment 321111 [details] > Patch Looking for deviceType, not runtime. 1350044 8 dbates 2017-09-18 12:33:49 -0700 Would it be sufficient to be able to track the device type of devices we (webkitpy/webkitperl) created? Or do we need to be able to compute the device type for an arbitrary simulator device? 1350049 9 jbedard 2017-09-18 12:45:04 -0700 (In reply to Daniel Bates from comment #8) > Would it be sufficient to be able to track the device type of devices we > (webkitpy/webkitperl) created? Or do we need to be able to compute the > device type for an arbitrary simulator device? We support running on the currently running simulator (meaning webkitpy isn't managing the device), so we do need to be able to compute the device type for an arbitrary simulator. I memoized the function so that we only do the computation once. 1409725 10 jbedard 2018-03-27 16:40:57 -0700 This was addressed when we shifted to the new simulator manager class <https://bugs.webkit.org/show_bug.cgi?id=180555>. 320836 2017-09-14 15:37:52 -0700 2017-09-18 11:00:57 -0700 Patch bug-176962-20170914153752.patch text/plain 7488 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMjA1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDE3LTA5LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJvdmlkZSBhY2Nlc3NvciBmb3IgZGV2aWNlIHR5cGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Njk2Mgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQ0NDQ5ODc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBydW5uaW5nIGxheW91dCB0ZXN0cywgd2Ug bmVlZCB0byBiZSBhYmxlIHRvIHF1ZXJ5IGRldmljZQorICAgICAgICB0eXBlIHRvIG9yZ2FuaXpl IGluZnJhc3RydWN0dXJlIGFuZCBzdXBwb3J0IGRldmljZSBzcGVjaWZpYworICAgICAgICB0ZXN0 IGV4cGVjdGF0aW9ucy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2Uu cHk6CisgICAgICAgIChEZXZpY2UudHlwZSk6IEFzayB0aGUgcGxhdGZvcm0gZGV2aWNlIGZvciBp dCdzIHR5cGUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2 aWNlLnB5OgorICAgICAgICAoU2ltdWxhdGVkRGV2aWNlKToKKyAgICAgICAgKFNpbXVsYXRlZERl dmljZS50eXBlKTogRGV0ZXJtaW5lIGRldmljZSB0eXBlIGZyb20gZGV2aWNlIG5hbWUuCisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3JfdW5pdHRlc3QucHk6CisgICAg ICAgIChTaW11bGF0b3JUZXN0LnRlc3Rfc2ltdWxhdG9yX2RldmljZV90eXBlcyk6IFRlc3QgdGhh dCBkZXZpY2UKKyAgICAgICAgdHlwZXMgYXJlIGNvcnJlY3RseSBwYXJzZWQuCisKIDIwMTctMDkt MTQgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjIyMjAzMy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv cG9ydC9kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0 L2RldmljZS5weQkocmV2aXNpb24gMjIxOTgwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9w b3J0L2RldmljZS5weQkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsMTEgQEAgY2xhc3MgRGV2 aWNlKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5wbGF0Zm9ybV9kZXZpY2Uuc3lt Ym9saWNhdGVfY3Jhc2hfbG9nX2lmX25lZWRlZChwYXRoKQogICAgICAgICByZXR1cm4gc2VsZi5m aWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHBhdGgpCiAKKyAgICBkZWYgdHlwZShzZWxmKToKKyAg ICAgICAgaWYgaGFzYXR0cihzZWxmLnBsYXRmb3JtX2RldmljZSwgJ3R5cGUnKToKKyAgICAgICAg ICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS50eXBlKCkKKyAgICAgICAgcmV0dXJuIE5v bmUKKwogICAgIEBwcm9wZXJ0eQogICAgIGRlZiBleGVjdXRpdmUoc2VsZik6CiAgICAgICAgIHJl dHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS5leGVjdXRpdmUKSW5kZXg6IFRvb2xzL1NjcmlwdHMv d2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkJKHJldmlzaW9uIDIyMTk4 MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5weQko d29ya2luZyBjb3B5KQpAQCAtMjUsNiArMjUsNyBAQCBpbXBvcnQgcmUKIGltcG9ydCBzdWJwcm9j ZXNzCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmhvc3QgaW1wb3J0IEhvc3QKK2Zyb20gd2Via2l0 cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAogZnJvbSB3ZWJraXRweS5jb21tb24u c3lzdGVtLmV4ZWN1dGl2ZSBpbXBvcnQgU2NyaXB0RXJyb3IKIGZyb20gd2Via2l0cHkuY29tbW9u LnRpbWVvdXRfY29udGV4dCBpbXBvcnQgVGltZW91dAogZnJvbSB3ZWJraXRweS54Y29kZS5zaW11 bGF0b3IgaW1wb3J0IFNpbXVsYXRvcgpAQCAtMTkzLDYgKzE5NCwyNSBAQCBjbGFzcyBTaW11bGF0 ZWREZXZpY2Uob2JqZWN0KToKICAgICAgICAgX2xvZy5kZWJ1ZygnUmV0dXJuaW5nIHBpZCB7fSBv ZiBsYXVuY2hlZCBwcm9jZXNzJy5mb3JtYXQobWF0Y2guZ3JvdXAoJ3BpZCcpKSkKICAgICAgICAg cmV0dXJuIGludChtYXRjaC5ncm91cCgncGlkJykpCiAKKyAgICAjIFRoZSBuYW1lIG9mIHRoZSBk ZXZpY2Ugd2lsbCBiZSBvZiB0aGUgZm9ybSA8aVBob25lL2lQYWQ+IDxvcHRpb25hbCB0eXBlPiA8 b3B0aW9uYWwgc2l6ZT4gPG51bWJlcj4gPG9wdGlvbmFsIHBsdXM+IDxkZXNjcmlwdGlvbj4KKyAg ICB0eXBlX3JlID0gcmUuY29tcGlsZSgnKGlQYWR8aVBob25lKSggW2EtekEtWl0rKT8oIFwoWzAt OVwuXSsgaW5jaFwpKT8oIFh8IFxkc3wgXGQpPyggUGx1cyk/JykKKyAgICBzaXplX3JlID0gcmUu Y29tcGlsZSgnXCgoP1A8c2l6ZT5bMC05XC5dKykgKD9QPHVuaXQ+LispXCknKQorCisgICAgQG1l bW9pemVkCisgICAgZGVmIHR5cGUoc2VsZik6CisgICAgICAgIG1hdGNoID0gc2VsZi50eXBlX3Jl Lm1hdGNoKHNlbGYubmFtZSkKKyAgICAgICAgaWYgbm90IG1hdGNoOgorICAgICAgICAgICAgX2xv Zy5jcml0aWNhbCgnInt9IiBjb3VsZCBub3QgYmUgcGFyc2VkIHRvIGRldGVybWluZSBkZXZpY2Ug dHlwZScuZm9ybWF0KHNlbGYubmFtZSkpCisgICAgICAgICAgICByZXR1cm4gc2VsZi5uYW1lCisg ICAgICAgIHR5cGUgPSAnJworICAgICAgICBmb3IgaXRlbSBpbiBtYXRjaC5ncm91cHMoKToKKyAg ICAgICAgICAgIGlmIGl0ZW0gYW5kIHNlbGYuc2l6ZV9yZS5tYXRjaChpdGVtLmxzdHJpcCgpKToK KyAgICAgICAgICAgICAgICBtID0gc2VsZi5zaXplX3JlLm1hdGNoKGl0ZW0ubHN0cmlwKCkpCisg ICAgICAgICAgICAgICAgdHlwZSArPSAnIHt9LXt9Jy5mb3JtYXQobS5ncm91cCgnc2l6ZScpLCBt Lmdyb3VwKCd1bml0JykpCisgICAgICAgICAgICBlbGlmIGl0ZW06CisgICAgICAgICAgICAgICAg dHlwZSArPSBpdGVtCisgICAgICAgIHJldHVybiB0eXBlCisKICAgICBkZWYgX19lcV9fKHNlbGYs IG90aGVyKToKICAgICAgICAgcmV0dXJuIHNlbGYudWRpZCA9PSBvdGhlci51ZGlkCiAKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdG9yX3VuaXR0ZXN0LnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdG9yX3VuaXR0ZXN0 LnB5CShyZXZpc2lvbiAyMjE5ODApCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3Np bXVsYXRvcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTU0LDU0ICsxNTQsNjMgQEAg QXBwbGUgVFYgMTA4MHAgKDU1MjgxQUJFLTlDMjctNDM4Qi1BRDUwLQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKCcyQTFDQjM2My05QTA5LTQ0MzgtQjlCRS05QzQyQkQyMDhGNzInLCBkZXZpY2Vf aXBob25lXzVzLnVkaWQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVHJ1ZSwgZGV2aWNlX2lw aG9uZV81cy5hdmFpbGFibGUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocnVudGltZV9pb3Nf OCwgZGV2aWNlX2lwaG9uZV81cy5ydW50aW1lKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRl dmljZV9pcGhvbmVfNXMudHlwZSgpLCAnaVBob25lIDVzJykKIAogICAgICAgICBkZXZpY2VfaXBo b25lXzVzX3dlYmtpdF90ZXN0ZXIgPSBydW50aW1lX2lvc184LmRldmljZXNbM10KICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCgnaVBob25lIDVzIFdlYktpdCBUZXN0ZXInLCBkZXZpY2VfaXBob25l XzVzX3dlYmtpdF90ZXN0ZXIubmFtZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnNzlCQTky MDYtRTBCNi00RDBFLUIwRTgtQTg4RTJENDU1MTVEJywgZGV2aWNlX2lwaG9uZV81c193ZWJraXRf dGVzdGVyLnVkaWQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVHJ1ZSwgZGV2aWNlX2lwaG9u ZV81c193ZWJraXRfdGVzdGVyLmF2YWlsYWJsZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChy dW50aW1lX2lvc184LCBkZXZpY2VfaXBob25lXzVzX3dlYmtpdF90ZXN0ZXIucnVudGltZSkKKyAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbChkZXZpY2VfaXBob25lXzVzX3dlYmtpdF90ZXN0ZXIudHlw ZSgpLCAnaVBob25lIDVzJykKIAogICAgICAgICBkZXZpY2VfaXBob25lXzZfcGx1cyA9IHJ1bnRp bWVfaW9zXzguZGV2aWNlc1s0XQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdpUGhvbmUgNiBQ bHVzJywgZGV2aWNlX2lwaG9uZV82X3BsdXMubmFtZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgnN0Y4MDM5QkUtRDRBMC00MjQ1LTlENTYtQUY5NDQxM0ZENkY1JywgZGV2aWNlX2lwaG9uZV82 X3BsdXMudWRpZCkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChUcnVlLCBkZXZpY2VfaXBob25l XzZfcGx1cy5hdmFpbGFibGUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocnVudGltZV9pb3Nf OCwgZGV2aWNlX2lwaG9uZV82X3BsdXMucnVudGltZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChkZXZpY2VfaXBob25lXzZfcGx1cy50eXBlKCksICdpUGhvbmUgNiBQbHVzJykKIAogICAgICAg ICBkZXZpY2VfaXBob25lXzYgPSBydW50aW1lX2lvc184LmRldmljZXNbNV0KICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbCgnaVBob25lIDYnLCBkZXZpY2VfaXBob25lXzYubmFtZSkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCgnN0JGOUY4MzUtMENFQS00RUUzLUJEMTUtQTYyQkQ5RjRCNjkxJywg ZGV2aWNlX2lwaG9uZV82LnVkaWQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVHJ1ZSwgZGV2 aWNlX2lwaG9uZV82LmF2YWlsYWJsZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChydW50aW1l X2lvc184LCBkZXZpY2VfaXBob25lXzYucnVudGltZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChkZXZpY2VfaXBob25lXzYudHlwZSgpLCAnaVBob25lIDYnKQogCiAgICAgICAgIGRldmljZV9p cGFkXzIgPSBydW50aW1lX2lvc184LmRldmljZXNbNl0KICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bCgnaVBhZCAyJywgZGV2aWNlX2lwYWRfMi5uYW1lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KCcyOTY3QzU0Ri1BNDk5LTQwNDMtQTgyQy04QzFGNUFEQkI0QTknLCBkZXZpY2VfaXBhZF8yLnVk aWQpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVHJ1ZSwgZGV2aWNlX2lwYWRfMi5hdmFpbGFi bGUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocnVudGltZV9pb3NfOCwgZGV2aWNlX2lwYWRf Mi5ydW50aW1lKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRldmljZV9pcGFkXzIudHlwZSgp LCAnaVBhZCAyJykKIAogICAgICAgICBkZXZpY2VfaXBhZF9yZXRpbmEgPSBydW50aW1lX2lvc184 LmRldmljZXNbN10KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnaVBhZCBSZXRpbmEnLCBkZXZp Y2VfaXBhZF9yZXRpbmEubmFtZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnNzMzRkM3MUUt MjJGNC00MDc3LUJGNzktMjVDMjdFQTg4MUZDJywgZGV2aWNlX2lwYWRfcmV0aW5hLnVkaWQpCiAg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVHJ1ZSwgZGV2aWNlX2lwYWRfcmV0aW5hLmF2YWlsYWJs ZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChydW50aW1lX2lvc184LCBkZXZpY2VfaXBhZF9y ZXRpbmEucnVudGltZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChkZXZpY2VfaXBhZF9yZXRp bmEudHlwZSgpLCAnaVBhZCBSZXRpbmEnKQogCiAgICAgICAgIGRldmljZV9pcGFkX2FpciA9IHJ1 bnRpbWVfaW9zXzguZGV2aWNlc1s4XQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdpUGFkIEFp cicsIGRldmljZV9pcGFkX2Fpci5uYW1lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCc2NzI2 Njg0MS04MkYzLTQ1NDUtQUVENi01NjhCMTE3RTQxQTgnLCBkZXZpY2VfaXBhZF9haXIudWRpZCkK ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChUcnVlLCBkZXZpY2VfaXBhZF9haXIuYXZhaWxhYmxl KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHJ1bnRpbWVfaW9zXzgsIGRldmljZV9pcGFkX2Fp ci5ydW50aW1lKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGRldmljZV9pcGFkX2Fpci50eXBl KCksICdpUGFkIEFpcicpCiAKICAgICAgICAgZGV2aWNlX2lwYWRfcHJvID0gcnVudGltZV9pb3Nf OC5kZXZpY2VzWzldCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2lQYWQgUHJvICg5LjcgaW5j aCknLCBkZXZpY2VfaXBhZF9wcm8ubmFtZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnREVC RDUwQjgtMDU2Ni00RDdBLUJDREItNDEzNENGRTVEQTQwJywgZGV2aWNlX2lwYWRfcHJvLnVkaWQp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoVHJ1ZSwgZGV2aWNlX2lwYWRfcHJvLmF2YWlsYWJs ZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChydW50aW1lX2lvc184LCBkZXZpY2VfaXBhZF9w cm8ucnVudGltZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChkZXZpY2VfaXBhZF9wcm8udHlw ZSgpLCAnaVBhZCBQcm8gOS43LWluY2gnKQogCiAgICAgICAgIGRldmljZV9pcGhvbmVfNyA9IHJ1 bnRpbWVfaW9zXzguZGV2aWNlc1sxMF0KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnaVBob25l IDcnLCBkZXZpY2VfaXBob25lXzcubmFtZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnMkFF NThCQkUtMDk5NS00MzI2LTlCNjUtMkY0MTNFMkUzM0RDJywgZGV2aWNlX2lwaG9uZV83LnVkaWQp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoRmFsc2UsIGRldmljZV9pcGhvbmVfNy5hdmFpbGFi bGUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocnVudGltZV9pb3NfOCwgZGV2aWNlX2lwaG9u ZV83LnJ1bnRpbWUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoZGV2aWNlX2lwaG9uZV83LnR5 cGUoKSwgJ2lQaG9uZSA3JykKIAogICAgICAgICBydW50aW1lX2lvc184X2ludGVybmFsID0gc2lt dWxhdG9yLnJ1bnRpbWVzWzFdCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2NvbS5hcHBsZS5D b3JlU2ltdWxhdG9yLlNpbVJ1bnRpbWUuaU9TLTgtMC1JbnRlcm5hbCcsIHJ1bnRpbWVfaW9zXzhf aW50ZXJuYWwuaWRlbnRpZmllcikK 321110 2017-09-18 11:00:58 -0700 2017-09-18 11:07:31 -0700 Patch bug-176962-20170918110057.patch text/plain 2827 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMjA1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE3LTA5LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJvdmlkZSBhY2Nlc3NvciBmb3IgZGV2aWNlIHR5cGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Njk2Mgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQ0NDQ5ODc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBydW5uaW5nIGxheW91dCB0ZXN0cywgd2Ug bmVlZCB0byBiZSBhYmxlIHRvIHF1ZXJ5IGRldmljZQorICAgICAgICB0eXBlIHRvIG9yZ2FuaXpl IGluZnJhc3RydWN0dXJlIGFuZCBzdXBwb3J0IGRldmljZSBzcGVjaWZpYworICAgICAgICB0ZXN0 IGV4cGVjdGF0aW9ucy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2Uu cHk6CisgICAgICAgIChEZXZpY2UudHlwZSk6IEFzayB0aGUgcGxhdGZvcm0gZGV2aWNlIGZvciBp dCdzIHR5cGUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2 aWNlLnB5OgorICAgICAgICAoU2ltdWxhdGVkRGV2aWNlKToKKyAgICAgICAgKFNpbXVsYXRlZERl dmljZS50eXBlKTogRGV0ZXJtaW5lIGRldmljZSB0eXBlIGZyb20gZGV2aWNlIG5hbWUuCisKIDIw MTctMDktMTQgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyMjAzMy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2RldmljZS5weQkocmV2aXNpb24gMjIxOTgwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2RldmljZS5weQkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsMTEgQEAgY2xh c3MgRGV2aWNlKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5wbGF0Zm9ybV9kZXZp Y2Uuc3ltYm9saWNhdGVfY3Jhc2hfbG9nX2lmX25lZWRlZChwYXRoKQogICAgICAgICByZXR1cm4g c2VsZi5maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHBhdGgpCiAKKyAgICBkZWYgdHlwZShzZWxm KToKKyAgICAgICAgaWYgaGFzYXR0cihzZWxmLnBsYXRmb3JtX2RldmljZSwgJ3R5cGUnKToKKyAg ICAgICAgICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS50eXBlKCkKKyAgICAgICAgcmV0 dXJuIE5vbmUKKwogICAgIEBwcm9wZXJ0eQogICAgIGRlZiBleGVjdXRpdmUoc2VsZik6CiAgICAg ICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS5leGVjdXRpdmUKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkJKHJldmlzaW9u IDIyMTk4MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2Rldmlj ZS5weQkod29ya2luZyBjb3B5KQpAQCAtMjEsMTMgKzIxLDE2IEBACiAjIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQg bG9nZ2luZworaW1wb3J0IG9zCitpbXBvcnQgcGxpc3RsaWIKIGltcG9ydCByZQogaW1wb3J0IHN1 YnByb2Nlc3MKIAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAorZnJvbSB3 ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5j b21tb24udGltZW91dF9jb250ZXh0IGltcG9ydCBUaW1lb3V0Ci1mcm9tIHdlYmtpdHB5Lnhjb2Rl LnNpbXVsYXRvciBpbXBvcnQgU2ltdWxhdG9yCitmcm9tIHdlYmtpdHB5Lnhjb2RlLnNpbXVsYXRv ciBpbXBvcnQgRGV2aWNlVHlwZSwgU2ltdWxhdG9yCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dl cihfX25hbWVfXykKIApAQCAtMTkzLDYgKzE5NiwxMSBAQCBjbGFzcyBTaW11bGF0ZWREZXZpY2Uo b2JqZWN0KToKICAgICAgICAgX2xvZy5kZWJ1ZygnUmV0dXJuaW5nIHBpZCB7fSBvZiBsYXVuY2hl ZCBwcm9jZXNzJy5mb3JtYXQobWF0Y2guZ3JvdXAoJ3BpZCcpKSkKICAgICAgICAgcmV0dXJuIGlu dChtYXRjaC5ncm91cCgncGlkJykpCiAKKyAgICBAbWVtb2l6ZWQKKyAgICBkZWYgdHlwZShzZWxm KToKKyAgICAgICAgZGV2aWNlX3BsaXN0ID0gb3MucGF0aC5qb2luKFNpbXVsYXRvci5kZXZpY2Vf ZGlyZWN0b3J5KHNlbGYudWRpZCksICdkZXZpY2UucGxpc3QnKQorICAgICAgICByZXR1cm4gRGV2 aWNlVHlwZS5mcm9tX2lkZW50aWZpZXIocGxpc3RsaWIucmVhZFBsaXN0KGRldmljZV9wbGlzdClb J3J1bnRpbWUnXSkubmFtZQorCiAgICAgZGVmIF9fZXFfXyhzZWxmLCBvdGhlcik6CiAgICAgICAg IHJldHVybiBzZWxmLnVkaWQgPT0gb3RoZXIudWRpZAogCg== 321111 2017-09-18 11:07:32 -0700 2018-03-27 16:39:19 -0700 Patch bug-176962-20170918110732.patch text/plain 2830 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyMjA1NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDE3LTA5LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUHJvdmlkZSBhY2Nlc3NvciBmb3IgZGV2aWNlIHR5cGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3Njk2Mgor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQ0NDQ5ODc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBydW5uaW5nIGxheW91dCB0ZXN0cywgd2Ug bmVlZCB0byBiZSBhYmxlIHRvIHF1ZXJ5IGRldmljZQorICAgICAgICB0eXBlIHRvIG9yZ2FuaXpl IGluZnJhc3RydWN0dXJlIGFuZCBzdXBwb3J0IGRldmljZSBzcGVjaWZpYworICAgICAgICB0ZXN0 IGV4cGVjdGF0aW9ucy4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9kZXZpY2Uu cHk6CisgICAgICAgIChEZXZpY2UudHlwZSk6IEFzayB0aGUgcGxhdGZvcm0gZGV2aWNlIGZvciBp dCdzIHR5cGUuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0ZWRfZGV2 aWNlLnB5OgorICAgICAgICAoU2ltdWxhdGVkRGV2aWNlKToKKyAgICAgICAgKFNpbXVsYXRlZERl dmljZS50eXBlKTogRGV0ZXJtaW5lIGRldmljZSB0eXBlIGZyb20gZGV2aWNlIG5hbWUuCisKIDIw MTctMDktMTQgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAg VW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjIyMjAzMy4KSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kZXZpY2UucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRw eS9wb3J0L2RldmljZS5weQkocmV2aXNpb24gMjIxOTgwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9wb3J0L2RldmljZS5weQkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsMTEgQEAgY2xh c3MgRGV2aWNlKG9iamVjdCk6CiAgICAgICAgICAgICByZXR1cm4gc2VsZi5wbGF0Zm9ybV9kZXZp Y2Uuc3ltYm9saWNhdGVfY3Jhc2hfbG9nX2lmX25lZWRlZChwYXRoKQogICAgICAgICByZXR1cm4g c2VsZi5maWxlc3lzdGVtLnJlYWRfdGV4dF9maWxlKHBhdGgpCiAKKyAgICBkZWYgdHlwZShzZWxm KToKKyAgICAgICAgaWYgaGFzYXR0cihzZWxmLnBsYXRmb3JtX2RldmljZSwgJ3R5cGUnKToKKyAg ICAgICAgICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS50eXBlKCkKKyAgICAgICAgcmV0 dXJuIE5vbmUKKwogICAgIEBwcm9wZXJ0eQogICAgIGRlZiBleGVjdXRpdmUoc2VsZik6CiAgICAg ICAgIHJldHVybiBzZWxmLnBsYXRmb3JtX2RldmljZS5leGVjdXRpdmUKSW5kZXg6IFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2RldmljZS5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRlZF9kZXZpY2UucHkJKHJldmlzaW9u IDIyMTk4MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdGVkX2Rldmlj ZS5weQkod29ya2luZyBjb3B5KQpAQCAtMjEsMTMgKzIxLDE2IEBACiAjIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCiBpbXBvcnQg bG9nZ2luZworaW1wb3J0IG9zCitpbXBvcnQgcGxpc3RsaWIKIGltcG9ydCByZQogaW1wb3J0IHN1 YnByb2Nlc3MKIAogZnJvbSB3ZWJraXRweS5jb21tb24uaG9zdCBpbXBvcnQgSG9zdAorZnJvbSB3 ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCiBmcm9tIHdlYmtpdHB5LmNv bW1vbi5zeXN0ZW0uZXhlY3V0aXZlIGltcG9ydCBTY3JpcHRFcnJvcgogZnJvbSB3ZWJraXRweS5j b21tb24udGltZW91dF9jb250ZXh0IGltcG9ydCBUaW1lb3V0Ci1mcm9tIHdlYmtpdHB5Lnhjb2Rl LnNpbXVsYXRvciBpbXBvcnQgU2ltdWxhdG9yCitmcm9tIHdlYmtpdHB5Lnhjb2RlLnNpbXVsYXRv ciBpbXBvcnQgRGV2aWNlVHlwZSwgU2ltdWxhdG9yCiAKIF9sb2cgPSBsb2dnaW5nLmdldExvZ2dl cihfX25hbWVfXykKIApAQCAtMTkzLDYgKzE5NiwxMSBAQCBjbGFzcyBTaW11bGF0ZWREZXZpY2Uo b2JqZWN0KToKICAgICAgICAgX2xvZy5kZWJ1ZygnUmV0dXJuaW5nIHBpZCB7fSBvZiBsYXVuY2hl ZCBwcm9jZXNzJy5mb3JtYXQobWF0Y2guZ3JvdXAoJ3BpZCcpKSkKICAgICAgICAgcmV0dXJuIGlu dChtYXRjaC5ncm91cCgncGlkJykpCiAKKyAgICBAbWVtb2l6ZWQKKyAgICBkZWYgdHlwZShzZWxm KToKKyAgICAgICAgZGV2aWNlX3BsaXN0ID0gb3MucGF0aC5qb2luKFNpbXVsYXRvci5kZXZpY2Vf ZGlyZWN0b3J5KHNlbGYudWRpZCksICdkZXZpY2UucGxpc3QnKQorICAgICAgICByZXR1cm4gRGV2 aWNlVHlwZS5mcm9tX2lkZW50aWZpZXIocGxpc3RsaWIucmVhZFBsaXN0KGRldmljZV9wbGlzdClb J2RldmljZVR5cGUnXSkubmFtZQorCiAgICAgZGVmIF9fZXFfXyhzZWxmLCBvdGhlcik6CiAgICAg ICAgIHJldHVybiBzZWxmLnVkaWQgPT0gb3RoZXIudWRpZAogCg==