Test: Merge IntegrationTests into Tests #8223
Merged
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
bkhouri
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
francescomikulis,
xedin,
dschaefer2,
shawnhyam,
bripeticca,
plemarquand and
owenv
as code owners
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
38c52f7 to
6132396
Compare
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
6132396 to
65725d0
Compare
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
65725d0 to
38aa16d
Compare
|
@swift-ci please test |
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
38aa16d to
3dad0aa
Compare
|
@swift-ci please test |
bkhouri
commented
Apr 1, 2025
| @Suite | ||
| private struct BasicTests { | ||
| @Test( | ||
| .disabled("The `swift` command line is not a swift package manager executable target"), |
There was a problem hiding this comment.
question: should we simple delete this test?
| @@ -94,6 +104,7 @@ private struct BasicTests { | |||
| } | |||
|
|
|||
| @Test( | |||
| .disabled("The `swiftc` command line is not a swift package manager executable target"), | |||
There was a problem hiding this comment.
question: Should we re-work this test so it does not rely on swiftc?
There was a problem hiding this comment.
chore (blocking): This file is not used and should be removed.
|
|
||
| public let swiftBuild: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-build") | ||
| // public let swiftpmBinaryDirectory: AbsolutePath = { |
There was a problem hiding this comment.
chore (blocking): remove lie 111 to 127. They should be replaced with the executeSwift* functions.
|
@swift-ci please test self hosted windows |
|
@swift-ci please test windows |
This was referenced Apr 8, 2025
bkhouri
added a commit
that referenced
this pull request
Apr 9, 2025
bkhouri
added a commit
to bkhouri/swift-package-manager
that referenced
this pull request
Apr 10, 2025
Until swiftlang#8223 is fixed copy some helpers from `IntergrationTests/Source/IntegrationTests` to `Test/_InternalTestSupport` so we can re-use the functionality. Related to: swiftlang#8433 rdar://148248105 (cherry picked from commit e303b89)
|
@swift-ci test self hosted windows |
|
@swift-ci test self-hosted windows |
jakepetroules
approved these changes
Jun 4, 2025
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
81ca8c6 to
7fc5bb7
Compare
|
@swift-ci test |
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
7fc5bb7 to
954d3aa
Compare
|
@swift-ci test |
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
954d3aa to
75df1cc
Compare
|
@swift-ci test |
|
@swift-ci test windows |
|
@swift-ci test linux |
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
75df1cc to
24f51c5
Compare
|
@swift-ci test |
|
@swift-ci test windows |
|
@swift-ci test macOS |
|
@swift-ci test windows |
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
24f51c5 to
c69363d
Compare
|
@swift-ci test |
|
@swift-ci test windows |
Consolidate all the tests into a single folders. This change only moves the IntegrationTests/Sources and IntegrationTests/Tests to their respective directory. In addition, update the IntegratioNTests to call the respective `executeSwift*()` function and remove its dependency, as much as possible, on Swift Tools Support Core in favor our the `Basics` module. A subsequent change will find better homes for the tests under Tests/IntegrationTests.
bkhouri
force-pushed
the
t/main/merge_integration_tests_into_tests
branch
from
c69363d to
441f084
Compare
|
@swift-ci test |
|
@swift-ci test windows |
kcieplak
approved these changes
Jun 20, 2025
|
@swift-ci test macOS |
marcprux
pushed a commit
to swift-everywhere/swift-package-manager
that referenced
this pull request
Jul 7, 2025
Consolidate all the tests into a single folders. This change only moves the IntegrationTests/Sources and IntegrationTests/Tests to their respective directory. A subsequent change will find better homes for the tests under Tests/IntegrationTests. Depends on: swiftlang/swift#81217 Depends on: swiftlang#8685
bkhouri
added a commit
that referenced
this pull request
Jul 9, 2025
When the Integration Tests were merged with the Tests (#8223), the `Package.swift` added dependencies on Swift Tools Support Core. However, the declaration did not take into account when the SWIFTPM_SWBUILD_FRAMEWORK environment variable was defined, which was updated in #8442 and #8802. Update the declaration of any Swift Tools Support Core dependencies to use the respective local variables.
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.
Consolidate all the tests into a single folders. This change only moves the IntegrationTests/Sources and IntegrationTests/Tests to their respective directory.
A subsequent change will find better homes for the tests under Tests/IntegrationTests.
Depends on: swiftlang/swift#81217
Depends on: #8685