168394 2017-02-15 15:04:47 -0800 webkitpy: Regular expression for parsing simctl device information is wrong for iPad Pro 2017-02-28 12:53:46 -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 1277374 0 jbedard 2017-02-15 15:04:47 -0800 Simulated iPad Pro look have parenthesis in their names when listed through xcrun simctl list. An example of an iPad Pro simulator name is bellow: iPad Pro (9.7 inch) (udid) (state) The regular expression which parses these lines does not consider devices with names which have parenthesis in them. 1277376 1 301660 jbedard 2017-02-15 15:07:04 -0800 Created attachment 301660 Patch 1279356 2 301660 ap 2017-02-21 09:06:47 -0800 Comment on attachment 301660 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=301660&action=review > Tools/Scripts/webkitpy/xcode/simulator.py:344 > - '\s*(?P<name>[^(]+ )\((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?') > + '\s*(?P<name>.+) \((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?') Is this testable? 1279357 3 ap 2017-02-21 09:09:37 -0800 Ideally, we should switch to JSON, not polish text output parsing. 1279517 4 jbedard 2017-02-21 13:51:32 -0800 (In reply to comment #3) > Ideally, we should switch to JSON, not polish text output parsing. I agree that the JSON would be preferable, but I also think that we should at least fix this regular expression temporarily. It will be a few more weeks before the JSON change gets made, and currently, many of the default iPad names do not fit into our regular expression. 1279639 5 302336 jbedard 2017-02-21 16:38:30 -0800 Created attachment 302336 Patch 1281836 6 302336 dbates 2017-02-28 11:33:39 -0800 Comment on attachment 302336 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302336&action=review > Tools/ChangeLog:3 > + webkitpy: Regular expression for parsing simctl device information is wrong for iPad pros iPad pros => iPad Pro 1281861 7 302965 jbedard 2017-02-28 12:11:34 -0800 Created attachment 302965 Patch for landing 1281882 8 302965 commit-queue 2017-02-28 12:53:41 -0800 Comment on attachment 302965 Patch for landing Clearing flags on attachment: 302965 Committed r213164: <http://trac.webkit.org/changeset/213164> 1281883 9 commit-queue 2017-02-28 12:53:46 -0800 All reviewed patches have been landed. Closing bug. 301660 2017-02-15 15:07:04 -0800 2017-02-21 16:38:27 -0800 Patch bug-168394-20170215150428.patch text/plain 1385 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMjQwMCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAyLTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVndWxhciBleHByZXNzaW9uIGZvciBwYXJzaW5nIHNp bWN0bCBkZXZpY2UgaW5mb3JtYXRpb24gaXMgd3JvbmcgZm9yIGlQYWQgcHJvcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4Mzk0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3hjb2RlL3NpbXVsYXRvci5weToKKyAgICAgICAgKFNpbXVsYXRvcik6IEFsbG93IGZvciBwYXJl bnRoZXNpcyBpbiBkZXZpY2UgbmFtZS4KKwogMjAxNy0wMi0xNSAgTHVjYXMgRm9yc2NobGVyICA8 bGZvcnNjaGxlckBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2ODM4NgpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29k ZS9zaW11bGF0b3IucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29k ZS9zaW11bGF0b3IucHkJKHJldmlzaW9uIDIxMjM5MykKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0 cHkveGNvZGUvc2ltdWxhdG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNDEsNyArMzQxLDcgQEAg Y2xhc3MgU2ltdWxhdG9yKG9iamVjdCk6CiAgICAgdW5hdmFpbGFibGVfdmVyc2lvbl9yZSA9IHJl LmNvbXBpbGUoJy0tIFVuYXZhaWxhYmxlOiAoP1A8aWRlbnRpZmllcj5bXiBdKykgLS0nKQogICAg IHZlcnNpb25fcmUgPSByZS5jb21waWxlKCctLSAoaXx3YXRjaHx0dilPUyAoP1A8dmVyc2lvbj5c ZCtcLlxkKykoP1A8aW50ZXJuYWw+IEludGVybmFsKT8gLS0nKQogICAgIGRldmljZXNfcmUgPSBy ZS5jb21waWxlKAotICAgICAgICAnXHMqKD9QPG5hbWU+W14oXSsgKVwoKD9QPHVkaWQ+W14pXSsp XCkgXCgoP1A8c3RhdGU+W14pXSspXCkoIFwoKD9QPGF2YWlsYWJpbGl0eT5bXildKylcKSk/JykK KyAgICAgICAgJ1xzKig/UDxuYW1lPi4rKSBcKCg/UDx1ZGlkPlteKV0rKVwpIFwoKD9QPHN0YXRl PlteKV0rKVwpKCBcKCg/UDxhdmFpbGFiaWxpdHk+W14pXSspXCkpPycpCiAKICAgICBfbWFuYWdl ZF9kZXZpY2VzID0ge30KIAo= 302336 2017-02-21 16:38:30 -0800 2017-02-28 12:11:30 -0800 Patch bug-168394-20170221163545.patch text/plain 6556 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMjc3NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTAyLTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVndWxhciBleHByZXNzaW9uIGZvciBwYXJzaW5nIHNp bWN0bCBkZXZpY2UgaW5mb3JtYXRpb24gaXMgd3JvbmcgZm9yIGlQYWQgcHJvcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4Mzk0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3hjb2RlL3NpbXVsYXRvci5weToKKyAgICAgICAgKFNpbXVsYXRvcik6IEFsbG93IGZvciBwYXJl bnRoZXNpcyBpbiBkZXZpY2UgbmFtZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hjb2Rl L3NpbXVsYXRvcl91bml0dGVzdC5weTogQWRkIGlQYWQgUHJvIHRvIHRlc3QuCisKIDIwMTctMDIt MjAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgQWRk IHN1cHBvcnQgdG8gUGxhdGZvcm1DQUxheWVyL0dyYXBoaWNzTGF5ZXJDQSBmb3Igc3VicGl4ZWwt YW50aWFsaWFzZWQgdGV4dCwgd2l0aCBhIFNldHRpbmcgYW5kIGEgTWluaUJyb3dzZXIgc3dpdGNo CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvci5weQkocmV2aXNp b24gMjEyNzc1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHkJ KHdvcmtpbmcgY29weSkKQEAgLTE3MSw3ICsxNzEsNyBAQCBjbGFzcyBTaW11bGF0b3Iob2JqZWN0 KToKICAgICAiIiIKICAgICBSZXByZXNlbnRzIHRoZSBpT1MgU2ltdWxhdG9yIGluZnJhc3RydWN0 dXJlIHVuZGVyIHRoZSBjdXJyZW50bHkgc2VsZWN0IFhjb2RlLmFwcCBidW5kbGUuCiAgICAgIiIi Ci0gICAgZGV2aWNlX3R5cGVfcmUgPSByZS5jb21waWxlKCcoP1A8bmFtZT5bXihdKylcKCg/UDxp ZGVudGlmaWVyPlteKV0rKVwpJykKKyAgICBkZXZpY2VfdHlwZV9yZSA9IHJlLmNvbXBpbGUoJyg/ UDxuYW1lPi4rKVwoKD9QPGlkZW50aWZpZXI+W14pXSspXCknKQogICAgICMgRklYTUU6IHJ1bnRp bWVfcmUgcGFyc2VzIHRoZSB2ZXJzaW9uIGZyb20gdGhlIHJ1bnRpbWUgbmFtZSwgYnV0IHRoYXQg ZG9lcyBub3QgY29udGFpbiB0aGUgZnVsbCB2ZXJzaW9uIG51bWJlcgogICAgICMgKGl0IGNhbiBv bWl0IHRoZSByZXZpc2lvbikuIFdlIHNob3VsZCBpbnN0ZWFkIHBhcnNlIHRoZSB2ZXJzaW9uIGZy b20gdGhlIG51bWJlciBjb250YWluZWQgaW4gcGFyZW50aGVzZXMuCiAgICAgcnVudGltZV9yZSA9 IHJlLmNvbXBpbGUoCkBAIC0xNzksNyArMTc5LDcgQEAgY2xhc3MgU2ltdWxhdG9yKG9iamVjdCk6 CiAgICAgdW5hdmFpbGFibGVfdmVyc2lvbl9yZSA9IHJlLmNvbXBpbGUoJy0tIFVuYXZhaWxhYmxl OiAoP1A8aWRlbnRpZmllcj5bXiBdKykgLS0nKQogICAgIHZlcnNpb25fcmUgPSByZS5jb21waWxl KCctLSAoaXx3YXRjaHx0dilPUyAoP1A8dmVyc2lvbj5cZCtcLlxkKykoP1A8aW50ZXJuYWw+IElu dGVybmFsKT8gLS0nKQogICAgIGRldmljZXNfcmUgPSByZS5jb21waWxlKAotICAgICAgICAnXHMq KD9QPG5hbWU+W14oXSsgKVwoKD9QPHVkaWQ+W14pXSspXCkgXCgoP1A8c3RhdGU+W14pXSspXCko IFwoKD9QPGF2YWlsYWJpbGl0eT5bXildKylcKSk/JykKKyAgICAgICAgJ1xzKig/UDxuYW1lPi4r KSBcKCg/UDx1ZGlkPlteKV0rKVwpIFwoKD9QPHN0YXRlPlteKV0rKVwpKCBcKCg/UDxhdmFpbGFi aWxpdHk+W14pXSspXCkpPycpCiAKICAgICBfbWFuYWdlZF9kZXZpY2VzID0ge30KICAgICBEZXZp Y2UgPSBOb25lCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3NpbXVsYXRvcl91 bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3Np bXVsYXRvcl91bml0dGVzdC5weQkocmV2aXNpb24gMjEyNzc1KQorKysgVG9vbHMvU2NyaXB0cy93 ZWJraXRweS94Y29kZS9zaW11bGF0b3JfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2 LDYgKzQ2LDcgQEAgaVBob25lIDYgKGNvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldgogaVBh ZCAyIChjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQYWQtMikKIGlQYWQg UmV0aW5hIChjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQYWQtUmV0aW5h KQogaVBhZCBBaXIgKGNvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldmljZVR5cGUuaVBhZC1B aXIpCitpUGFkIFBybyAoOS43LWluY2gpIChjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZp Y2VUeXBlLmlQYWQtUHJvLS05LTctaW5jaC0pCiBBcHBsZSBUViAxMDgwcCAoY29tLmFwcGxlLkNv cmVTaW11bGF0b3IuU2ltRGV2aWNlVHlwZS5BcHBsZS1UVi0xMDgwcCkKIEFwcGxlIFdhdGNoIC0g MzhtbSAoY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltRGV2aWNlVHlwZS5BcHBsZS1XYXRjaC0z OG1tKQogQXBwbGUgV2F0Y2ggLSA0Mm1tIChjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZp Y2VUeXBlLkFwcGxlLVdhdGNoLTQybW0pCkBAIC02Niw2ICs2Nyw3IEBAIHdhdGNoT1MgMi4wICgy LjAgLSAxM1MzNDMpIChjb20uYXBwbGUuQ28KICAgICBpUGFkIDIgKDI5NjdDNTRGLUE0OTktNDA0 My1BODJDLThDMUY1QURCQjRBOSkgKFNodXRkb3duKQogICAgIGlQYWQgUmV0aW5hICg3MzNGQzcx RS0yMkY0LTQwNzctQkY3OS0yNUMyN0VBODgxRkMpIChTaHV0ZG93bikKICAgICBpUGFkIEFpciAo NjcyNjY4NDEtODJGMy00NTQ1LUFFRDYtNTY4QjExN0U0MUE4KSAoU2h1dGRvd24pCisgICAgaVBh ZCBQcm8gKDkuNyBpbmNoKSAoREVCRDUwQjgtMDU2Ni00RDdBLUJDREItNDEzNENGRTVEQTQwKSAo U2h1dGRvd24pCiAtLSBpT1MgOC4wIEludGVybmFsIC0tCiAtLSB0dk9TIDkuMCAtLQogQXBwbGUg VFYgMTA4MHAgKDU1MjgxQUJFLTlDMjctNDM4Qi1BRDUwLUM1NDBEN0JDNEJBQykgKFNodXRkb3du KQpAQCAtNzQsNyArNzYsNyBAQCBBcHBsZSBUViAxMDgwcCAoNTUyODFBQkUtOUMyNy00MzhCLUFE NTAtCiAgICAgQXBwbGUgV2F0Y2ggLSA0Mm1tICgxODZBRDg1RS05QkU1LTQ3MzQtQkMzMy1ERjUw NDg0QUFGRjApIChTaHV0ZG93bikKICcnJykKICAgICAgICAgc2ltdWxhdG9yID0gU2ltdWxhdG9y KGhvc3Q9c2VsZi5faG9zdCkKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgxMSwgbGVuKHNpbXVs YXRvci5kZXZpY2VfdHlwZXMpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDEyLCBsZW4oc2lt dWxhdG9yLmRldmljZV90eXBlcykpCiAKICAgICAgICAgZGV2aWNlX3R5cGVfaXBob25lXzRzID0g c2ltdWxhdG9yLmRldmljZV90eXBlc1swXQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdpUGhv bmUgNHMnLCBkZXZpY2VfdHlwZV9pcGhvbmVfNHMubmFtZSkKQEAgLTEwOCwxNSArMTEwLDE5IEBA IEFwcGxlIFRWIDEwODBwICg1NTI4MUFCRS05QzI3LTQzOEItQUQ1MC0KICAgICAgICAgc2VsZi5h c3NlcnRFcXVhbCgnaVBhZCBBaXInLCBkZXZpY2VfdHlwZV9pcGFkX2Fpci5uYW1lKQogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKCdjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBl LmlQYWQtQWlyJywgZGV2aWNlX3R5cGVfaXBhZF9haXIuaWRlbnRpZmllcikKIAotICAgICAgICBk ZXZpY2VfdHlwZV9hcHBsZV90dl8xMDgwcCA9IHNpbXVsYXRvci5kZXZpY2VfdHlwZXNbOF0KKyAg ICAgICAgZGV2aWNlX3R5cGVfaXBhZF9wcm8gPSBzaW11bGF0b3IuZGV2aWNlX3R5cGVzWzhdCisg ICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2lQYWQgUHJvICg5LjctaW5jaCknLCBkZXZpY2VfdHlw ZV9pcGFkX3Byby5uYW1lKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdjb20uYXBwbGUuQ29y ZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQYWQtUHJvLS05LTctaW5jaC0nLCBkZXZpY2VfdHlw ZV9pcGFkX3Byby5pZGVudGlmaWVyKQorCisgICAgICAgIGRldmljZV90eXBlX2FwcGxlX3R2XzEw ODBwID0gc2ltdWxhdG9yLmRldmljZV90eXBlc1s5XQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs KCdBcHBsZSBUViAxMDgwcCcsIGRldmljZV90eXBlX2FwcGxlX3R2XzEwODBwLm5hbWUpCiAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2NvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldmljZVR5 cGUuQXBwbGUtVFYtMTA4MHAnLCBkZXZpY2VfdHlwZV9hcHBsZV90dl8xMDgwcC5pZGVudGlmaWVy KQogCi0gICAgICAgIGRldmljZV90eXBlX2FwcGxlX3dhdGNoXzM4bW0gPSBzaW11bGF0b3IuZGV2 aWNlX3R5cGVzWzldCisgICAgICAgIGRldmljZV90eXBlX2FwcGxlX3dhdGNoXzM4bW0gPSBzaW11 bGF0b3IuZGV2aWNlX3R5cGVzWzEwXQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdBcHBsZSBX YXRjaCAtIDM4bW0nLCBkZXZpY2VfdHlwZV9hcHBsZV93YXRjaF8zOG1tLm5hbWUpCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoJ2NvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldmljZVR5cGUu QXBwbGUtV2F0Y2gtMzhtbScsIGRldmljZV90eXBlX2FwcGxlX3dhdGNoXzM4bW0uaWRlbnRpZmll cikKIAotICAgICAgICBkZXZpY2VfdHlwZV9hcHBsZV93YXRjaF80Mm1tID0gc2ltdWxhdG9yLmRl dmljZV90eXBlc1sxMF0KKyAgICAgICAgZGV2aWNlX3R5cGVfYXBwbGVfd2F0Y2hfNDJtbSA9IHNp bXVsYXRvci5kZXZpY2VfdHlwZXNbMTFdCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0FwcGxl IFdhdGNoIC0gNDJtbScsIGRldmljZV90eXBlX2FwcGxlX3dhdGNoXzQybW0ubmFtZSkKICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbCgnY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltRGV2aWNlVHlw ZS5BcHBsZS1XYXRjaC00Mm1tJywgZGV2aWNlX3R5cGVfYXBwbGVfd2F0Y2hfNDJtbS5pZGVudGlm aWVyKQogCkBAIC0xMjcsNyArMTMzLDcgQEAgQXBwbGUgVFYgMTA4MHAgKDU1MjgxQUJFLTlDMjct NDM4Qi1BRDUwLQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKFRydWUsIHJ1bnRpbWVfaW9zXzgu YXZhaWxhYmxlKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKEZhbHNlLCBydW50aW1lX2lvc184 LmlzX2ludGVybmFsX3J1bnRpbWUpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwodHVwbGUoWzgs IDBdKSwgcnVudGltZV9pb3NfOC52ZXJzaW9uKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDks IGxlbihydW50aW1lX2lvc184LmRldmljZXMpKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKDEw LCBsZW4ocnVudGltZV9pb3NfOC5kZXZpY2VzKSkKIAogICAgICAgICBkZXZpY2VfaXBob25lXzRz ID0gcnVudGltZV9pb3NfOC5kZXZpY2VzWzBdCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ2lQ aG9uZSA0cycsIGRldmljZV9pcGhvbmVfNHMubmFtZSkKQEAgLTE4Myw2ICsxODksMTIgQEAgQXBw bGUgVFYgMTA4MHAgKDU1MjgxQUJFLTlDMjctNDM4Qi1BRDUwLQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKFRydWUsIGRldmljZV9pcGFkX2Fpci5hdmFpbGFibGUpCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwocnVudGltZV9pb3NfOCwgZGV2aWNlX2lwYWRfYWlyLnJ1bnRpbWUpCiAKKyAgICAg ICAgZGV2aWNlX2lwYWRfcHJvID0gcnVudGltZV9pb3NfOC5kZXZpY2VzWzldCisgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoJ2lQYWQgUHJvICg5LjcgaW5jaCknLCBkZXZpY2VfaXBhZF9wcm8ubmFt ZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnREVCRDUwQjgtMDU2Ni00RDdBLUJDREItNDEz NENGRTVEQTQwJywgZGV2aWNlX2lwYWRfcHJvLnVkaWQpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwoVHJ1ZSwgZGV2aWNlX2lwYWRfcHJvLmF2YWlsYWJsZSkKKyAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChydW50aW1lX2lvc184LCBkZXZpY2VfaXBhZF9wcm8ucnVudGltZSkKKwogICAgICAgICBy dW50aW1lX2lvc184X2ludGVybmFsID0gc2ltdWxhdG9yLnJ1bnRpbWVzWzFdCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoJ2NvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbVJ1bnRpbWUuaU9TLTgt MC1JbnRlcm5hbCcsIHJ1bnRpbWVfaW9zXzhfaW50ZXJuYWwuaWRlbnRpZmllcikKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChGYWxzZSwgcnVudGltZV9pb3NfOF9pbnRlcm5hbC5hdmFpbGFibGUp Cg== 302965 2017-02-28 12:11:34 -0800 2017-02-28 12:53:41 -0800 Patch for landing bug-168394-20170228120837.patch text/plain 6497 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMzE2MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE0IEBACisyMDE3LTAyLTI4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICB3ZWJraXRweTogUmVndWxhciBleHByZXNzaW9uIGZvciBwYXJzaW5nIHNp bWN0bCBkZXZpY2UgaW5mb3JtYXRpb24gaXMgd3JvbmcgZm9yIGlQYWQgUHJvCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjgzOTQKKworICAgICAgICBS ZXZpZXdlZCBieSBEYW5pZWwgQmF0ZXMuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hj b2RlL3NpbXVsYXRvci5weToKKyAgICAgICAgKFNpbXVsYXRvcik6IEFsbG93IGZvciBwYXJlbnRo ZXNpcyBpbiBkZXZpY2UgbmFtZS4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3hjb2RlL3Np bXVsYXRvcl91bml0dGVzdC5weTogQWRkIGlQYWQgUHJvIHRvIHRlc3QuCisKIDIwMTctMDItMjQg IE1hdHQgUmFqY2EgIDxtcmFqY2FAYXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhOiBub3RpZnkg Y2xpZW50cyB3aGVuIGF1dG9wbGF5ZWQgbWVkaWEgZW5kcyB3aXRob3V0IGJlaW5nIHBhdXNlZApJ bmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3IucHkJKHJldmlzaW9u IDIxMzE2MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkveGNvZGUvc2ltdWxhdG9yLnB5CSh3 b3JraW5nIGNvcHkpCkBAIC0xNzEsNyArMTcxLDcgQEAgY2xhc3MgU2ltdWxhdG9yKG9iamVjdCk6 CiAgICAgIiIiCiAgICAgUmVwcmVzZW50cyB0aGUgaU9TIFNpbXVsYXRvciBpbmZyYXN0cnVjdHVy ZSB1bmRlciB0aGUgY3VycmVudGx5IHNlbGVjdCBYY29kZS5hcHAgYnVuZGxlLgogICAgICIiIgot ICAgIGRldmljZV90eXBlX3JlID0gcmUuY29tcGlsZSgnKD9QPG5hbWU+W14oXSspXCgoP1A8aWRl bnRpZmllcj5bXildKylcKScpCisgICAgZGV2aWNlX3R5cGVfcmUgPSByZS5jb21waWxlKCcoP1A8 bmFtZT4uKylcKCg/UDxpZGVudGlmaWVyPlteKV0rKVwpJykKICAgICAjIEZJWE1FOiBydW50aW1l X3JlIHBhcnNlcyB0aGUgdmVyc2lvbiBmcm9tIHRoZSBydW50aW1lIG5hbWUsIGJ1dCB0aGF0IGRv ZXMgbm90IGNvbnRhaW4gdGhlIGZ1bGwgdmVyc2lvbiBudW1iZXIKICAgICAjIChpdCBjYW4gb21p dCB0aGUgcmV2aXNpb24pLiBXZSBzaG91bGQgaW5zdGVhZCBwYXJzZSB0aGUgdmVyc2lvbiBmcm9t IHRoZSBudW1iZXIgY29udGFpbmVkIGluIHBhcmVudGhlc2VzLgogICAgIHJ1bnRpbWVfcmUgPSBy ZS5jb21waWxlKApAQCAtMTc5LDcgKzE3OSw3IEBAIGNsYXNzIFNpbXVsYXRvcihvYmplY3QpOgog ICAgIHVuYXZhaWxhYmxlX3ZlcnNpb25fcmUgPSByZS5jb21waWxlKCctLSBVbmF2YWlsYWJsZTog KD9QPGlkZW50aWZpZXI+W14gXSspIC0tJykKICAgICB2ZXJzaW9uX3JlID0gcmUuY29tcGlsZSgn LS0gKGl8d2F0Y2h8dHYpT1MgKD9QPHZlcnNpb24+XGQrXC5cZCspKD9QPGludGVybmFsPiBJbnRl cm5hbCk/IC0tJykKICAgICBkZXZpY2VzX3JlID0gcmUuY29tcGlsZSgKLSAgICAgICAgJ1xzKig/ UDxuYW1lPlteKF0rIClcKCg/UDx1ZGlkPlteKV0rKVwpIFwoKD9QPHN0YXRlPlteKV0rKVwpKCBc KCg/UDxhdmFpbGFiaWxpdHk+W14pXSspXCkpPycpCisgICAgICAgICdccyooP1A8bmFtZT4uKykg XCgoP1A8dWRpZD5bXildKylcKSBcKCg/UDxzdGF0ZT5bXildKylcKSggXCgoP1A8YXZhaWxhYmls aXR5PlteKV0rKVwpKT8nKQogCiAgICAgX21hbmFnZWRfZGV2aWNlcyA9IHt9CiAgICAgRGV2aWNl ID0gTm9uZQpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11bGF0b3JfdW5p dHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS94Y29kZS9zaW11 bGF0b3JfdW5pdHRlc3QucHkJKHJldmlzaW9uIDIxMzE2MSkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkveGNvZGUvc2ltdWxhdG9yX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw2 ICs0Niw3IEBAIGlQaG9uZSA2IChjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXYKIGlQYWQg MiAoY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltRGV2aWNlVHlwZS5pUGFkLTIpCiBpUGFkIFJl dGluYSAoY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltRGV2aWNlVHlwZS5pUGFkLVJldGluYSkK IGlQYWQgQWlyIChjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLmlQYWQtQWly KQoraVBhZCBQcm8gKDkuNy1pbmNoKSAoY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltRGV2aWNl VHlwZS5pUGFkLVByby0tOS03LWluY2gtKQogQXBwbGUgVFYgMTA4MHAgKGNvbS5hcHBsZS5Db3Jl U2ltdWxhdG9yLlNpbURldmljZVR5cGUuQXBwbGUtVFYtMTA4MHApCiBBcHBsZSBXYXRjaCAtIDM4 bW0gKGNvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldmljZVR5cGUuQXBwbGUtV2F0Y2gtMzht bSkKIEFwcGxlIFdhdGNoIC0gNDJtbSAoY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltRGV2aWNl VHlwZS5BcHBsZS1XYXRjaC00Mm1tKQpAQCAtNjYsNiArNjcsNyBAQCB3YXRjaE9TIDIuMCAoMi4w IC0gMTNTMzQzKSAoY29tLmFwcGxlLkNvCiAgICAgaVBhZCAyICgyOTY3QzU0Ri1BNDk5LTQwNDMt QTgyQy04QzFGNUFEQkI0QTkpIChTaHV0ZG93bikKICAgICBpUGFkIFJldGluYSAoNzMzRkM3MUUt MjJGNC00MDc3LUJGNzktMjVDMjdFQTg4MUZDKSAoU2h1dGRvd24pCiAgICAgaVBhZCBBaXIgKDY3 MjY2ODQxLTgyRjMtNDU0NS1BRUQ2LTU2OEIxMTdFNDFBOCkgKFNodXRkb3duKQorICAgIGlQYWQg UHJvICg5LjcgaW5jaCkgKERFQkQ1MEI4LTA1NjYtNEQ3QS1CQ0RCLTQxMzRDRkU1REE0MCkgKFNo dXRkb3duKQogLS0gaU9TIDguMCBJbnRlcm5hbCAtLQogLS0gdHZPUyA5LjAgLS0KIEFwcGxlIFRW IDEwODBwICg1NTI4MUFCRS05QzI3LTQzOEItQUQ1MC1DNTQwRDdCQzRCQUMpIChTaHV0ZG93bikK QEAgLTc0LDcgKzc2LDcgQEAgQXBwbGUgVFYgMTA4MHAgKDU1MjgxQUJFLTlDMjctNDM4Qi1BRDUw LQogICAgIEFwcGxlIFdhdGNoIC0gNDJtbSAoMTg2QUQ4NUUtOUJFNS00NzM0LUJDMzMtREY1MDQ4 NEFBRkYwKSAoU2h1dGRvd24pCiAnJycpCiAgICAgICAgIHNpbXVsYXRvciA9IFNpbXVsYXRvciho b3N0PXNlbGYuX2hvc3QpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoMTEsIGxlbihzaW11bGF0 b3IuZGV2aWNlX3R5cGVzKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgxMiwgbGVuKHNpbXVs YXRvci5kZXZpY2VfdHlwZXMpKQogCiAgICAgICAgIGRldmljZV90eXBlX2lwaG9uZV80cyA9IHNp bXVsYXRvci5kZXZpY2VfdHlwZXNbMF0KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnaVBob25l IDRzJywgZGV2aWNlX3R5cGVfaXBob25lXzRzLm5hbWUpCkBAIC0xMDgsMTUgKzExMCwxOSBAQCBB cHBsZSBUViAxMDgwcCAoNTUyODFBQkUtOUMyNy00MzhCLUFENTAtCiAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoJ2lQYWQgQWlyJywgZGV2aWNlX3R5cGVfaXBhZF9haXIubmFtZSkKICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbCgnY29tLmFwcGxlLkNvcmVTaW11bGF0b3IuU2ltRGV2aWNlVHlwZS5p UGFkLUFpcicsIGRldmljZV90eXBlX2lwYWRfYWlyLmlkZW50aWZpZXIpCiAKLSAgICAgICAgZGV2 aWNlX3R5cGVfYXBwbGVfdHZfMTA4MHAgPSBzaW11bGF0b3IuZGV2aWNlX3R5cGVzWzhdCisgICAg ICAgIGRldmljZV90eXBlX2lwYWRfcHJvID0gc2ltdWxhdG9yLmRldmljZV90eXBlc1s4XQorICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKCdpUGFkIFBybyAoOS43LWluY2gpJywgZGV2aWNlX3R5cGVf aXBhZF9wcm8ubmFtZSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnY29tLmFwcGxlLkNvcmVT aW11bGF0b3IuU2ltRGV2aWNlVHlwZS5pUGFkLVByby0tOS03LWluY2gtJywgZGV2aWNlX3R5cGVf aXBhZF9wcm8uaWRlbnRpZmllcikKKworICAgICAgICBkZXZpY2VfdHlwZV9hcHBsZV90dl8xMDgw cCA9IHNpbXVsYXRvci5kZXZpY2VfdHlwZXNbOV0KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgn QXBwbGUgVFYgMTA4MHAnLCBkZXZpY2VfdHlwZV9hcHBsZV90dl8xMDgwcC5uYW1lKQogICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKCdjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBl LkFwcGxlLVRWLTEwODBwJywgZGV2aWNlX3R5cGVfYXBwbGVfdHZfMTA4MHAuaWRlbnRpZmllcikK IAotICAgICAgICBkZXZpY2VfdHlwZV9hcHBsZV93YXRjaF8zOG1tID0gc2ltdWxhdG9yLmRldmlj ZV90eXBlc1s5XQorICAgICAgICBkZXZpY2VfdHlwZV9hcHBsZV93YXRjaF8zOG1tID0gc2ltdWxh dG9yLmRldmljZV90eXBlc1sxMF0KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgnQXBwbGUgV2F0 Y2ggLSAzOG1tJywgZGV2aWNlX3R5cGVfYXBwbGVfd2F0Y2hfMzhtbS5uYW1lKQogICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKCdjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1EZXZpY2VUeXBlLkFw cGxlLVdhdGNoLTM4bW0nLCBkZXZpY2VfdHlwZV9hcHBsZV93YXRjaF8zOG1tLmlkZW50aWZpZXIp CiAKLSAgICAgICAgZGV2aWNlX3R5cGVfYXBwbGVfd2F0Y2hfNDJtbSA9IHNpbXVsYXRvci5kZXZp Y2VfdHlwZXNbMTBdCisgICAgICAgIGRldmljZV90eXBlX2FwcGxlX3dhdGNoXzQybW0gPSBzaW11 bGF0b3IuZGV2aWNlX3R5cGVzWzExXQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdBcHBsZSBX YXRjaCAtIDQybW0nLCBkZXZpY2VfdHlwZV9hcHBsZV93YXRjaF80Mm1tLm5hbWUpCiAgICAgICAg IHNlbGYuYXNzZXJ0RXF1YWwoJ2NvbS5hcHBsZS5Db3JlU2ltdWxhdG9yLlNpbURldmljZVR5cGUu QXBwbGUtV2F0Y2gtNDJtbScsIGRldmljZV90eXBlX2FwcGxlX3dhdGNoXzQybW0uaWRlbnRpZmll cikKIApAQCAtMTI3LDcgKzEzMyw3IEBAIEFwcGxlIFRWIDEwODBwICg1NTI4MUFCRS05QzI3LTQz OEItQUQ1MC0KICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChUcnVlLCBydW50aW1lX2lvc184LmF2 YWlsYWJsZSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChGYWxzZSwgcnVudGltZV9pb3NfOC5p c19pbnRlcm5hbF9ydW50aW1lKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHR1cGxlKFs4LCAw XSksIHJ1bnRpbWVfaW9zXzgudmVyc2lvbikKLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCg5LCBs ZW4ocnVudGltZV9pb3NfOC5kZXZpY2VzKSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgxMCwg bGVuKHJ1bnRpbWVfaW9zXzguZGV2aWNlcykpCiAKICAgICAgICAgZGV2aWNlX2lwaG9uZV80cyA9 IHJ1bnRpbWVfaW9zXzguZGV2aWNlc1swXQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKCdpUGhv bmUgNHMnLCBkZXZpY2VfaXBob25lXzRzLm5hbWUpCkBAIC0xODMsNiArMTg5LDEyIEBAIEFwcGxl IFRWIDEwODBwICg1NTI4MUFCRS05QzI3LTQzOEItQUQ1MC0KICAgICAgICAgc2VsZi5hc3NlcnRF cXVhbChUcnVlLCBkZXZpY2VfaXBhZF9haXIuYXZhaWxhYmxlKQogICAgICAgICBzZWxmLmFzc2Vy dEVxdWFsKHJ1bnRpbWVfaW9zXzgsIGRldmljZV9pcGFkX2Fpci5ydW50aW1lKQogCisgICAgICAg IGRldmljZV9pcGFkX3BybyA9IHJ1bnRpbWVfaW9zXzguZGV2aWNlc1s5XQorICAgICAgICBzZWxm LmFzc2VydEVxdWFsKCdpUGFkIFBybyAoOS43IGluY2gpJywgZGV2aWNlX2lwYWRfcHJvLm5hbWUp CisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoJ0RFQkQ1MEI4LTA1NjYtNEQ3QS1CQ0RCLTQxMzRD RkU1REE0MCcsIGRldmljZV9pcGFkX3Byby51ZGlkKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFs KFRydWUsIGRldmljZV9pcGFkX3Byby5hdmFpbGFibGUpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1 YWwocnVudGltZV9pb3NfOCwgZGV2aWNlX2lwYWRfcHJvLnJ1bnRpbWUpCisKICAgICAgICAgcnVu dGltZV9pb3NfOF9pbnRlcm5hbCA9IHNpbXVsYXRvci5ydW50aW1lc1sxXQogICAgICAgICBzZWxm LmFzc2VydEVxdWFsKCdjb20uYXBwbGUuQ29yZVNpbXVsYXRvci5TaW1SdW50aW1lLmlPUy04LTAt SW50ZXJuYWwnLCBydW50aW1lX2lvc184X2ludGVybmFsLmlkZW50aWZpZXIpCiAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoRmFsc2UsIHJ1bnRpbWVfaW9zXzhfaW50ZXJuYWwuYXZhaWxhYmxlKQo=