<?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>213639</bug_id>
          
          <creation_ts>2020-06-25 21:28:42 -0700</creation_ts>
          <short_desc>[Big Sur] Handle baseline search path</short_desc>
          <delta_ts>2020-06-26 14:11:55 -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>Other</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="Ryan Haddad">ryanhaddad</reporter>
          <assigned_to name="Ryan Haddad">ryanhaddad</assigned_to>
          <cc>aakash_jain</cc>
    
    <cc>ap</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>glenn</cc>
    
    <cc>jbedard</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1666367</commentid>
    <comment_count>0</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2020-06-25 21:28:42 -0700</bug_when>
    <thetext>[Big Sur] Regression tests fail to run due to failed assert: self._os_version.major == 10</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666368</commentid>
    <comment_count>1</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2020-06-25 21:29:40 -0700</bug_when>
    <thetext>&lt;rdar://problem/64789480&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666374</commentid>
    <comment_count>2</comment_count>
      <attachid>402850</attachid>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2020-06-25 21:48:37 -0700</bug_when>
    <thetext>Created attachment 402850
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666385</commentid>
    <comment_count>3</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-25 22:20:37 -0700</bug_when>
    <thetext>Committed r263553: &lt;https://trac.webkit.org/changeset/263553&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402850.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666462</commentid>
    <comment_count>4</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-26 08:46:51 -0700</bug_when>
    <thetext>Reopening to attach new patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666463</commentid>
    <comment_count>5</comment_count>
      <attachid>402869</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-26 08:46:52 -0700</bug_when>
    <thetext>Created attachment 402869
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666464</commentid>
    <comment_count>6</comment_count>
      <attachid>402870</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-26 08:51:37 -0700</bug_when>
    <thetext>Created attachment 402870
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666469</commentid>
    <comment_count>7</comment_count>
      <attachid>402870</attachid>
    <who name="Aakash Jain">aakash_jain</who>
    <bug_when>2020-06-26 09:04:17 -0700</bug_when>
    <thetext>Comment on attachment 402870
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=402870&amp;action=review

rs=me

&gt; Tools/Scripts/webkitpy/port/mac.py:86
&gt; +                        temp_version = Version(11)

Should it be explicitly: Version(11, 0)

or better yet:
temp_version.major += 1
temp_version.minor = 0</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666470</commentid>
    <comment_count>8</comment_count>
      <attachid>402871</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-26 09:08:53 -0700</bug_when>
    <thetext>Created attachment 402871
Patch for landing</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666477</commentid>
    <comment_count>9</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2020-06-26 09:32:00 -0700</bug_when>
    <thetext>Committed r263561: &lt;https://trac.webkit.org/changeset/263561&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 402871.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1666604</commentid>
    <comment_count>10</comment_count>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-06-26 14:11:55 -0700</bug_when>
    <thetext>Committed r263583: &lt;https://trac.webkit.org/changeset/263583&gt;</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402850</attachid>
            <date>2020-06-25 21:48:37 -0700</date>
            <delta_ts>2020-06-26 08:46:49 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213639-20200625214836.patch</filename>
            <type>text/plain</type>
            <size>1317</size>
            <attacher name="Ryan Haddad">ryanhaddad</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTE3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmQxNjJiY2I1OTc3ZmIxNDAwYzZhY2VlZmJjODUyNjE1
