<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>169413</bug_id>
          
          <creation_ts>2017-03-09 08:28:20 -0800</creation_ts>
          <short_desc>webkitpy: Look for &apos;ios&apos; test expectations for IOSPorts</short_desc>
          <delta_ts>2017-03-27 14:49:16 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>Tools / Tests</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Jonathan Bedard">jbedard</reporter>
          <assigned_to name="Jonathan Bedard">jbedard</assigned_to>
          <cc>ap</cc>
    
    <cc>commit-queue</cc>
    
    <cc>glenn</cc>
    
    <cc>lforschler</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1285323</commentid>
    <comment_count>0</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2017-03-09 08:28:20 -0800</bug_when>
    <thetext>IOSPort does not define any test expectation path.  Move default_baseline_search_path from IOSSimulatorPort to IOSPort and move configuration generation into IOSPort.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1285335</commentid>
    <comment_count>1</comment_count>
      <attachid>303923</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2017-03-09 09:04:09 -0800</bug_when>
    <thetext>Created attachment 303923
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1285362</commentid>
    <comment_count>2</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2017-03-09 09:58:44 -0800</bug_when>
    <thetext>&lt;rdar://problem/30949776&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1289825</commentid>
    <comment_count>3</comment_count>
      <attachid>305023</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2017-03-21 13:42:32 -0700</bug_when>
    <thetext>Created attachment 305023
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1291580</commentid>
    <comment_count>4</comment_count>
      <attachid>305023</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2017-03-27 13:20:00 -0700</bug_when>
    <thetext>Comment on attachment 305023
Patch

rs=me

Before landing, please follow up with Ryan about what the fallback path will be (both for expectations and for TestExpectations).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1291610</commentid>
    <comment_count>5</comment_count>
      <attachid>305506</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2017-03-27 14:08:08 -0700</bug_when>
    <thetext>Created attachment 305506
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1291629</commentid>
    <comment_count>6</comment_count>
      <attachid>305506</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-03-27 14:49:13 -0700</bug_when>
    <thetext>Comment on attachment 305506
Patch for landing

Clearing flags on attachment: 305506

Committed r214432: &lt;http://trac.webkit.org/changeset/214432&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1291630</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2017-03-27 14:49:16 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>303923</attachid>
            <date>2017-03-09 09:04:09 -0800</date>
            <delta_ts>2017-03-21 13:42:29 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-169413-20170309090408.patch</filename>
            <type>text/plain</type>
            <size>4453</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDIxMzY0MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE4IEBACisyMDE3LTAzLTA5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICB3ZWJraXRweTogTG9vayBmb3IgJ2lvcycgdGVzdCBleHBlY3RhdGlvbnMg
