Skip to content

Commit e512ea9

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 93a3ba9 commit e512ea9

File tree

56 files changed

+18
-78
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

+18
-78
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
@@ -794,6 +794,13 @@ let package = Package(
794794
.unsafeFlags(["-static"]),
795795
]
796796
),
797+
.target(
798+
/** SwiftPM internal test suite support library */
799+
name: "_IntegrationTestSupport",
800+
dependencies: [
801+
.product(name: "TSCTestSupport", package: "swift-tools-support-core"),
802+
]
803+
),
797804

798805
.target(
799806
/** Test for thread-sanitizer. */
@@ -994,6 +1001,14 @@ if ProcessInfo.processInfo.environment["SWIFTCI_DISABLE_SDK_DEPENDENT_TESTS"] ==
9941001
"_InternalTestSupport"
9951002
]
9961003
),
1004+
.testTarget(
1005+
name: "IntegrationTests",
1006+
dependencies: [
1007+
"_IntegrationTestSupport",
1008+
.product(name: "TSCTestSupport", package: "swift-tools-support-core"),
1009+
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
1010+
]
1011+
),
9971012
.testTarget(
9981013
name: "CommandsTests",
9991014
dependencies: [

IntegrationTests/Tests/IntegrationTests/BasicTests.swift renamed to Tests/IntegrationTests/BasicTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
import Foundation
12-
import IntegrationTestSupport
12+
import _IntegrationTestSupport
1313
import Testing
1414
import TSCBasic
1515
import TSCTestSupport

IntegrationTests/Tests/IntegrationTests/SwiftPMTests.swift renamed to Tests/IntegrationTests/SwiftPMTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*/
1010

1111
import Foundation
12-
import IntegrationTestSupport
12+
import _IntegrationTestSupport
1313
import Testing
1414
import TSCBasic
1515
import TSCTestSupport

IntegrationTests/Tests/IntegrationTests/XCBuildTests.swift renamed to Tests/IntegrationTests/XCBuildTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import TSCBasic
1212
import TSCTestSupport
13-
import IntegrationTestSupport
13+
import _IntegrationTestSupport
1414
import Testing
1515

1616
@Suite

Utilities/build-using-self

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -234,33 +234,6 @@ def main() -> None:
234234
)
235235
)
236236

237-
integration_test_dir = (REPO_ROOT_PATH / "IntegrationTests").as_posix()
238-
call(
239-
filterNone(
240-
[
241-
"swift",
242-
"package",
243-
"--package-path",
244-
integration_test_dir,
245-
"update",
246-
]
247-
)
248-
)
249-
call(
250-
filterNone(
251-
[
252-
"swift",
253-
"run",
254-
"swift-test",
255-
*global_args,
256-
"--package-path",
257-
integration_test_dir,
258-
"--parallel",
259-
*ignore_args,
260-
]
261-
)
262-
)
263-
264237
if is_on_darwin():
265238
run_bootstrap(swiftpm_bin_dir=swiftpm_bin_dir)
266239
logging.info("Done")

0 commit comments

Comments
 (0)