YjYyYTQ2YS4uYzE5YTYwYmIyNDk4MDczM2Y3MTViZTQzZDlmNzc4Njg2YzBkOTlkOCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz
IEBACisyMDIwLTA2LTI1ICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgorCisg
ICAgICAgIFtCaWcgU3VyXSBSZWdyZXNzaW9uIHRlc3RzIGZhaWwgdG8gcnVuIGR1ZSB0byBmYWls
ZWQgYXNzZXJ0OiBzZWxmLl9vc192ZXJzaW9uLm1ham9yID09IDEwCisgICAgICAgIGh0dHBzOi8v
YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM2MzkKKworICAgICAgICBSZXZpZXdl
ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9t
YWMucHk6CisgICAgICAgIChNYWNQb3J0Ll9faW5pdF9fKTogUmVtb3ZlIHRoZSBhc3NlcnQgc2lu
Y2UgaXQgaXMgbm8gbG9uZ2VyIHZhbGlkLgorCiAyMDIwLTA2LTI1ICBBYWthc2ggSmFpbiAgPGFh
a2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdzXSBJbXByb3ZlIGhhbmRsaW5nIG9m
IGludmFsaWQgY2hhbmdlbG9nCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3Bv
cnQvbWFjLnB5IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQppbmRleCAzNGY5
NDQ1M2Q1YWYzMTg2NzYwZDAzMjVjMTQzNWRmZmQ1ZmQ2YTJkLi5iMGJiYzRlNGEwMmNlYzVmZTc5
MWNlYzEwY2QwYWE4ZjM5NDE1ZjY4IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5
L3BvcnQvbWFjLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKQEAg
LTY0LDcgKzY0LDYgQEAgY2xhc3MgTWFjUG9ydChEYXJ3aW5Qb3J0KToKICAgICAgICAgICAgIHNl
bGYuX29zX3ZlcnNpb24gPSBzZWxmLmhvc3QucGxhdGZvcm0ub3NfdmVyc2lvbgogICAgICAgICBp
ZiBub3Qgc2VsZi5fb3NfdmVyc2lvbjoKICAgICAgICAgICAgIHNlbGYuX29zX3ZlcnNpb24gPSBN
YWNQb3J0LkNVUlJFTlRfVkVSU0lPTgotICAgICAgICBhc3NlcnQgc2VsZi5fb3NfdmVyc2lvbi5t
YWpvciA9PSAxMAogCiAgICAgZGVmIF9idWlsZF9kcml2ZXJfZmxhZ3Moc2VsZik6CiAgICAgICAg
IHJldHVybiBbJ0FSQ0hTPWkzODYnXSBpZiBzZWxmLmFyY2hpdGVjdHVyZSgpID09ICd4ODYnIGVs
c2UgW10K
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402869</attachid>
            <date>2020-06-26 08:46:52 -0700</date>
            <delta_ts>2020-06-26 08:51:36 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213639-20200626084651.patch</filename>
            <type>text/plain</type>
            <size>3470</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2MzU1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE3IEBACisyMDIwLTA2LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbQmlnIFN1cl0gSGFuZGxlIGJhc2VsaW5lIHNlYXJjaCBwYXRoCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM2MzkKKyAgICAg