Zm9yIElPU1BvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNjk0MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHk6CisgICAgICAgIChJT1NQb3J0Ll9n
ZW5lcmF0ZV9hbGxfdGVzdF9jb25maWd1cmF0aW9ucyk6IE1vdmVkIGZyb20gSU9TU2ltdWxhdG9y
UG9ydC4KKyAgICAgICAgKElPU1BvcnQuZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IEFk
ZCBpb3MgZXhwZWN0YXRpb25zIGFsb25nIHdpdGggcG9ydCBzcGVjaWZpYyBleHBlY3RhdGlvbnMu
CisgICAgICAgIChJT1NQb3J0LnRlc3RfZXhwZWN0YXRpb25zX2ZpbGVfcG9zaXRpb24pOiBBZGRl
ZCBmb3IgdGVzdGluZy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVs
YXRvci5weToKKyAgICAgICAgKElPU1NpbXVsYXRvclBvcnQuX2dlbmVyYXRlX2FsbF90ZXN0X2Nv
bmZpZ3VyYXRpb25zKTogTW92ZWQgdG8gSU9TUG9ydC4KKyAgICAgICAgKElPU1NpbXVsYXRvclBv
cnQuZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IE1vdmVkIHRvIElPU1BvcnQuCisKIDIw
MTctMDMtMDggIFNyaW5pdmFzYW4gVmlqYXlhcmFnaGF2YW4gIDxzdmlqYXlhcmFnaGF2YW5AYXBw
bGUuY29tPgogCiAgICAgICAgIEZpeCBlcnJvci93YXJuaW5nIGR1cGxpY2F0aW9uIGluIEpTT04g
YmluZGluZ3MgcmVzdWx0cwpJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5w
eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CShyZXZp
c2lvbiAyMTM2MDMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5CSh3b3Jr
aW5nIGNvcHkpCkBAIC0yMyw2ICsyMyw3IEBACiBpbXBvcnQgbG9nZ2luZwogCiBmcm9tIHdlYmtp
dHB5LmNvbW1vbi5tZW1vaXplZCBpbXBvcnQgbWVtb2l6ZWQKK2Zyb20gd2Via2l0cHkubGF5b3V0
X3Rlc3RzLm1vZGVscy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RDb25maWd1cmF0aW9u
CiBmcm9tIHdlYmtpdHB5LnBvcnQuZGFyd2luIGltcG9ydCBEYXJ3aW5Qb3J0CiBmcm9tIHdlYmtp
dHB5LnBvcnQuc2ltdWxhdG9yX3Byb2Nlc3MgaW1wb3J0IFNpbXVsYXRvclByb2Nlc3MKIApAQCAt
NTUsNiArNTYsMTMgQEAgY2xhc3MgSU9TUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgICAgIHJl
dHVybiAnV2ViS2l0VGVzdFJ1bm5lckFwcC5hcHAnCiAgICAgICAgIHJldHVybiAnRHVtcFJlbmRl
clRyZWUuYXBwJwogCisgICAgZGVmIF9nZW5lcmF0ZV9hbGxfdGVzdF9jb25maWd1cmF0aW9ucyhz
ZWxmKToKKyAgICAgICAgY29uZmlndXJhdGlvbnMgPSBbXQorICAgICAgICBmb3IgYnVpbGRfdHlw
ZSBpbiBzZWxmLkFMTF9CVUlMRF9UWVBFUzoKKyAgICAgICAgICAgIGZvciBhcmNoaXRlY3R1cmUg
aW4gc2VsZi5BUkNISVRFQ1RVUkVTOgorICAgICAgICAgICAgICAgIGNvbmZpZ3VyYXRpb25zLmFw
cGVuZChUZXN0Q29uZmlndXJhdGlvbih2ZXJzaW9uPXNlbGYuX3ZlcnNpb24sIGFyY2hpdGVjdHVy
ZT1hcmNoaXRlY3R1cmUsIGJ1aWxkX3R5cGU9YnVpbGRfdHlwZSkpCisgICAgICAgIHJldHVybiBj
b25maWd1cmF0aW9ucworCiAgICAgQG1lbW9pemVkCiAgICAgZGVmIGNoaWxkX3Byb2Nlc3Nlcyhz
ZWxmKToKICAgICAgICAgcmV0dXJuIGludChzZWxmLmdldF9vcHRpb24oJ2NoaWxkX3Byb2Nlc3Nl
cycpKQpAQCAtNzcsNiArODUsMjQgQEAgY2xhc3MgSU9TUG9ydChEYXJ3aW5Qb3J0KToKICAgICAg
ICAgICAgIHJldHVybiBzZWxmLl90ZXN0aW5nX2RldmljZShudW1iZXIpCiAgICAgICAgIHJldHVy
biBzZWxmLl9jdXJyZW50X2RldmljZQogCisgICAgZGVmIGRlZmF1bHRfYmFzZWxpbmVfc2VhcmNo
X3BhdGgoc2VsZik6CisgICAgICAgIHdrX3N0cmluZyA9ICd3azEnCisgICAgICAgIGlmIHNlbGYu
Z2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAgICAgICB3a19zdHJpbmcg
PSAnd2syJworICAgICAgICBmYWxsYmFja19uYW1lcyA9IFsKKyAgICAgICAgICAgICd7fS17fScu
Zm9ybWF0KHNlbGYucG9ydF9uYW1lLCB3a19zdHJpbmcpLAorICAgICAgICAgICAgc2VsZi5wb3J0
X25hbWUsCisgICAgICAgICAgICAne30te30nLmZvcm1hdChJT1NQb3J0LnBvcnRfbmFtZSwgd2tf
c3RyaW5nKSwKKyAgICAgICAgICAgIElPU1BvcnQucG9ydF9uYW1lLAorICAgICAgICBdCisgICAg
ICAgIGlmIHNlbGYuZ2V0X29wdGlvbignd2Via2l0X3Rlc3RfcnVubmVyJyk6CisgICAgICAgICAg
ICBmYWxsYmFja19uYW1lcy5hcHBlbmQoJ3drMicpCisKKyAgICAgICAgcmV0dXJuIG1hcChzZWxm
Ll93ZWJraXRfYmFzZWxpbmVfcGF0aCwgZmFsbGJhY2tfbmFtZXMpCisKKyAgICBkZWYgdGVzdF9l
eHBlY3RhdGlvbnNfZmlsZV9wb3NpdGlvbihzZWxmKToKKyAgICAgICAgcmV0dXJuIDMKKwogICAg
IGRlZiBfY3JlYXRlX2RldmljZXMoc2VsZiwgZGV2aWNlX2NsYXNzKToKICAgICAgICAgcmFpc2Ug
Tm90SW1wbGVtZW50ZWRFcnJvcgogCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv
aW9zX3NpbXVsYXRvci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv
cnQvaW9zX3NpbXVsYXRvci5weQkocmV2aXNpb24gMjEzNjAzKQorKysgVG9vbHMvU2NyaXB0cy93
ZWJraXRweS9wb3J0L2lvc19zaW11bGF0b3IucHkJKHdvcmtpbmcgY29weSkKQEAgLTI4LDcgKzI4
LDYgQEAgaW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCB0aW1lCiAKIGZyb20gd2Via2l0cHkuY29t
bW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAotZnJvbSB3ZWJraXRweS5sYXlvdXRfdGVzdHMu
bW9kZWxzLnRlc3RfY29uZmlndXJhdGlvbiBpbXBvcnQgVGVzdENvbmZpZ3VyYXRpb24KIGZyb20g
d2Via2l0cHkucG9ydCBpbXBvcnQgaW1hZ2VfZGlmZgogZnJvbSB3ZWJraXRweS5wb3J0LmlvcyBp
bXBvcnQgSU9TUG9ydAogZnJvbSB3ZWJraXRweS54Y29kZS5zaW11bGF0b3IgaW1wb3J0IFNpbXVs
YXRvciwgUnVudGltZSwgRGV2aWNlVHlwZQpAQCAtMTcwLDIxICsxNjksNiBAQCBjbGFzcyBJT1NT
aW11bGF0b3JQb3J0KElPU1BvcnQpOgogICAgICAgICBzZGsgPSBbJy0tc2RrJywgJ2lwaG9uZXNp
bXVsYXRvciddCiAgICAgICAgIHJldHVybiBhcmNocyArIHNkawogCi0gICAgZGVmIF9nZW5lcmF0
ZV9hbGxfdGVzdF9jb25maWd1cmF0aW9ucyhzZWxmKToKLSAgICAgICAgY29uZmlndXJhdGlvbnMg
PSBbXQotICAgICAgICBmb3IgYnVpbGRfdHlwZSBpbiBzZWxmLkFMTF9CVUlMRF9UWVBFUzoKLSAg
ICAgICAgICAgIGZvciBhcmNoaXRlY3R1cmUgaW4gc2VsZi5BUkNISVRFQ1RVUkVTOgotICAgICAg
ICAgICAgICAgIGNvbmZpZ3VyYXRpb25zLmFwcGVuZChUZXN0Q29uZmlndXJhdGlvbih2ZXJzaW9u
PXNlbGYuX3ZlcnNpb24sIGFyY2hpdGVjdHVyZT1hcmNoaXRlY3R1cmUsIGJ1aWxkX3R5cGU9YnVp
bGRfdHlwZSkpCi0gICAgICAgIHJldHVybiBjb25maWd1cmF0aW9ucwotCi0gICAgZGVmIGRlZmF1
bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoc2VsZik6Ci0gICAgICAgIGlmIHNlbGYuZ2V0X29wdGlv
bignd2Via2l0X3Rlc3RfcnVubmVyJyk6Ci0gICAgICAgICAgICBmYWxsYmFja19uYW1lcyA9IFtz
ZWxmLl93azJfcG9ydF9uYW1lKCldICsgW3NlbGYucG9ydF9uYW1lXSArIFsnd2syJ10KLSAgICAg
ICAgZWxzZToKLSAgICAgICAgICAgIGZhbGxiYWNrX25hbWVzID0gW3NlbGYucG9ydF9uYW1lICsg
Jy13azEnXSArIFtzZWxmLnBvcnRfbmFtZV0KLQotICAgICAgICByZXR1cm4gbWFwKHNlbGYuX3dl
YmtpdF9iYXNlbGluZV9wYXRoLCBmYWxsYmFja19uYW1lcykKLQogICAgIGRlZiBfc2V0X2Rldmlj
ZV9jbGFzcyhzZWxmLCBkZXZpY2VfY2xhc3MpOgogICAgICAgICBzZWxmLl9kZXZpY2VfY2xhc3Mg
PSBkZXZpY2VfY2xhc3MgaWYgZGV2aWNlX2NsYXNzIGVsc2Ugc2VsZi5ERUZBVUxUX0RFVklDRV9D
TEFTUwogCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>305023</attachid>
            <date>2017-03-21 13:42:32 -0700</date>
            <delta_ts>2017-03-27 14:08:06 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-169413-20170321134231.patch</filename>
            <type>text/plain</type>
            <size>4619</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDIxNDIyNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDIyIEBACisyMDE3LTAzLTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICB3ZWJraXRweTogTG9vayBmb3IgJ2lvcycgdGVzdCBleHBlY3RhdGlvbnMg
