Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not convert testharness paths in import-w3c-tests #15547

Merged

Conversation

gsnedders
Copy link
Contributor

@gsnedders gsnedders commented Jul 4, 2023

1866a4e

Do not convert testharness paths in import-w3c-tests
https://bugs.webkit.org/show_bug.cgi?id=185876

Reviewed by Jonathan Bedard.

Since the csswg-tests repo was merged into WPT, there is only one test repository now in
imported/w3c/resources/TestRepositories, which does not specify the option to convert
testharness paths from relative paths to explicit paths. Additionally, wptserve has been
used for some time, so run-webkit-tests should have no problem with relative paths to
the testharness paths. Thus, there is no reason to continue converting testharness paths,
so this patch removes all code related to that conversion.

* Scripts/webkitpy/w3c/test_converter.py:
(convert_for_webkit):
(_W3CTestConverter.__init__):
(_W3CTestConverter.convert_attributes_if_needed):
* Scripts/webkitpy/w3c/test_converter_unittest.py:
(verify_test_harness_paths):
* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.find_importable_tests):
(TestImporter.import_tests):

Canonical link: https://commits.webkit.org/265842@main

cc990ee

Misc iOS, tvOS & watchOS macOS Linux Windows
βœ… πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe βœ… πŸ›  wincairo
βœ… πŸ§ͺ bindings βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ§ͺ wpe-wk2
βœ… πŸ§ͺ webkitperl βœ… πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac βœ… πŸ›  gtk
βœ… πŸ§ͺ webkitpy βœ… πŸ§ͺ ios-wk2-wpt βœ… πŸ§ͺ mac-wk1 βœ… πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk2 βœ… πŸ§ͺ api-gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  tv-sim
βœ… πŸ›  watch
βœ… πŸ›  πŸ§ͺ unsafe-merge βœ… πŸ›  watch-sim

@gsnedders gsnedders self-assigned this Jul 4, 2023
@gsnedders gsnedders added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Jul 4, 2023
@gsnedders
Copy link
Contributor Author

(note this is just @csnardi's patch from 2018, from the linked bug, rebased)

@youennf
Copy link
Contributor

youennf commented Jul 5, 2023

Conversion of links may still happen for LayoutTests/imported/blink.
I am not sure we keep those tests in sync anymore, so this might be ok to remove that support, can you check this though?

(note this is just @csnardi's patch from 2018, from the linked bug, rebased)

Can you acknowledge this in the commit message?

@gsnedders
Copy link
Contributor Author

Conversion of links may still happen for LayoutTests/imported/blink. I am not sure we keep those tests in sync anymore, so this might be ok to remove that support, can you check this though?

Did import-w3c-tests ever have anything to do with importing those? I didn't think it did?

(note this is just @csnardi's patch from 2018, from the linked bug, rebased)

Can you acknowledge this in the commit message?

Is the commit author not enough?

@gsnedders gsnedders added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jul 7, 2023
https://bugs.webkit.org/show_bug.cgi?id=185876

Reviewed by Jonathan Bedard.

Since the csswg-tests repo was merged into WPT, there is only one test repository now in
imported/w3c/resources/TestRepositories, which does not specify the option to convert
testharness paths from relative paths to explicit paths. Additionally, wptserve has been
used for some time, so run-webkit-tests should have no problem with relative paths to
the testharness paths. Thus, there is no reason to continue converting testharness paths,
so this patch removes all code related to that conversion.

* Scripts/webkitpy/w3c/test_converter.py:
(convert_for_webkit):
(_W3CTestConverter.__init__):
(_W3CTestConverter.convert_attributes_if_needed):
* Scripts/webkitpy/w3c/test_converter_unittest.py:
(verify_test_harness_paths):
* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.find_importable_tests):
(TestImporter.import_tests):

Canonical link: https://commits.webkit.org/265842@main
@webkit-commit-queue
Copy link
Collaborator

Committed 265842@main (1866a4e): https://commits.webkit.org/265842@main

Reviewed commits have been landed. Closing PR #15547 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 1866a4e into WebKit:main Jul 7, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jul 7, 2023
@gsnedders gsnedders deleted the rm-convert_test_harness_links branch July 20, 2023 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
6 participants