<?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>208954</bug_id>
          
          <creation_ts>2020-03-11 16:27:31 -0700</creation_ts>
          <short_desc>Make flatpack import for run-webkit-tests only happen on linux systems</short_desc>
          <delta_ts>2020-03-12 12:01:58 -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="Matt Lewis">jlewis3</reporter>
          <assigned_to name="Matt Lewis">jlewis3</assigned_to>
          <cc>clopez</cc>
    
    <cc>commit-queue</cc>
    
    <cc>jbedard</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>pnormand</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1628906</commentid>
    <comment_count>0</comment_count>
    <who name="Matt Lewis">jlewis3</who>
    <bug_when>2020-03-11 16:27:31 -0700</bug_when>
    <thetext>import Flatpack was added to run-webkit-test as a required import and means that we can&apos;t run the script without it on any other platforms, even when not needed.

We should be able to run the script and determine at call time if we need the import.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1628907</commentid>
    <comment_count>1</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2020-03-11 16:27:50 -0700</bug_when>
    <thetext>&lt;rdar://problem/60346729&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1628926</commentid>
    <comment_count>2</comment_count>
      <attachid>393308</attachid>
    <who name="Matt Lewis">jlewis3</who>
    <bug_when>2020-03-11 16:57:18 -0700</bug_when>
    <thetext>Created attachment 393308
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1628942</commentid>
    <comment_count>3</comment_count>
      <attachid>393308</attachid>
    <who name="Jonathan Bedard">jbedard</who>
    <bug_when>2020-03-11 17:17:00 -0700</bug_when>
    <thetext>Comment on attachment 393308
Patch

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

This looks correct to be, but I&apos;d like the folks more familiar with how we actually use flatpak.

Another alternative approach would be to conditionalize on if flatpak can be found in the provided directory.

&gt; Tools/Scripts/run-webkit-tests:16
&gt; +#     * Neither the Google name nor the names of its

No reason to make this change</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1629101</commentid>
    <comment_count>4</comment_count>
      <attachid>393308</attachid>
    <who name="Philippe Normand">pnormand</who>
    <bug_when>2020-03-12 02:16:53 -0700</bug_when>
    <thetext>Comment on attachment 393308
Patch

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

&gt; Tools/Scripts/run-webkit-tests:39
&gt; +if sys.platform.startswith(&apos;Linux&apos;):

lower-case linux</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1629228</commentid>
    <comment_count>5</comment_count>
      <attachid>393386</attachid>
    <who name="Matt Lewis">jlewis3</who>
    <bug_when>2020-03-12 10:03:43 -0700</bug_when>
    <thetext>Created attachment 393386
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1629290</commentid>
    <comment_count>6</comment_count>
      <attachid>393386</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-03-12 12:01:56 -0700</bug_when>
    <thetext>Comment on attachment 393386
Patch

Clearing flags on attachment: 393386

Committed r258347: &lt;https://trac.webkit.org/changeset/258347&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1629291</commentid>
    <comment_count>7</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2020-03-12 12:01:58 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>393308</attachid>
            <date>2020-03-11 16:57:18 -0700</date>
            <delta_ts>2020-03-12 10:03:42 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208954-20200311165718.patch</filename>
            <type>text/plain</type>
            <size>2316</size>
            <attacher name="Matt Lewis">jlewis3</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MjI1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDRhNTM4MzEyN2QwMDQ0MWZiNDU0YmQwMjE1OTdlZTA3
