Skip to content

Commit 845e74b

Browse files
committed
Test: Merge IntegrationTests into Tests
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.
1 parent 6965245 commit 845e74b

File tree

56 files changed

+15
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+15
-56
lines changed

IntegrationTests/Package.swift

Lines changed: 0 additions & 35 deletions
This file was deleted.

IntegrationTests/README.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

Package.swift

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,13 @@ let package = Package(
778778
.unsafeFlags(["-static"]),
779779
]
780780
),
781+
.target(
782+
/** SwiftPM internal test suite support library */
783+
name: "_IntergrationTestSupport",
784+
dependencies: [
785+
.product(name: "TSCTestSupport", package: "swift-tools-support-core"),
786+
]
787+
),
781788

782789
.target(
783790
/** Test for thread-sanitizer. */
@@ -977,6 +984,14 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
977984
"_InternalTestSupport"
978985
]
979986
),
987+
.testTarget(
988+
name: "IntegrationTests",
989+
dependencies: [
990+
"_IntegrationTestSupport",
991+
.product(name: "TSCTestSupport", package: "swift-tools-support-core"),
992+
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
993+
]
994+
),
980995
.testTarget(
981996
name: "CommandsTests",
982997
dependencies: [

Utilities/build-using-self

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,6 @@ def main() -> None:
158158
shlex.split(f"swift run swift-test --configuration {args.config} --parallel {swift_testing_arg} {xctest_arg} --scratch-path .test {ignore}"),
159159
)
160160

161-
integration_test_dir = (REPO_ROOT_PATH / "IntegrationTests").as_posix()
162-
call(
163-
shlex.split(f"swift package --package-path {integration_test_dir} update"),
164-
)
165-
call(
166-
shlex.split(f"swift run swift-test --package-path {integration_test_dir} --parallel {ignore}"),
167-
)
168-
169161
if is_on_darwin():
170162
run_bootstrap(swiftpm_bin_dir=swiftpm_bin_dir)
171163
logging.info("Done")

0 commit comments

Comments
 (0)