Bug 208954 - Make flatpack import for run-webkit-tests only happen on linux systems
Summary: Make flatpack import for run-webkit-tests only happen on linux systems
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Matt Lewis
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2020-03-11 16:27 PDT by Matt Lewis
Modified: 2020-03-12 12:01 PDT (History)
6 users (show)

See Also:


Attachments
Patch (2.26 KB, patch)
2020-03-11 16:57 PDT, Matt Lewis
no flags Details | Formatted Diff | Diff
Patch (1.96 KB, patch)
2020-03-12 10:03 PDT, Matt Lewis
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Matt Lewis 2020-03-11 16:27:31 PDT
import Flatpack was added to run-webkit-test as a required import and means that we can'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.
Comment 1 Radar WebKit Bug Importer 2020-03-11 16:27:50 PDT
<rdar://problem/60346729>
Comment 2 Matt Lewis 2020-03-11 16:57:18 PDT
Created attachment 393308 [details]
Patch
Comment 3 Jonathan Bedard 2020-03-11 17:17:00 PDT
Comment on attachment 393308 [details]
Patch

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

This looks correct to be, but I'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.

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

No reason to make this change
Comment 4 Philippe Normand 2020-03-12 02:16:53 PDT
Comment on attachment 393308 [details]
Patch

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

> Tools/Scripts/run-webkit-tests:39
> +if sys.platform.startswith('Linux'):

lower-case linux
Comment 5 Matt Lewis 2020-03-12 10:03:43 PDT
Created attachment 393386 [details]
Patch
Comment 6 WebKit Commit Bot 2020-03-12 12:01:56 PDT
Comment on attachment 393386 [details]
Patch

Clearing flags on attachment: 393386

Committed r258347: <https://trac.webkit.org/changeset/258347>
Comment 7 WebKit Commit Bot 2020-03-12 12:01:58 PDT
All reviewed patches have been landed.  Closing bug.