Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions Tests/CommandsTests/PackageCommandTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2845,10 +2845,6 @@ class PackageCommandTestCase: CommandsBuildProviderTestCase {
AssertNotExists(fixturePath.appending(components: releaseTarget))
}

if self.buildSystemProvider == .swiftbuild && ProcessInfo.hostOperatingSystem != .macOS {
throw XCTSkip("Failed to find dsymutil tool: https://github.com/swiftlang/swift-package-manager/issues/8862")
}

// If the plugin requests a release binary, that is what will be built, regardless of overall configuration
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
let _ = try await self.execute(["-c", "debug", "build-target", "build-release"], packagePath: fixturePath)
Expand Down Expand Up @@ -2880,8 +2876,6 @@ class PackageCommandTestCase: CommandsBuildProviderTestCase {
await XCTAssertAsyncNoThrow(try await self.execute(["-c", "debug", "check-testability", "InternalModule", "debug", "true"], packagePath: fixturePath))
}

if buildSystemProvider == .swiftbuild && ProcessInfo.hostOperatingSystem != .macOS { throw XCTSkip("Failed to find dsymutil tool: https://github.com/swiftlang/swift-package-manager/issues/8862") }

// Overall configuration: debug, plugin build request: release -> without testability
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
await XCTAssertAsyncNoThrow(try await self.execute(["-c", "debug", "check-testability", "InternalModule", "release", "false"], packagePath: fixturePath))
Expand Down Expand Up @@ -3514,11 +3508,6 @@ class PackageCommandTestCase: CommandsBuildProviderTestCase {
XCTFail("unimplemented assertion for --build-system xcode")
}
XCTAssertMatch(stdout, .and(.contains("artifact-kind:"), .contains("executable")))
} catch {
if ProcessInfo.hostOperatingSystem != .macOS && self.buildSystemProvider == .swiftbuild {
throw XCTSkip("Failed to find dsymutil tool: https://github.com/swiftlang/swift-package-manager/issues/8862")
}
throw error
}

// Invoke the plugin with parameters choosing a verbose build of MyStaticLibrary for release.
Expand All @@ -3540,11 +3529,6 @@ class PackageCommandTestCase: CommandsBuildProviderTestCase {
XCTFail("unimplemented assertion for --build-system xcode")
}
XCTAssertMatch(stdout, .and(.contains("artifact-kind:"), .contains("staticLibrary")))
} catch {
if ProcessInfo.hostOperatingSystem != .macOS && self.buildSystemProvider == .swiftbuild {
throw XCTSkip("Failed to find dsymutil tool: https://github.com/swiftlang/swift-package-manager/issues/8862")
}
throw error
}

// Invoke the plugin with parameters choosing a verbose build of MyDynamicLibrary for release.
Expand All @@ -3570,11 +3554,6 @@ class PackageCommandTestCase: CommandsBuildProviderTestCase {
XCTFail("unimplemented assertion for --build-system xcode")
}
XCTAssertMatch(stdout, .and(.contains("artifact-kind:"), .contains("dynamicLibrary")))
} catch {
if ProcessInfo.hostOperatingSystem != .macOS && self.buildSystemProvider == .swiftbuild {
throw XCTSkip("Failed to find dsymutil tool: https://github.com/swiftlang/swift-package-manager/issues/8862")
}
throw error
}
}
}
Expand Down