Zm9yIElPU1BvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNjk0MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBUZXN0IGV4cGVjdGF0aW9ucyBmb3IgaU9TIHRlc3RzIHNob3VsZCBpbmNsdWRlIHRoZSAn
aW9zJyBmb2xkZXIuICBNb2RpZnkKKyAgICAgICAgZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0
aCB0byBpbmNsdWRlICdpb3MnIGZvbGRlciBhbmQgZGVyaXZhdGl2ZXMgZm9yCisgICAgICAgIElP
U1BvcnQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zLnB5OgorICAgICAg
ICAoSU9TUG9ydC5fZ2VuZXJhdGVfYWxsX3Rlc3RfY29uZmlndXJhdGlvbnMpOiBNb3ZlZCBmcm9t
IElPU1NpbXVsYXRvclBvcnQuCisgICAgICAgIChJT1NQb3J0LmRlZmF1bHRfYmFzZWxpbmVfc2Vh
cmNoX3BhdGgpOiBBZGQgaW9zIGV4cGVjdGF0aW9ucyBhbG9uZyB3aXRoIHBvcnQgc3BlY2lmaWMg
ZXhwZWN0YXRpb25zLgorICAgICAgICAoSU9TUG9ydC50ZXN0X2V4cGVjdGF0aW9uc19maWxlX3Bv
c2l0aW9uKTogQWRkZWQgZm9yIHRlc3RpbmcuCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9w
b3J0L2lvc19zaW11bGF0b3IucHk6CisgICAgICAgIChJT1NTaW11bGF0b3JQb3J0Ll9nZW5lcmF0
ZV9hbGxfdGVzdF9jb25maWd1cmF0aW9ucyk6IE1vdmVkIHRvIElPU1BvcnQuCisgICAgICAgIChJ
T1NTaW11bGF0b3JQb3J0LmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgpOiBNb3ZlZCB0byBJ
T1NQb3J0LgorCiAyMDE3LTAzLTIwICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUu
Y29tPgogCiAgICAgICAgIEFkZCBhIHN5c3RlbSB0cmFjZSBwb2ludCBmb3IgbWVtb3J5IHdhcm5p
bmcgaGFuZGxpbmcKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHkKPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQkocmV2aXNpb24g
MjE0MjI2KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvcy5weQkod29ya2luZyBj
b3B5KQpAQCAtMjMsNiArMjMsNyBAQAogaW1wb3J0IGxvZ2dpbmcKIAogZnJvbSB3ZWJraXRweS5j
b21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCitmcm9tIHdlYmtpdHB5LmxheW91dF90ZXN0
cy5tb2RlbHMudGVzdF9jb25maWd1cmF0aW9uIGltcG9ydCBUZXN0Q29uZmlndXJhdGlvbgogZnJv
bSB3ZWJraXRweS5wb3J0LmRhcndpbiBpbXBvcnQgRGFyd2luUG9ydAogZnJvbSB3ZWJraXRweS5w
b3J0LnNpbXVsYXRvcl9wcm9jZXNzIGltcG9ydCBTaW11bGF0b3JQcm9jZXNzCiAKQEAgLTU1LDYg
KzU2LDEzIEBAIGNsYXNzIElPU1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgICAgICByZXR1cm4g
J1dlYktpdFRlc3RSdW5uZXJBcHAuYXBwJwogICAgICAgICByZXR1cm4gJ0R1bXBSZW5kZXJUcmVl
LmFwcCcKIAorICAgIGRlZiBfZ2VuZXJhdGVfYWxsX3Rlc3RfY29uZmlndXJhdGlvbnMoc2VsZik6
CisgICAgICAgIGNvbmZpZ3VyYXRpb25zID0gW10KKyAgICAgICAgZm9yIGJ1aWxkX3R5cGUgaW4g
c2VsZi5BTExfQlVJTERfVFlQRVM6CisgICAgICAgICAgICBmb3IgYXJjaGl0ZWN0dXJlIGluIHNl
bGYuQVJDSElURUNUVVJFUzoKKyAgICAgICAgICAgICAgICBjb25maWd1cmF0aW9ucy5hcHBlbmQo
VGVzdENvbmZpZ3VyYXRpb24odmVyc2lvbj1zZWxmLl92ZXJzaW9uLCBhcmNoaXRlY3R1cmU9YXJj
aGl0ZWN0dXJlLCBidWlsZF90eXBlPWJ1aWxkX3R5cGUpKQorICAgICAgICByZXR1cm4gY29uZmln
dXJhdGlvbnMKKwogICAgIEBtZW1vaXplZAogICAgIGRlZiBjaGlsZF9wcm9jZXNzZXMoc2VsZik6
CiAgICAgICAgIHJldHVybiBpbnQoc2VsZi5nZXRfb3B0aW9uKCdjaGlsZF9wcm9jZXNzZXMnKSkK
QEAgLTc3LDYgKzg1LDI0IEBAIGNsYXNzIElPU1BvcnQoRGFyd2luUG9ydCk6CiAgICAgICAgICAg
ICByZXR1cm4gc2VsZi5fdGVzdGluZ19kZXZpY2UobnVtYmVyKQogICAgICAgICByZXR1cm4gc2Vs
Zi5fY3VycmVudF9kZXZpY2UKIAorICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJjaF9wYXRo
KHNlbGYpOgorICAgICAgICB3a19zdHJpbmcgPSAnd2sxJworICAgICAgICBpZiBzZWxmLmdldF9v
cHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgorICAgICAgICAgICAgd2tfc3RyaW5nID0gJ3dr
MicKKyAgICAgICAgZmFsbGJhY2tfbmFtZXMgPSBbCisgICAgICAgICAgICAne30te30nLmZvcm1h
dChzZWxmLnBvcnRfbmFtZSwgd2tfc3RyaW5nKSwKKyAgICAgICAgICAgIHNlbGYucG9ydF9uYW1l
LAorICAgICAgICAgICAgJ3t9LXt9Jy5mb3JtYXQoSU9TUG9ydC5wb3J0X25hbWUsIHdrX3N0cmlu
ZyksCisgICAgICAgICAgICBJT1NQb3J0LnBvcnRfbmFtZSwKKyAgICAgICAgXQorICAgICAgICBp
ZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1bm5lcicpOgorICAgICAgICAgICAgZmFs
bGJhY2tfbmFtZXMuYXBwZW5kKCd3azInKQorCisgICAgICAgIHJldHVybiBtYXAoc2VsZi5fd2Vi
a2l0X2Jhc2VsaW5lX3BhdGgsIGZhbGxiYWNrX25hbWVzKQorCisgICAgZGVmIHRlc3RfZXhwZWN0
YXRpb25zX2ZpbGVfcG9zaXRpb24oc2VsZik6CisgICAgICAgIHJldHVybiAzCisKICAgICBkZWYg
X2NyZWF0ZV9kZXZpY2VzKHNlbGYsIGRldmljZV9jbGFzcyk6CiAgICAgICAgIHJhaXNlIE5vdElt
cGxlbWVudGVkRXJyb3IKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lvc19z
aW11bGF0b3IucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L2lv
c19zaW11bGF0b3IucHkJKHJldmlzaW9uIDIxNDIyNikKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0
cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOCw3ICsyOCw2IEBA
IGltcG9ydCBzdWJwcm9jZXNzCiBpbXBvcnQgdGltZQogCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5t
ZW1vaXplZCBpbXBvcnQgbWVtb2l6ZWQKLWZyb20gd2Via2l0cHkubGF5b3V0X3Rlc3RzLm1vZGVs
cy50ZXN0X2NvbmZpZ3VyYXRpb24gaW1wb3J0IFRlc3RDb25maWd1cmF0aW9uCiBmcm9tIHdlYmtp
dHB5LnBvcnQgaW1wb3J0IGltYWdlX2RpZmYKIGZyb20gd2Via2l0cHkucG9ydC5pb3MgaW1wb3J0
IElPU1BvcnQKIGZyb20gd2Via2l0cHkueGNvZGUuc2ltdWxhdG9yIGltcG9ydCBTaW11bGF0b3Is
IFJ1bnRpbWUsIERldmljZVR5cGUKQEAgLTE3MCwyMSArMTY5LDYgQEAgY2xhc3MgSU9TU2ltdWxh
dG9yUG9ydChJT1NQb3J0KToKICAgICAgICAgc2RrID0gWyctLXNkaycsICdpcGhvbmVzaW11bGF0
b3InXQogICAgICAgICByZXR1cm4gYXJjaHMgKyBzZGsKIAotICAgIGRlZiBfZ2VuZXJhdGVfYWxs
X3Rlc3RfY29uZmlndXJhdGlvbnMoc2VsZik6Ci0gICAgICAgIGNvbmZpZ3VyYXRpb25zID0gW10K
LSAgICAgICAgZm9yIGJ1aWxkX3R5cGUgaW4gc2VsZi5BTExfQlVJTERfVFlQRVM6Ci0gICAgICAg
ICAgICBmb3IgYXJjaGl0ZWN0dXJlIGluIHNlbGYuQVJDSElURUNUVVJFUzoKLSAgICAgICAgICAg
ICAgICBjb25maWd1cmF0aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3VyYXRpb24odmVyc2lvbj1zZWxm
Ll92ZXJzaW9uLCBhcmNoaXRlY3R1cmU9YXJjaGl0ZWN0dXJlLCBidWlsZF90eXBlPWJ1aWxkX3R5
cGUpKQotICAgICAgICByZXR1cm4gY29uZmlndXJhdGlvbnMKLQotICAgIGRlZiBkZWZhdWx0X2Jh
c2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dl
YmtpdF90ZXN0X3J1bm5lcicpOgotICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMgPSBbc2VsZi5f
d2syX3BvcnRfbmFtZSgpXSArIFtzZWxmLnBvcnRfbmFtZV0gKyBbJ3drMiddCi0gICAgICAgIGVs
c2U6Ci0gICAgICAgICAgICBmYWxsYmFja19uYW1lcyA9IFtzZWxmLnBvcnRfbmFtZSArICctd2sx
J10gKyBbc2VsZi5wb3J0X25hbWVdCi0KLSAgICAgICAgcmV0dXJuIG1hcChzZWxmLl93ZWJraXRf
YmFzZWxpbmVfcGF0aCwgZmFsbGJhY2tfbmFtZXMpCi0KICAgICBkZWYgX3NldF9kZXZpY2VfY2xh
c3Moc2VsZiwgZGV2aWNlX2NsYXNzKToKICAgICAgICAgc2VsZi5fZGV2aWNlX2NsYXNzID0gZGV2
aWNlX2NsYXNzIGlmIGRldmljZV9jbGFzcyBlbHNlIHNlbGYuREVGQVVMVF9ERVZJQ0VfQ0xBU1MK
IAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>305506</attachid>
            <date>2017-03-27 14:08:08 -0700</date>
            <delta_ts>2017-03-27 14:49:13 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-169413-20170327140808.patch</filename>
            <type>text/plain</type>
            <size>4607</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDIxNDQyOCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDIyIEBACisyMDE3LTAzLTI3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICB3ZWJraXRweTogTG9vayBmb3IgJ2lvcycgdGVzdCBleHBlY3RhdGlvbnMg