ICAgPHJkYXI6Ly9wcm9ibGVtLzY0Nzg5NDgwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weToKKyAg
ICAgICAgKE1hY1BvcnQpOgorICAgICAgICAoTWFjUG9ydC5kZWZhdWx0X2Jhc2VsaW5lX3NlYXJj
aF9wYXRoKTogQnJlYWsgaW5maW5pdGUgbG9vcCBmb3IgbWFqb3IgdmVyc2lvbiBidW1wLgorICAg
ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHk6CisgICAgICAgIChN
YWNUZXN0LnRlc3RfYmlnX3N1cl9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IFRlc3QgQmlnIFN1ciBi
YXNlbGluZSBzZWFyY2ggcGF0aC4KKwogMjAyMC0wNi0yNiAgQ2FybG9zIEFsYmVydG8gTG9wZXog
UGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBnZW5lcmF0ZS1qc2MtYnVuZGxl
IHNob3VsZCBmYWlsIGlmIHBhc3NlZCBhbiBpbnZhbGlkIHJlbW90ZS1jb25maWctZmlsZSBwYXJh
bWV0ZXIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkocmV2aXNpb24gMjYzNTU5
KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkod29ya2luZyBjb3B5KQpA
QCAtNDYsNiArNDYsNyBAQCBjbGFzcyBNYWNQb3J0KERhcndpblBvcnQpOgogICAgIHBvcnRfbmFt
ZSA9ICJtYWMiCiAKICAgICBDVVJSRU5UX1ZFUlNJT04gPSBWZXJzaW9uKDEwLCAxNSkKKyAgICBM
QVNUX01BQ09TWCA9IFZlcnNpb24oMTAsIDE2KSAgIyBGSVhNRTogVGhlcmUgYXJlIHN0aWxsIG1h
Y09TIDEwLjE2IGJ1aWxkcyBpbiB1c2UsIGRlcHJlY2F0ZSBpbiBmYXZvciBvZiBDYXRhbGluYQog
CiAgICAgU0RLID0gJ21hY29zeCcKIApAQCAtNzksOSArODAsMTUgQEAgY2xhc3MgTWFjUG9ydChE
YXJ3aW5Qb3J0KToKICAgICAgICAgICAgIHdoaWxlIHRlbXBfdmVyc2lvbiAhPSBzZWxmLkNVUlJF
TlRfVkVSU0lPTjoKICAgICAgICAgICAgICAgICB2ZXJzaW9uc190b19mYWxsYmFjay5hcHBlbmQo
VmVyc2lvbi5mcm9tX2l0ZXJhYmxlKHRlbXBfdmVyc2lvbikpCiAgICAgICAgICAgICAgICAgaWYg
dGVtcF92ZXJzaW9uIDwgc2VsZi5DVVJSRU5UX1ZFUlNJT046Ci0gICAgICAgICAgICAgICAgICAg
IHRlbXBfdmVyc2lvbi5taW5vciArPSAxCisgICAgICAgICAgICAgICAgICAgIGlmIHRlbXBfdmVy
c2lvbi5tYWpvciA8IHNlbGYuTEFTVF9NQUNPU1gubWlub3I6CisgICAgICAgICAgICAgICAgICAg
ICAgICB0ZW1wX3ZlcnNpb24ubWlub3IgKz0gMQorICAgICAgICAgICAgICAgICAgICBlbHNlOgor
ICAgICAgICAgICAgICAgICAgICAgICAgdGVtcF92ZXJzaW9uID0gVmVyc2lvbigxMSkKICAgICAg
ICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICB0ZW1wX3ZlcnNpb24ubWlub3Ig
LT0gMQorICAgICAgICAgICAgICAgICAgICBpZiB0ZW1wX3ZlcnNpb24ubWlub3IgPiAwOgorICAg
ICAgICAgICAgICAgICAgICAgICAgdGVtcF92ZXJzaW9uLm1pbm9yIC09IDEKKyAgICAgICAgICAg
ICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgICAgIHRlbXBfdmVyc2lvbi5tYWpv
ciA9IHNlbGYuTEFTVF9NQUNPU1gubWlub3IKICAgICAgICAgd2tfc3RyaW5nID0gJ3drMScKICAg
ICAgICAgaWYgc2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKICAgICAgICAg
ICAgIHdrX3N0cmluZyA9ICd3azInCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQv
bWFjX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y
dC9tYWNfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI2MzU1OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Vi
a2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw2ICsxNjAs
MTMgQEAgY2xhc3MgTWFjVGVzdChkYXJ3aW5fdGVzdGNhc2UuRGFyd2luVGVzdAogICAgICAgICBz
ZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzRdLCAnL2FkZGl0aW9uYWxfdGVzdGluZ19wYXRo
L21hYy1hZGQtbW91bnRhaW5saW9uLXdrMScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2Vh
cmNoX3BhdGhbNV0sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbW91
bnRhaW5saW9uLXdrMScpCiAKKyAgICBkZWYgdGVzdF9iaWdfc3VyX2Jhc2VsaW5lX3NlYXJjaF9w
YXRoKHNlbGYpOgorICAgICAgICBzZWFyY2hfcGF0aCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFt
ZT0nbWFjb3MtYmlnLXN1cicpLmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQorICAgICAg
ICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzBdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0
VGVzdHMvcGxhdGZvcm0vbWFjLWNhdGFsaW5hLXdrMScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1
YWwoc2VhcmNoX3BhdGhbMV0sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t
YWMtY2F0YWxpbmEnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzJdLCAn
L21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMScpCisgICAgICAgIHNl
bGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3BhdGhbM10sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0
cy9wbGF0Zm9ybS9tYWMnKQorCiAgICAgZGVmIHRlc3RfZmFjdG9yeV93aXRoX2Z1dHVyZV92ZXJz
aW9uKHNlbGYpOgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQob3B0aW9ucz1Nb2NrT3B0
aW9ucyh3ZWJraXRfdGVzdF9ydW5uZXI9VHJ1ZSksIG9zX3ZlcnNpb249TWFjVGVzdC5GVVRVUkVf
VkVSU0lPTiwgb3NfbmFtZT0nbWFjJywgcG9ydF9uYW1lPSdtYWMnKQogICAgICAgICBzZWxmLmFz
c2VydEVxdWFsKHBvcnQuZHJpdmVyX25hbWUoKSwgJ1dlYktpdFRlc3RSdW5uZXInKQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402870</attachid>
            <date>2020-06-26 08:51:37 -0700</date>
            <delta_ts>2020-06-26 09:08:50 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-213639-20200626085136.patch</filename>
            <type>text/plain</type>
            <size>3458</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2MzU1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE3IEBACisyMDIwLTA2LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbQmlnIFN1cl0gSGFuZGxlIGJhc2VsaW5lIHNlYXJjaCBwYXRoCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM2MzkKKyAgICAg
