[run-webkit-tests] Support user specifying variant directly #5149
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JonWBedard
added
Other
Tools / Tests
|
EWS run on previous version of this PR (hash ff2ff7e) |
JonWBedard
requested review from
gsnedders,
sundiamonde,
aj062,
dewei-zhu and
emw-apple
emw-apple
approved these changes
Oct 7, 2022
Comment on lines
94
to
92
| paths_to_walk = itertools.chain(*(sort_by_directory_key(_filter_test_variant(path, filesystem.glob)) for path in paths)) | ||
| all_files = itertools.chain(*(sort_by_directory_key( | ||
| _filter_test_variant(path, lambda p: filesystem.files_under(p, skipped_directories, file_filter)) | ||
| ) for path in paths_to_walk)) |
There was a problem hiding this comment.
Suggested refactor:
def sorted_paths_generator(fs_selector):
for test_selector in paths_to_walk:
path, separator, variant = test_selector.partition('?')
matching_tests = (matching_path + separator + variant for matching_path in fs_selector(path))
if directory_sort_key:
yield from sorted(matching_tests, key=directory_sort_key)
else:
yield from matching_tests
paths_to_walk = sorted_paths_generator(filesystem.glob)
all_files = sorted_paths_generator(lambda p: filesystem.files_under(p, skipped_directories, file_filter))This would replace _filter_test_variant and the local sort_by_directory_key function altogether. Using str.partition instead of str.split removes a bunch of the conditional logic.
Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_legacy.py
Outdated
Show resolved
Hide resolved
Comment on lines
172
to
169
| if not passed_variant or variant.startswith(passed_variant): | ||
| expanded.append(f + variant) |
There was a problem hiding this comment.
with the above suggestion:
Suggested change
| if not passed_variant or variant.startswith(passed_variant): | |
| expanded.append(f + variant) | |
| if not passed_variant or variant.startswith(variant_separator + passed_variant): | |
| expanded.append(f + variant) |
Comment on lines
151
to
155
| split = f.split('?') | ||
| passed_variant = None | ||
| if len(split) == 2: | ||
| f = split[0] | ||
| passed_variant = '?{}'.format(split[1]) |
There was a problem hiding this comment.
nit:
Suggested change
| split = f.split('?') | |
| passed_variant = None | |
| if len(split) == 2: | |
| f = split[0] | |
| passed_variant = '?{}'.format(split[1]) | |
| f, variant_separator, passed_variant = f.partition('?') |
JonWBedard
force-pushed
the
eng/run-webkit-tests-Support-user-specifying-variant-directly
branch
from
ff2ff7e
to
eb0d3f4
Compare
|
EWS run on current version of this PR (hash eb0d3f4)
|
https://bugs.webkit.org/show_bug.cgi?id=246228 rdar://100907445 Reviewed by Elliott Williams. * Tools/Scripts/webkitpy/common/find_files.py: (_normalized_find): Consider variants of a single test file. (_normalized_find.sorted_paths_generator): * Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_legacy.py: (LayoutTestFinder._expand_variants): Handle specific variant as argument. * Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder_legacy_unittest.py: (LayoutTestFinderTests.test_find_glob_query): Canonical link: https://commits.webkit.org/255305@main
webkit-early-warning-system
force-pushed
the
eng/run-webkit-tests-Support-user-specifying-variant-directly
branch
from
eb0d3f4
to
f8b4d27
Compare
|
Committed 255305@main (f8b4d27): https://commits.webkit.org/255305@main Reviewed commits have been landed. Closing PR #5149 and removing active labels. |
webkit-commit-queue
removed
the
merge-queue
JonWBedard
deleted the
eng/run-webkit-tests-Support-user-specifying-variant-directly
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
f8b4d27
eb0d3f4
🛠 mac🛠 wpe🛠 🧪 win🛠 mac-debug🛠 gtk🛠 wincairo🧪 ios-wk2🧪 gtk-wk2🧪 api-ios🧪 api-mac🧪 api-gtk🛠 tv🧪 mac-wk1🧪 mac-wk2🧪 mac-AS-debug-wk2🧪 mac-wk2-stress