Zm9yIElPU1BvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn
aT9pZD0xNjk0MTMKKworICAgICAgICBSZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292Lgor
CisgICAgICAgIFRlc3QgZXhwZWN0YXRpb25zIGZvciBpT1MgdGVzdHMgc2hvdWxkIGluY2x1ZGUg
dGhlICdpb3MnIGZvbGRlci4gIE1vZGlmeQorICAgICAgICBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJj
aF9wYXRoIHRvIGluY2x1ZGUgJ2lvcycgZm9sZGVyIGFuZCBkZXJpdmF0aXZlcyBmb3IKKyAgICAg
ICAgSU9TUG9ydC4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3MucHk6Cisg
ICAgICAgIChJT1NQb3J0Ll9nZW5lcmF0ZV9hbGxfdGVzdF9jb25maWd1cmF0aW9ucyk6IE1vdmVk
IGZyb20gSU9TU2ltdWxhdG9yUG9ydC4KKyAgICAgICAgKElPU1BvcnQuZGVmYXVsdF9iYXNlbGlu
ZV9zZWFyY2hfcGF0aCk6IEFkZCBpb3MgZXhwZWN0YXRpb25zIGFsb25nIHdpdGggcG9ydCBzcGVj
aWZpYyBleHBlY3RhdGlvbnMuCisgICAgICAgIChJT1NQb3J0LnRlc3RfZXhwZWN0YXRpb25zX2Zp
bGVfcG9zaXRpb24pOiBBZGRlZCBmb3IgdGVzdGluZy4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtp
dHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weToKKyAgICAgICAgKElPU1NpbXVsYXRvclBvcnQuX2dl
bmVyYXRlX2FsbF90ZXN0X2NvbmZpZ3VyYXRpb25zKTogTW92ZWQgdG8gSU9TUG9ydC4KKyAgICAg
ICAgKElPU1NpbXVsYXRvclBvcnQuZGVmYXVsdF9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IE1vdmVk
IHRvIElPU1BvcnQuCisKIDIwMTctMDMtMjcgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBw
bGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IEZhaWxpbmcgdG8gaXRlcmF0ZSBvdmVyIFNp
bXVsYXRvci5tYW5hZ2VkX2RldmljZXMgbWFwCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5
L3BvcnQvaW9zLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9p
b3MucHkJKHJldmlzaW9uIDIxNDQyOCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9p
b3MucHkJKHdvcmtpbmcgY29weSkKQEAgLTIzLDYgKzIzLDcgQEAKIGltcG9ydCBsb2dnaW5nCiAK
IGZyb20gd2Via2l0cHkuY29tbW9uLm1lbW9pemVkIGltcG9ydCBtZW1vaXplZAorZnJvbSB3ZWJr
aXRweS5sYXlvdXRfdGVzdHMubW9kZWxzLnRlc3RfY29uZmlndXJhdGlvbiBpbXBvcnQgVGVzdENv
bmZpZ3VyYXRpb24KIGZyb20gd2Via2l0cHkucG9ydC5kYXJ3aW4gaW1wb3J0IERhcndpblBvcnQK
IGZyb20gd2Via2l0cHkucG9ydC5zaW11bGF0b3JfcHJvY2VzcyBpbXBvcnQgU2ltdWxhdG9yUHJv
Y2VzcwogCkBAIC01NSw2ICs1NiwxMyBAQCBjbGFzcyBJT1NQb3J0KERhcndpblBvcnQpOgogICAg
ICAgICAgICAgcmV0dXJuICdXZWJLaXRUZXN0UnVubmVyQXBwLmFwcCcKICAgICAgICAgcmV0dXJu
ICdEdW1wUmVuZGVyVHJlZS5hcHAnCiAKKyAgICBkZWYgX2dlbmVyYXRlX2FsbF90ZXN0X2NvbmZp
Z3VyYXRpb25zKHNlbGYpOgorICAgICAgICBjb25maWd1cmF0aW9ucyA9IFtdCisgICAgICAgIGZv
ciBidWlsZF90eXBlIGluIHNlbGYuQUxMX0JVSUxEX1RZUEVTOgorICAgICAgICAgICAgZm9yIGFy
Y2hpdGVjdHVyZSBpbiBzZWxmLkFSQ0hJVEVDVFVSRVM6CisgICAgICAgICAgICAgICAgY29uZmln
dXJhdGlvbnMuYXBwZW5kKFRlc3RDb25maWd1cmF0aW9uKHZlcnNpb249c2VsZi5fdmVyc2lvbiwg
YXJjaGl0ZWN0dXJlPWFyY2hpdGVjdHVyZSwgYnVpbGRfdHlwZT1idWlsZF90eXBlKSkKKyAgICAg
ICAgcmV0dXJuIGNvbmZpZ3VyYXRpb25zCisKICAgICBAbWVtb2l6ZWQKICAgICBkZWYgY2hpbGRf
cHJvY2Vzc2VzKHNlbGYpOgogICAgICAgICByZXR1cm4gaW50KHNlbGYuZ2V0X29wdGlvbignY2hp
bGRfcHJvY2Vzc2VzJykpCkBAIC03Nyw2ICs4NSwyNCBAQCBjbGFzcyBJT1NQb3J0KERhcndpblBv
cnQpOgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuX3Rlc3RpbmdfZGV2aWNlKG51bWJlcikKICAg
ICAgICAgcmV0dXJuIHNlbGYuX2N1cnJlbnRfZGV2aWNlCiAKKyAgICBkZWYgZGVmYXVsdF9iYXNl
bGluZV9zZWFyY2hfcGF0aChzZWxmKToKKyAgICAgICAgd2tfc3RyaW5nID0gJ3drMScKKyAgICAg
ICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKKyAgICAgICAgICAg
IHdrX3N0cmluZyA9ICd3azInCisgICAgICAgIGZhbGxiYWNrX25hbWVzID0gWworICAgICAgICAg
ICAgJ3t9LXt9Jy5mb3JtYXQoc2VsZi5wb3J0X25hbWUsIHdrX3N0cmluZyksCisgICAgICAgICAg
ICBzZWxmLnBvcnRfbmFtZSwKKyAgICAgICAgICAgICd7fS17fScuZm9ybWF0KElPU1BvcnQucG9y
dF9uYW1lLCB3a19zdHJpbmcpLAorICAgICAgICAgICAgSU9TUG9ydC5wb3J0X25hbWUsCisgICAg
ICAgIF0KKyAgICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToK
KyAgICAgICAgICAgIGZhbGxiYWNrX25hbWVzLmFwcGVuZCgnd2syJykKKworICAgICAgICByZXR1
cm4gbWFwKHNlbGYuX3dlYmtpdF9iYXNlbGluZV9wYXRoLCBmYWxsYmFja19uYW1lcykKKworICAg
IGRlZiB0ZXN0X2V4cGVjdGF0aW9uc19maWxlX3Bvc2l0aW9uKHNlbGYpOgorICAgICAgICByZXR1
cm4gMworCiAgICAgZGVmIF9jcmVhdGVfZGV2aWNlcyhzZWxmLCBkZXZpY2VfY2xhc3MpOgogICAg
ICAgICByYWlzZSBOb3RJbXBsZW1lbnRlZEVycm9yCiAKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Vi
a2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv
d2Via2l0cHkvcG9ydC9pb3Nfc2ltdWxhdG9yLnB5CShyZXZpc2lvbiAyMTQ0MjgpCisrKyBUb29s
cy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX3NpbXVsYXRvci5weQkod29ya2luZyBjb3B5KQpA
QCAtMjgsNyArMjgsNiBAQCBpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHRpbWUKIAogZnJvbSB3
ZWJraXRweS5jb21tb24ubWVtb2l6ZWQgaW1wb3J0IG1lbW9pemVkCi1mcm9tIHdlYmtpdHB5Lmxh
eW91dF90ZXN0cy5tb2RlbHMudGVzdF9jb25maWd1cmF0aW9uIGltcG9ydCBUZXN0Q29uZmlndXJh
dGlvbgogZnJvbSB3ZWJraXRweS5wb3J0IGltcG9ydCBpbWFnZV9kaWZmCiBmcm9tIHdlYmtpdHB5
LnBvcnQuZGV2aWNlIGltcG9ydCBEZXZpY2UKIGZyb20gd2Via2l0cHkucG9ydC5pb3MgaW1wb3J0
IElPU1BvcnQKQEAgLTE3MiwyMSArMTcxLDYgQEAgY2xhc3MgSU9TU2ltdWxhdG9yUG9ydChJT1NQ
b3J0KToKICAgICAgICAgc2RrID0gWyctLXNkaycsICdpcGhvbmVzaW11bGF0b3InXQogICAgICAg
ICByZXR1cm4gYXJjaHMgKyBzZGsKIAotICAgIGRlZiBfZ2VuZXJhdGVfYWxsX3Rlc3RfY29uZmln
dXJhdGlvbnMoc2VsZik6Ci0gICAgICAgIGNvbmZpZ3VyYXRpb25zID0gW10KLSAgICAgICAgZm9y
IGJ1aWxkX3R5cGUgaW4gc2VsZi5BTExfQlVJTERfVFlQRVM6Ci0gICAgICAgICAgICBmb3IgYXJj
aGl0ZWN0dXJlIGluIHNlbGYuQVJDSElURUNUVVJFUzoKLSAgICAgICAgICAgICAgICBjb25maWd1
cmF0aW9ucy5hcHBlbmQoVGVzdENvbmZpZ3VyYXRpb24odmVyc2lvbj1zZWxmLl92ZXJzaW9uLCBh
cmNoaXRlY3R1cmU9YXJjaGl0ZWN0dXJlLCBidWlsZF90eXBlPWJ1aWxkX3R5cGUpKQotICAgICAg
ICByZXR1cm4gY29uZmlndXJhdGlvbnMKLQotICAgIGRlZiBkZWZhdWx0X2Jhc2VsaW5lX3NlYXJj
aF9wYXRoKHNlbGYpOgotICAgICAgICBpZiBzZWxmLmdldF9vcHRpb24oJ3dlYmtpdF90ZXN0X3J1
bm5lcicpOgotICAgICAgICAgICAgZmFsbGJhY2tfbmFtZXMgPSBbc2VsZi5fd2syX3BvcnRfbmFt
ZSgpXSArIFtzZWxmLnBvcnRfbmFtZV0gKyBbJ3drMiddCi0gICAgICAgIGVsc2U6Ci0gICAgICAg
ICAgICBmYWxsYmFja19uYW1lcyA9IFtzZWxmLnBvcnRfbmFtZSArICctd2sxJ10gKyBbc2VsZi5w
b3J0X25hbWVdCi0KLSAgICAgICAgcmV0dXJuIG1hcChzZWxmLl93ZWJraXRfYmFzZWxpbmVfcGF0
aCwgZmFsbGJhY2tfbmFtZXMpCi0KICAgICBkZWYgX3NldF9kZXZpY2VfY2xhc3Moc2VsZiwgZGV2
aWNlX2NsYXNzKToKICAgICAgICAgc2VsZi5fZGV2aWNlX2NsYXNzID0gZGV2aWNlX2NsYXNzIGlm
IGRldmljZV9jbGFzcyBlbHNlIHNlbGYuREVGQVVMVF9ERVZJQ0VfQ0xBU1MKIAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>