ICAgPHJkYXI6Ly9wcm9ibGVtLzY0Nzg5NDgwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E
WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weToKKyAg
ICAgICAgKE1hY1BvcnQpOgorICAgICAgICAoTWFjUG9ydC5kZWZhdWx0X2Jhc2VsaW5lX3NlYXJj
aF9wYXRoKTogQnJlYWsgaW5maW5pdGUgbG9vcCBmb3IgbWFqb3IgdmVyc2lvbiBidW1wLgorICAg
ICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHk6CisgICAgICAgIChN
YWNUZXN0LnRlc3RfYmlnX3N1cl9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IFRlc3QgQmlnIFN1ciBi
YXNlbGluZSBzZWFyY2ggcGF0aC4KKwogMjAyMC0wNi0yNiAgQ2FybG9zIEFsYmVydG8gTG9wZXog
UGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBnZW5lcmF0ZS1qc2MtYnVuZGxl
IHNob3VsZCBmYWlsIGlmIHBhc3NlZCBhbiBpbnZhbGlkIHJlbW90ZS1jb25maWctZmlsZSBwYXJh
bWV0ZXIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkocmV2aXNpb24gMjYzNTU5
KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkod29ya2luZyBjb3B5KQpA
QCAtNDYsNiArNDYsNyBAQCBjbGFzcyBNYWNQb3J0KERhcndpblBvcnQpOgogICAgIHBvcnRfbmFt
ZSA9ICJtYWMiCiAKICAgICBDVVJSRU5UX1ZFUlNJT04gPSBWZXJzaW9uKDEwLCAxNSkKKyAgICBM
QVNUX01BQ09TWCA9IFZlcnNpb24oMTAsIDE2KSAgIyBGSVhNRTogVGhlcmUgYXJlIHN0aWxsIG1h
Y09TIDEwLjE2IGJ1aWxkcyBpbiB1c2UsIGRlcHJlY2F0ZSBpbiBmYXZvciBvZiBDYXRhbGluYQog
CiAgICAgU0RLID0gJ21hY29zeCcKIApAQCAtNzksOSArODAsMTUgQEAgY2xhc3MgTWFjUG9ydChE
YXJ3aW5Qb3J0KToKICAgICAgICAgICAgIHdoaWxlIHRlbXBfdmVyc2lvbiAhPSBzZWxmLkNVUlJF
TlRfVkVSU0lPTjoKICAgICAgICAgICAgICAgICB2ZXJzaW9uc190b19mYWxsYmFjay5hcHBlbmQo
VmVyc2lvbi5mcm9tX2l0ZXJhYmxlKHRlbXBfdmVyc2lvbikpCiAgICAgICAgICAgICAgICAgaWYg
dGVtcF92ZXJzaW9uIDwgc2VsZi5DVVJSRU5UX1ZFUlNJT046Ci0gICAgICAgICAgICAgICAgICAg
IHRlbXBfdmVyc2lvbi5taW5vciArPSAxCisgICAgICAgICAgICAgICAgICAgIGlmIHRlbXBfdmVy
c2lvbi5taW5vciA8IHNlbGYuTEFTVF9NQUNPU1gubWlub3I6CisgICAgICAgICAgICAgICAgICAg
ICAgICB0ZW1wX3ZlcnNpb24ubWlub3IgKz0gMQorICAgICAgICAgICAgICAgICAgICBlbHNlOgor
ICAgICAgICAgICAgICAgICAgICAgICAgdGVtcF92ZXJzaW9uID0gVmVyc2lvbigxMSkKICAgICAg
ICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICB0ZW1wX3ZlcnNpb24ubWlub3Ig
LT0gMQorICAgICAgICAgICAgICAgICAgICBpZiB0ZW1wX3ZlcnNpb24ubWlub3IgPiAwOgorICAg
ICAgICAgICAgICAgICAgICAgICAgdGVtcF92ZXJzaW9uLm1pbm9yIC09IDEKKyAgICAgICAgICAg
ICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgICAgIHRlbXBfdmVyc2lvbiA9IHNl
bGYuTEFTVF9NQUNPU1gKICAgICAgICAgd2tfc3RyaW5nID0gJ3drMScKICAgICAgICAgaWYgc2Vs
Zi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKICAgICAgICAgICAgIHdrX3N0cmlu
ZyA9ICd3azInCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0ZXN0
LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRl
c3QucHkJKHJldmlzaW9uIDI2MzU1OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9t
YWNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw2ICsxNjAsMTMgQEAgY2xhc3Mg
TWFjVGVzdChkYXJ3aW5fdGVzdGNhc2UuRGFyd2luVGVzdAogICAgICAgICBzZWxmLmFzc2VydEVx
dWFsKHNlYXJjaF9wYXRoWzRdLCAnL2FkZGl0aW9uYWxfdGVzdGluZ19wYXRoL21hYy1hZGQtbW91
bnRhaW5saW9uLXdrMScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3BhdGhbNV0s
ICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbW91bnRhaW5saW9uLXdr
MScpCiAKKyAgICBkZWYgdGVzdF9iaWdfc3VyX2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYpOgor
ICAgICAgICBzZWFyY2hfcGF0aCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT0nbWFjb3MtYmln
LXN1cicpLmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQorICAgICAgICBzZWxmLmFzc2Vy
dEVxdWFsKHNlYXJjaF9wYXRoWzBdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZv
cm0vbWFjLWNhdGFsaW5hLXdrMScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3Bh
dGhbMV0sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtY2F0YWxpbmEn
KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzJdLCAnL21vY2stY2hlY2tv
dXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1
YWwoc2VhcmNoX3BhdGhbM10sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9t
YWMnKQorCiAgICAgZGVmIHRlc3RfZmFjdG9yeV93aXRoX2Z1dHVyZV92ZXJzaW9uKHNlbGYpOgog
ICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQob3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJraXRf
dGVzdF9ydW5uZXI9VHJ1ZSksIG9zX3ZlcnNpb249TWFjVGVzdC5GVVRVUkVfVkVSU0lPTiwgb3Nf
bmFtZT0nbWFjJywgcG9ydF9uYW1lPSdtYWMnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBv
cnQuZHJpdmVyX25hbWUoKSwgJ1dlYktpdFRlc3RSdW5uZXInKQo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>402871</attachid>
            <date>2020-06-26 09:08:53 -0700</date>
            <delta_ts>2020-06-26 09:32:00 -0700</delta_ts>
            <desc>Patch for landing</desc>
            <filename>bug-213639-20200626090852.patch</filename>
            <type>text/plain</type>
            <size>3461</size>
            <attacher name="Jonathan Bedard">jbedard</attacher>
            
              <data encoding="base64">SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl
