Skip to content

Commit ad9aa30

Browse files
committed
Revert "Add more swiftbuild tests for functions that require swift run (#8375)"
This reverts commit e837e11.
1 parent c6874d3 commit ad9aa30

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

Tests/CommandsTests/BuildCommandTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ class BuildCommandSwiftBuildTests: BuildCommandTestCases {
866866
}
867867

868868
override func testGetTaskAllowEntitlement() async throws {
869-
throw XCTSkip("SWBINTTODO: Test failed because swiftbuild doesn't output the codesign commands that the test expects.")
869+
throw XCTSkip("SWBINTTODO: Test failed because swiftbuild doesn't output precis codesign commands. Once swift run works with swiftbuild the test can be investigated.")
870870
}
871871

872872
override func testCodeCoverage() async throws {

Tests/CommandsTests/RunCommandTests.swift

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ class RunCommandTestCase: CommandsBuildProviderTestCase {
7272
XCTAssertMatch(stdout, .contains("sentinel"))
7373

7474
// swift-build-tool output should go to stderr.
75-
XCTAssertMatch(stderr, .contains("Building for debugging"))
76-
if self.buildSystemProvider == .native {
77-
XCTAssertMatch(stderr, .contains("Linking"))
78-
}
75+
XCTAssertMatch(stderr, .regex("Compiling"))
76+
XCTAssertMatch(stderr, .contains("Linking"))
7977
}
8078
}
8179
#endif
@@ -91,10 +89,8 @@ class RunCommandTestCase: CommandsBuildProviderTestCase {
9189
"""))
9290

9391
// swift-build-tool output should go to stderr.
94-
XCTAssertMatch(stderr, .contains("Building for debugging"))
95-
if self.buildSystemProvider == .native {
96-
XCTAssertMatch(stderr, .contains("Linking"))
97-
}
92+
XCTAssertMatch(stderr, .regex("Compiling"))
93+
XCTAssertMatch(stderr, .contains("Linking"))
9894

9995
await XCTAssertThrowsCommandExecutionError(try await execute(["unknown"], packagePath: fixturePath)) { error in
10096
XCTAssertMatch(error.stderr, .contains("error: no executable product named 'unknown'"))
@@ -257,4 +253,20 @@ class RunCommandSwiftBuildTests: RunCommandTestCase {
257253
override func testUsage() async throws {
258254
try await super.testUsage()
259255
}
256+
257+
override func testMultipleExecutableAndExplicitExecutable() async throws {
258+
throw XCTSkip("SWBINTTODO: https://github.com/swiftlang/swift-package-manager/issues/8279: Swift run using Swift Build does not output executable content to the terminal")
259+
}
260+
261+
override func testUnknownProductAndArgumentPassing() async throws {
262+
throw XCTSkip("SWBINTTODO: https://github.com/swiftlang/swift-package-manager/issues/8279: Swift run using Swift Build does not output executable content to the terminal")
263+
}
264+
265+
override func testToolsetDebugger() async throws {
266+
throw XCTSkip("SWBINTTODO: Test fixture fails to build")
267+
}
268+
269+
override func testUnreachableExecutable() async throws {
270+
throw XCTSkip("SWBINTTODO: Test fails because of build layout differences.")
271+
}
260272
}

0 commit comments

Comments
 (0)