[6.0] Fix hard-coded path to FoundationEssentialsTests resources
#887
Conversation
This file contains hidden or 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
SwiftPM used to incorrectly build tests for both host and target. That has been fixed by swiftlang/swift-package-manager#7879. The fix makes sure that if there are any direct macro dependencies in test targets xctest bundle is only built for "host". This means that the hard-coded resources path needs to be updated to include "-tool" suffix. (cherry picked from commit d14ceaf)
Contributor
Author
|
@swift-ci please test |
jmschonfeld
approved these changes
Aug 28, 2024
Contributor
jmschonfeld
left a comment
jmschonfeld
left a comment
There was a problem hiding this comment.
Seems fine to me to cherry-pick if this fixes the tests' incorrect assumptions. Adding @parkera as he is the review manager for this branch
parkera
approved these changes
Aug 28, 2024
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.
Explanation:
The hard-coded resource directory path needs to account for the fact that sometimes tests are only build for the "host". So the changes try to find "-tool" prefixed directory first and if it exists, use it.
Main Branch PR: Fix hard-coded path to
FoundationEssentialsTestsresources #855Risk: Very Low (only tests of foundation are effected).
Reviewed By: @jmschonfeld
Testing: Manual.
(cherry picked from commit d14ceaf)