dmlzaW9uIDI2MzU1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDE3IEBACisyMDIwLTA2LTI2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv
bT4KKworICAgICAgICBbQmlnIFN1cl0gSGFuZGxlIGJhc2VsaW5lIHNlYXJjaCBwYXRoCisgICAg
ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM2MzkKKyAgICAg
ICAgPHJkYXI6Ly9wcm9ibGVtLzY0Nzg5NDgwPgorCisgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5
IEFha2FzaCBKYWluLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weToK
KyAgICAgICAgKE1hY1BvcnQpOgorICAgICAgICAoTWFjUG9ydC5kZWZhdWx0X2Jhc2VsaW5lX3Nl
YXJjaF9wYXRoKTogQnJlYWsgaW5maW5pdGUgbG9vcCBmb3IgbWFqb3IgdmVyc2lvbiBidW1wLgor
ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5pdHRlc3QucHk6CisgICAgICAg
IChNYWNUZXN0LnRlc3RfYmlnX3N1cl9iYXNlbGluZV9zZWFyY2hfcGF0aCk6IFRlc3QgQmlnIFN1
ciBiYXNlbGluZSBzZWFyY2ggcGF0aC4KKwogMjAyMC0wNi0yNiAgQ2FybG9zIEFsYmVydG8gTG9w
ZXogUGVyZXogIDxjbG9wZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBnZW5lcmF0ZS1qc2MtYnVu
ZGxlIHNob3VsZCBmYWlsIGlmIHBhc3NlZCBhbiBpbnZhbGlkIHJlbW90ZS1jb25maWctZmlsZSBw
YXJhbWV0ZXIKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWMucHkKPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkocmV2aXNpb24gMjYz
NTU5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9wb3J0L21hYy5weQkod29ya2luZyBjb3B5
KQpAQCAtNDYsNiArNDYsNyBAQCBjbGFzcyBNYWNQb3J0KERhcndpblBvcnQpOgogICAgIHBvcnRf
bmFtZSA9ICJtYWMiCiAKICAgICBDVVJSRU5UX1ZFUlNJT04gPSBWZXJzaW9uKDEwLCAxNSkKKyAg
ICBMQVNUX01BQ09TWCA9IFZlcnNpb24oMTAsIDE2KSAgIyBGSVhNRTogT25jZSB3ZSBkb24ndCBu
ZWVkIHRvIHN1cHBvcnQgdGhlIHNlZWQsIGRlcHJlY2F0ZSBpbiBmYXZvciBvZiBDYXRhbGluYQog
CiAgICAgU0RLID0gJ21hY29zeCcKIApAQCAtNzksOSArODAsMTUgQEAgY2xhc3MgTWFjUG9ydChE
YXJ3aW5Qb3J0KToKICAgICAgICAgICAgIHdoaWxlIHRlbXBfdmVyc2lvbiAhPSBzZWxmLkNVUlJF
TlRfVkVSU0lPTjoKICAgICAgICAgICAgICAgICB2ZXJzaW9uc190b19mYWxsYmFjay5hcHBlbmQo
VmVyc2lvbi5mcm9tX2l0ZXJhYmxlKHRlbXBfdmVyc2lvbikpCiAgICAgICAgICAgICAgICAgaWYg
dGVtcF92ZXJzaW9uIDwgc2VsZi5DVVJSRU5UX1ZFUlNJT046Ci0gICAgICAgICAgICAgICAgICAg
IHRlbXBfdmVyc2lvbi5taW5vciArPSAxCisgICAgICAgICAgICAgICAgICAgIGlmIHRlbXBfdmVy
c2lvbi5taW5vciA8IHNlbGYuTEFTVF9NQUNPU1gubWlub3I6CisgICAgICAgICAgICAgICAgICAg
ICAgICB0ZW1wX3ZlcnNpb24ubWlub3IgKz0gMQorICAgICAgICAgICAgICAgICAgICBlbHNlOgor
ICAgICAgICAgICAgICAgICAgICAgICAgdGVtcF92ZXJzaW9uID0gVmVyc2lvbigxMSwgMCkKICAg
ICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICB0ZW1wX3ZlcnNpb24ubWlu
b3IgLT0gMQorICAgICAgICAgICAgICAgICAgICBpZiB0ZW1wX3ZlcnNpb24ubWlub3IgPiAwOgor
ICAgICAgICAgICAgICAgICAgICAgICAgdGVtcF92ZXJzaW9uLm1pbm9yIC09IDEKKyAgICAgICAg
ICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAgICAgICAgICAgICAgIHRlbXBfdmVyc2lvbiA9
IHNlbGYuTEFTVF9NQUNPU1gKICAgICAgICAgd2tfc3RyaW5nID0gJ3drMScKICAgICAgICAgaWYg
c2VsZi5nZXRfb3B0aW9uKCd3ZWJraXRfdGVzdF9ydW5uZXInKToKICAgICAgICAgICAgIHdrX3N0
cmluZyA9ICd3azInCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvbWFjX3VuaXR0
ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9tYWNfdW5p
dHRlc3QucHkJKHJldmlzaW9uIDI2MzU1OSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9y
dC9tYWNfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2MCw2ICsxNjAsMTMgQEAgY2xh
c3MgTWFjVGVzdChkYXJ3aW5fdGVzdGNhc2UuRGFyd2luVGVzdAogICAgICAgICBzZWxmLmFzc2Vy
dEVxdWFsKHNlYXJjaF9wYXRoWzRdLCAnL2FkZGl0aW9uYWxfdGVzdGluZ19wYXRoL21hYy1hZGQt
bW91bnRhaW5saW9uLXdrMScpCiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNoX3BhdGhb
NV0sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtbW91bnRhaW5saW9u
LXdrMScpCiAKKyAgICBkZWYgdGVzdF9iaWdfc3VyX2Jhc2VsaW5lX3NlYXJjaF9wYXRoKHNlbGYp
OgorICAgICAgICBzZWFyY2hfcGF0aCA9IHNlbGYubWFrZV9wb3J0KHBvcnRfbmFtZT0nbWFjb3Mt
YmlnLXN1cicpLmRlZmF1bHRfYmFzZWxpbmVfc2VhcmNoX3BhdGgoKQorICAgICAgICBzZWxmLmFz
c2VydEVxdWFsKHNlYXJjaF9wYXRoWzBdLCAnL21vY2stY2hlY2tvdXQvTGF5b3V0VGVzdHMvcGxh
dGZvcm0vbWFjLWNhdGFsaW5hLXdrMScpCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VhcmNo
X3BhdGhbMV0sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtY2F0YWxp
bmEnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlYXJjaF9wYXRoWzJdLCAnL21vY2stY2hl
Y2tvdXQvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMScpCisgICAgICAgIHNlbGYuYXNzZXJ0
RXF1YWwoc2VhcmNoX3BhdGhbM10sICcvbW9jay1jaGVja291dC9MYXlvdXRUZXN0cy9wbGF0Zm9y
bS9tYWMnKQorCiAgICAgZGVmIHRlc3RfZmFjdG9yeV93aXRoX2Z1dHVyZV92ZXJzaW9uKHNlbGYp
OgogICAgICAgICBwb3J0ID0gc2VsZi5tYWtlX3BvcnQob3B0aW9ucz1Nb2NrT3B0aW9ucyh3ZWJr
aXRfdGVzdF9ydW5uZXI9VHJ1ZSksIG9zX3ZlcnNpb249TWFjVGVzdC5GVVRVUkVfVkVSU0lPTiwg
b3NfbmFtZT0nbWFjJywgcG9ydF9uYW1lPSdtYWMnKQogICAgICAgICBzZWxmLmFzc2VydEVxdWFs
KHBvcnQuZHJpdmVyX25hbWUoKSwgJ1dlYktpdFRlc3RSdW5uZXInKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>