Skip to content

Test: Merge IntegrationTests into Tests #8223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

bkhouri
Copy link
Contributor

@bkhouri bkhouri commented Jan 15, 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: #8685

@bkhouri bkhouri marked this pull request as ready for review January 15, 2025 23:59
@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 38c52f7 to 6132396 Compare March 19, 2025 20:38
@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 6132396 to 65725d0 Compare March 19, 2025 20:39
@bkhouri bkhouri marked this pull request as draft March 19, 2025 20:40
@bkhouri bkhouri marked this pull request as ready for review March 19, 2025 20:40
@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 65725d0 to 38aa16d Compare March 24, 2025 17:41
@bkhouri
Copy link
Contributor Author

bkhouri commented Mar 24, 2025

@swift-ci please test

@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 38aa16d to 3dad0aa Compare April 1, 2025 22:56
@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 1, 2025

@swift-ci please test

@Suite
private struct BasicTests {
@Test(
.disabled("The `swift` command line is not a swift package manager executable target"),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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"),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Should we re-work this test so it does not rely on swiftc?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chore (blocking): This file is not used and should be removed.


public let swiftBuild: AbsolutePath = swiftpmBinaryDirectory.appending(component: "swift-build")
// public let swiftpmBinaryDirectory: AbsolutePath = {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

chore (blocking): remove lie 111 to 127. They should be replaced with the executeSwift* functions.

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 1, 2025

@swift-ci please test self hosted windows

@bkhouri
Copy link
Contributor Author

bkhouri commented Apr 1, 2025

@swift-ci please test windows

@bkhouri bkhouri added the test suite improvements to SwiftPM test suite label Apr 8, 2025
bkhouri added a commit that referenced this pull request Apr 9, 2025
Until #8223 is fixed copy some helpers from
`IntergrationTests/Source/IntegrationTests` to
`Test/_InternalTestSupport` so we can re-use the functionality.

Related to: #8433
rdar://148248105
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)
@bkhouri bkhouri mentioned this pull request Apr 10, 2025
@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 8860e6d to 81ca8c6 Compare June 4, 2025 18:45
@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 4, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 4, 2025

@swift-ci test windows

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 4, 2025

@swift-ci test self hosted windows

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 4, 2025

@swift-ci test self-hosted windows

@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 81ca8c6 to 7fc5bb7 Compare June 17, 2025 17:09
@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 17, 2025

@swift-ci test

@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 7fc5bb7 to 954d3aa Compare June 17, 2025 18:10
@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 17, 2025

@swift-ci test

@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 954d3aa to 75df1cc Compare June 17, 2025 18:36
@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 17, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 17, 2025

@swift-ci test windows

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 18, 2025

@swift-ci test linux

@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 75df1cc to 24f51c5 Compare June 18, 2025 14:55
@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 18, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 18, 2025

@swift-ci test windows

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 18, 2025

@swift-ci test macOS

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 19, 2025

@swift-ci test windows

@bkhouri bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from 24f51c5 to c69363d Compare June 19, 2025 15:21
@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 19, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 19, 2025

@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 bkhouri force-pushed the t/main/merge_integration_tests_into_tests branch from c69363d to 441f084 Compare June 20, 2025 14:51
@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 20, 2025

@swift-ci test

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 20, 2025

@swift-ci test windows

@bkhouri
Copy link
Contributor Author

bkhouri commented Jun 20, 2025

@swift-ci test macOS

@bkhouri bkhouri enabled auto-merge (squash) June 20, 2025 17:29
@bkhouri bkhouri merged commit cd28d1b into swiftlang:main Jun 20, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
test suite improvements to SwiftPM test suite
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants