Allow workspace options to affect build system search #1889
+326
−145
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
|
@swift-ci please test |
bnbarham
force-pushed
the
build-system-override
branch
from
6925afe to
a26f35d
Compare
|
@swift-ci please test |
ahoppen
reviewed
Dec 19, 2024
Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift
Outdated
Show resolved
Hide resolved
There were a few places that options only took place *after* determining a build system, even though we have multiple that impact the search (eg. `defaultBuildSystem` and `searchPaths`). Do not search up the directory tree when searching for a build system for a workspace. Only allow this for implicit workspaces (created when no existing workspace can handle a file) and only up to any existing workspace roots.
bnbarham
force-pushed
the
build-system-override
branch
from
a26f35d to
d9bba40
Compare
bnbarham
changed the title
|
@swift-ci please test |
bnbarham
commented
Dec 20, 2024
|
|
||
| XCTAssertNotNil(tryLoadCompilationDatabase(directory: tempDir)) | ||
| } | ||
| } | ||
|
|
||
| func testJSONCompilationDatabaseFromCustomDirectory() async throws { |
There was a problem hiding this comment.
There's a test for basically this in WorkspaceTests now (since tryLoadCompilationDatabase only loads from the directory itself). I'd be open to adding projectRoot tests if you wanted though.
|
@swift-ci please test Windows platform |
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.
There were a few places that options only took place after determining
a build system, even though we have multiple that impact the search (eg.
defaultBuildSystemandsearchPaths).Do not search up the directory tree when searching for a build system
for a workspace. Only allow this for implicit workspaces (created when
no existing workspace can handle a file) and only up to any existing
workspace roots.