[6.0][PackageModel] UserToolchain: Add -F when building with CommandLineTools #8035
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
Properly handle swift-testing installations in CommandLineTools. Resolves rdar://136424541.
bnbarham
changed the title
|
@swift-ci please test |
|
@swift-ci please test |
This PR checks if XCTest is available before invoking XCTest-based tests on Darwin. There are three possible outcomes: 1. If XCTest is available, we will run XCTest-based tests (as we have historically.) 2. If XCTest is not available and the user explicitly passed `--enable-xctest`, we will attempt to run XCTest-based tests, but in general this code path will continue to fail as `swift test` has historically done when XCTest is not available. 3. If XCTest is not available and the user did not pass `--enable-xctest`, we skip running any XCTest logic. On Linux/Windows/etc., XCTest is always present via swift-corelibs-xctest and so this change has no practical effect there. On Darwin, XCTest may be missing if the user has installed the Xcode Command Line Tools, but not the full Xcode IDE. XCTest is not included with the Xcode Command Line Tools package. The purpose of this change is to allow running `swift test` when XCTest is unavailable but Swift Testing _is_ available.
bnbarham
force-pushed
the
cherry-cltools
branch
from
86cb14a to
a20491a
Compare
|
@swift-ci please test |
grynspan
approved these changes
Oct 12, 2024
briancroom
approved these changes
Oct 12, 2024
|
@swift-ci please test Windows platform |
daveyc123
approved these changes
Oct 15, 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:
On macOS SwiftPM should use the swift-testing installed into a CommandLineTools when it exists and skip xctest if it isn't available.
Main Branch PR: [PackageModel] Support swift-testing installed in a toolchain #7840 (was previously only partially cherry-picked) and Detect if XCTest is installed on Darwin #7805
Resolves: rdar://136424541
Risk: Low
Reviewed By: @MaxDesiatov @rintaro
Testing: Existing tests and manual validation using new toolchain