NWU5NWFkMy4uZmZiZjQ0ODgwN2YzM2FhYzYyNDY0NjgxNGNhNDFmZjBlN2YxNGY1NCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz
IEBACisyMDIwLTAzLTExICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg
ICAgTWFrZSBmbGF0cGFjayBpbXBvcnQgZm9yIHJ1bi13ZWJraXQtdGVzdHMgb25seSBoYXBwZW4g
b24gbGludXggc3lzdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjA4OTU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgKiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHM6IEFkZGVkIGFuIGlmIHN0YXRlbWVu
dCB0byBmaW5kIHRoZSBzeXN0ZW0gcGxhdGZvcm0KKyAgICAgICAgdG8gZGV0ZXJtaW5lIGlmIHdl
IG5lZWQgdGhlIGZsYXRwYWNrdXRpbHMgaW1wb3J0LiAKKwogMjAyMC0wMy0xMCAgRG9uIE9sbXN0
ZWFkICA8ZG9uLm9sbXN0ZWFkQHNvbnkuY29tPgogCiAgICAgICAgIFN5bmMgRmVhdHVyZUxpc3Qu
cG0gd2l0aCBDTWFrZSBkZWZpbml0aW9ucwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4t
d2Via2l0LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzCmluZGV4IGZkODdl
ODcwZGY2ZWRmZmI3YjczMTBlZDE1ZDE5MzUyMzg5ZTA0MWEuLjExZmI3NzczNWYzMGUyMDIyYWQ1
NDRkMzdjM2IyYzEzZjA3OGM1YzggMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLXdlYmtp
dC10ZXN0cworKysgYi9Ub29scy9TY3JpcHRzL3J1bi13ZWJraXQtdGVzdHMKQEAgLTEsNSArMSw3
IEBACiAjIS91c3IvYmluL2VudiBweXRob24KKwogIyBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xl
IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIElu
Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBz
b3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwg
YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUK
QEAgLTExLDcgKzEzLDcgQEAKICMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp
dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgogIyBpbiB0aGUgZG9jdW1lbnRhdGlv
biBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCiAjIGRpc3RyaWJ1dGlv
bi4KLSMgICAgICogTmVpdGhlciB0aGUgbmFtZSBvZiBHb29nbGUgSW5jLiBub3IgdGhlIG5hbWVz
IG9mIGl0cworIyAgICAgKiBOZWl0aGVyIHRoZSBHb29nbGUgbmFtZSBub3IgdGhlIG5hbWVzIG9m
IGl0cwogIyBjb250cmlidXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHBy
b2R1Y3RzIGRlcml2ZWQgZnJvbQogIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJp
b3Igd3JpdHRlbiBwZXJtaXNzaW9uLgogIwpAQCAtMzQsOCArMzYsOSBAQCBpbXBvcnQgc3lzCiBm
cm9tIHdlYmtpdHB5LmNvbW1vbiBpbXBvcnQgbXVsdGlwcm9jZXNzaW5nX2Jvb3RzdHJhcAogCiB0
b3BfbGV2ZWxfZGlyZWN0b3J5ID0gb3MucGF0aC5ub3JtcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0
aC5kaXJuYW1lKF9fZmlsZV9fKSwgJy4uJywgJy4uJykpCi1zeXMucGF0aC5pbnNlcnQoMCwgb3Mu
cGF0aC5qb2luKHRvcF9sZXZlbF9kaXJlY3RvcnksICdUb29scycsICdmbGF0cGFrJykpCi1pbXBv
cnQgZmxhdHBha3V0aWxzCi1mbGF0cGFrdXRpbHMucnVuX2luX3NhbmRib3hfaWZfYXZhaWxhYmxl
KHN5cy5hcmd2KQoraWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ0xpbnV4Jyk6CisgICAgc3lz
LnBhdGguaW5zZXJ0KDAsIG9zLnBhdGguam9pbih0b3BfbGV2ZWxfZGlyZWN0b3J5LCAnVG9vbHMn
LCAnZmxhdHBhaycpKQorICAgIGltcG9ydCBmbGF0cGFrdXRpbHMKKyAgICBmbGF0cGFrdXRpbHMu
cnVuX2luX3NhbmRib3hfaWZfYXZhaWxhYmxlKHN5cy5hcmd2KQogCiBtdWx0aXByb2Nlc3Npbmdf
Ym9vdHN0cmFwLnJ1bignd2Via2l0cHknLCAnbGF5b3V0X3Rlc3RzJywgJ3J1bl93ZWJraXRfdGVz
dHMucHknKQpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>393386</attachid>
            <date>2020-03-12 10:03:43 -0700</date>
            <delta_ts>2020-03-12 12:01:56 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-208954-20200312100343.patch</filename>
            <type>text/plain</type>
            <size>2003</size>
            <attacher name="Matt Lewis">jlewis3</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MzM1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg
Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMzY0ZDM0NDJjZGVmNmUxNTRmYzY0ZGExYjEyNzNhZjUw
YmI5MjYwYS4uMzdjNDY5MGYwZmQzNTFiNzI3MmUwY2UxOTVmMzUzYWIzZDk3MjAxNCAxMDA2NDQK
LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz
IEBACisyMDIwLTAzLTEyICBNYXR0IExld2lzICA8amxld2lzM0BhcHBsZS5jb20+CisKKyAgICAg
ICAgTWFrZSBmbGF0cGFjayBpbXBvcnQgZm9yIHJ1bi13ZWJraXQtdGVzdHMgb25seSBoYXBwZW4g
b24gbGludXggc3lzdGVtcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1
Zy5jZ2k/aWQ9MjA4OTU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK
KyAgICAgICAgKiBTY3JpcHRzL3J1bi13ZWJraXQtdGVzdHM6IEFkZGVkIGFuIGlmIHN0YXRlbWVu
dCB0byBmaW5kIHRoZSBzeXN0ZW0gcGxhdGZvcm0KKyAgICAgICAgdG8gZGV0ZXJtaW5lIGlmIHdl
IG5lZWQgdGhlIGZsYXRwYWNrdXRpbHMgaW1wb3J0LiAKKwogMjAyMC0wMy0xMiAgRGFuaWVsIEJh
dGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgRm9jdXNDb250cm9sbGVyOjpzZXRG
b2N1c2VkRWxlbWVudCgpIHNob3VsZCB0ZWxsIGNsaWVudCBvZiByZWZvY3VzZWQgZWxlbWVudApk
aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4td2Via2l0LXRlc3RzIGIvVG9vbHMvU2NyaXB0
cy9ydW4td2Via2l0LXRlc3RzCmluZGV4IGZkODdlODcwZGY2ZWRmZmI3YjczMTBlZDE1ZDE5MzUy
Mzg5ZTA0MWEuLjU5NmEyYzcxYjQ3MWZhMWU0MmViNjVlOTc1ODIwMTZlNGE4YmNkMjMgMTAwNzU1
Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLXdlYmtpdC10ZXN0cworKysgYi9Ub29scy9TY3JpcHRz
L3J1bi13ZWJraXQtdGVzdHMKQEAgLTEsNSArMSw3IEBACiAjIS91c3IvYmluL2VudiBweXRob24K
KwogIyBDb3B5cmlnaHQgKEMpIDIwMTEgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K
KyMgQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMK
ICMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0
aCBvciB3aXRob3V0CiAjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0
IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTM0LDggKzM2LDkgQEAgaW1wb3J0IHN5
cwogZnJvbSB3ZWJraXRweS5jb21tb24gaW1wb3J0IG11bHRpcHJvY2Vzc2luZ19ib290c3RyYXAK
IAogdG9wX2xldmVsX2RpcmVjdG9yeSA9IG9zLnBhdGgubm9ybXBhdGgob3MucGF0aC5qb2luKG9z
LnBhdGguZGlybmFtZShfX2ZpbGVfXyksICcuLicsICcuLicpKQotc3lzLnBhdGguaW5zZXJ0KDAs
IG9zLnBhdGguam9pbih0b3BfbGV2ZWxfZGlyZWN0b3J5LCAnVG9vbHMnLCAnZmxhdHBhaycpKQot
aW1wb3J0IGZsYXRwYWt1dGlscwotZmxhdHBha3V0aWxzLnJ1bl9pbl9zYW5kYm94X2lmX2F2YWls
YWJsZShzeXMuYXJndikKK2lmIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpOgorICAg
IHN5cy5wYXRoLmluc2VydCgwLCBvcy5wYXRoLmpvaW4odG9wX2xldmVsX2RpcmVjdG9yeSwgJ1Rv
b2xzJywgJ2ZsYXRwYWsnKSkKKyAgICBpbXBvcnQgZmxhdHBha3V0aWxzCisgICAgZmxhdHBha3V0
aWxzLnJ1bl9pbl9zYW5kYm94X2lmX2F2YWlsYWJsZShzeXMuYXJndikKIAotbXVsdGlwcm9jZXNz
aW5nX2Jvb3RzdHJhcC5ydW4oJ3dlYmtpdHB5JywgJ2xheW91dF90ZXN0cycsICdydW5fd2Via2l0
X3Rlc3RzLnB5JykKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBmaWxlCittdWx0aXByb2Nlc3Npbmdf
Ym9vdHN0cmFwLnJ1bignd2Via2l0cHknLCAnbGF5b3V0X3Rlc3RzJywgJ3J1bl93ZWJraXRfdGVz
dHMucHknKQo=
</data>

          </attachment>
      

    </bug>

</bugzilla>