Skip to content

Commit 88d2516

Browse files
authored
Fix skipping of tests and skip some additional ones (#2984)
- we were actually not really skipping a few tests, because I didn't do that correctly in #2948 - we need to skip a few additional tests which are using the same functionality (running an inferior `swift test`) Supersedes #2982
1 parent 2b042b9 commit 88d2516

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

Tests/FunctionalTests/CFamilyTargetTests.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ class CFamilyTargetTestCase: XCTestCase {
7474
}
7575
}
7676

77-
func testObjectiveCPackageWithTestTarget(){
77+
func testObjectiveCPackageWithTestTarget() throws {
78+
// <rdar://problem/70382477> Fix and re-enable tests which run `swift test` on newly created packages
79+
try XCTSkipIf(true)
80+
7881
#if os(macOS)
7982
fixture(name: "CFamilyTargets/ObjCmacOSPackage") { prefix in
8083
// Build the package.

Tests/FunctionalTests/MiscellaneousTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ class MiscellaneousTestCase: XCTestCase {
214214

215215
func testSwiftTestParallel() throws {
216216
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
217-
try XCTSkip()
217+
try XCTSkipIf(true)
218218

219219
fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in
220220
// First try normal serial testing.
@@ -262,7 +262,7 @@ class MiscellaneousTestCase: XCTestCase {
262262

263263
func testSwiftTestFilter() throws {
264264
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
265-
try XCTSkip()
265+
try XCTSkipIf(true)
266266

267267
fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in
268268
let (stdout, _) = try SwiftPMProduct.SwiftTest.execute(["--filter", ".*1", "-l", "--enable-test-discovery"], packagePath: prefix)
@@ -281,7 +281,7 @@ class MiscellaneousTestCase: XCTestCase {
281281

282282
func testSwiftTestSkip() throws {
283283
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
284-
try XCTSkip()
284+
try XCTSkipIf(true)
285285

286286
fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in
287287
let (stdout, _) = try SwiftPMProduct.SwiftTest.execute(["--skip", "ParallelTestsTests", "-l", "--enable-test-discovery"], packagePath: prefix)
@@ -424,7 +424,7 @@ class MiscellaneousTestCase: XCTestCase {
424424

425425
func testSwiftTestLinuxMainGeneration() throws {
426426
// <rdar://problem/69448176> Fix and re-enable test related to "ParallelTestsPkg"
427-
try XCTSkip()
427+
try XCTSkipIf(true)
428428

429429
#if os(macOS)
430430
fixture(name: "Miscellaneous/ParallelTestsPkg") { prefix in

Tests/FunctionalTests/SwiftPMXCTestHelperTests.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ import Commands
1616
import Workspace
1717

1818
class SwiftPMXCTestHelperTests: XCTestCase {
19-
func testBasicXCTestHelper() {
19+
func testBasicXCTestHelper() throws {
20+
// <rdar://problem/70382477> Fix and re-enable tests which run `swift test` on newly created packages
21+
try XCTSkipIf(true)
22+
2023
#if os(macOS)
2124
fixture(name: "Miscellaneous/SwiftPMXCTestHelper") { prefix in
2225
// Build the package.

Tests/WorkspaceTests/InitTests.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,9 @@ class InitTests: XCTestCase {
220220
}
221221

222222
func testNonC99NameExecutablePackage() throws {
223+
// <rdar://problem/70382477> Fix and re-enable tests which run `swift test` on newly created packages
224+
try XCTSkipIf(true)
225+
223226
try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
224227
XCTAssertTrue(localFileSystem.isDirectory(tempDirPath))
225228

0 commit comments

Comments
 (0)