[6.0] Properly handle swift-testing installations in toolchain/SDK #7856
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
xedin
added
windows
build system
Contributor
Author
|
@swift-ci please test |
xedin
force-pushed
the
swift-testing-in-toolchain-6.0
branch
from
a161ff6 to
f6c3f8e
Compare
Contributor
Author
|
@swift-ci please test |
Contributor
Author
|
@swift-ci please test Windows platform |
xedin
force-pushed
the
swift-testing-in-toolchain-6.0
branch
from
f6c3f8e to
09e0db5
Compare
Contributor
Author
|
@swift-ci please test |
Contributor
Author
|
@swift-ci please test Windows platform |
On macOS SwiftPM should prefer swift-testing installed into a custom toolchain when used. On Windows we need special logic to discover swift-testing location. - Add special swift compiler "extra" flags to favor swift-testing installed in a toolchain. - Inject `-I`, `-L` on Windows that point to where swift-testing is installed in SDKROOT. - Inject a path to testing on `PATH` environment variable on Windows to make sure that the library is always discoverable. Resolves: rdar://132828246
xedin
force-pushed
the
swift-testing-in-toolchain-6.0
branch
from
09e0db5 to
e4bf1ac
Compare
Contributor
Author
|
@swift-ci please test |
Contributor
Author
|
@swift-ci please test Windows platform |
Contributor
Author
|
@swift-ci please test Linux platform |
bnbarham
approved these changes
Aug 12, 2024
Contributor
Author
|
@swift-ci please test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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:
On macOS SwiftPM should prefer swift-testing installed into a custom toolchain when used. On Windows we need special logic to discover swift-testing location.
-I,-Lon Windows that point to where swift-testing is installed in SDKROOT.PATHenvironment variable on Windows to make sure that the library is always discoverable.Main Branch PR: [PackageModel] Support swift-testing installed in a toolchain #7840
Resolves: rdar://132828246
Risk: Medium (Although changes are only viable with toolchains have certain directories in them and test we could do for testing was manual validation).
Reviewed By: @MaxDesiatov @rintaro
Testing: Existing tests and manual validation using new toolchain (which is currently in development) on Windows and a custom toolchain plus CommandLine tools on macOS.