Skip to content

Commit 38aa16d

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 d99bce8 commit 38aa16d

File tree

56 files changed

+15
-58
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
-58
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
@@ -758,6 +758,12 @@ let package = Package(
758758
.unsafeFlags(["-static"]),
759759
]
760760
),
761+
.target(
762+
name: "IntegrationTestSupport",
763+
dependencies: [
764+
.product(name: "TSCTestSupport", package: "swift-tools-support-core"),
765+
]
766+
),
761767

762768
.target(
763769
/** Test for thread-sanitizer. */
@@ -810,6 +816,14 @@ let package = Package(
810816
name: "LLBuildManifestTests",
811817
dependencies: ["Basics", "LLBuildManifest", "_InternalTestSupport"]
812818
),
819+
.testTarget(
820+
name: "IntegrationTests",
821+
dependencies: [
822+
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
823+
.product(name: "TSCTestSupport", package: "swift-tools-support-core"),
824+
"IntegrationTestSupport",
825+
]
826+
),
813827
.testTarget(
814828
name: "WorkspaceTests",
815829
dependencies: ["Workspace", "_InternalTestSupport"]
@@ -966,6 +980,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
966980
"dummy-swiftc",
967981
]
968982
),
983+
969984
])
970985
}
971986
#endif

Utilities/build-using-self

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,6 @@ def main() -> None:
160160
shlex.split(f"swift test --configuration {args.config} --parallel {swift_testing_arg} {xctest_arg}"),
161161
)
162162

163-
with change_directory(REPO_ROOT_PATH / "IntegrationTests"):
164-
call(
165-
shlex.split("swift package update"),
166-
)
167-
call(
168-
shlex.split(
169-
f"{swiftpm_bin_dir / 'swift-test'} --parallel",
170-
),
171-
)
172-
173163
run_bootstrap(swiftpm_bin_dir=swiftpm_bin_dir)
174164

175165

0 commit comments

Comments
 (0)