Skip to content

[test] Fix swiftpm tests that relied on minimum deployment target #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2021
Merged

[test] Fix swiftpm tests that relied on minimum deployment target #385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import SPMBuildCore
#endif
import Build
import LanguageServerProtocol
import PackageModel
import SKCore
import SKSwiftPMWorkspace
import SKTestSupport
Expand Down Expand Up @@ -83,8 +84,6 @@ final class SwiftPMWorkspaceTests: XCTestCase {
}

func testBasicSwiftArgs() throws {
throw XCTSkip("rdar://76191577");

// FIXME: should be possible to use InMemoryFileSystem.
let fs = localFileSystem
try! withTemporaryDirectory(removeTreeOnDeinit: true) { tempDir in
Expand Down Expand Up @@ -120,7 +119,8 @@ final class SwiftPMWorkspaceTests: XCTestCase {

check("-target", arguments: arguments) // Only one!
#if os(macOS)
check("-target", hostTriple.tripleString(forPlatformVersion: "10.10"), arguments: arguments)
let versionString = PackageModel.Platform.macOS.oldestSupportedVersion.versionString
check("-target", hostTriple.tripleString(forPlatformVersion: versionString), arguments: arguments)
check("-sdk", arguments: arguments)
check("-F", arguments: arguments)
#else
Expand Down Expand Up @@ -323,8 +323,6 @@ final class SwiftPMWorkspaceTests: XCTestCase {
}

func testBasicCXXArgs() throws {
throw XCTSkip("rdar://76191577");

// FIXME: should be possible to use InMemoryFileSystem.
let fs = localFileSystem
try! withTemporaryDirectory(removeTreeOnDeinit: true) { tempDir in
Expand Down Expand Up @@ -362,8 +360,9 @@ final class SwiftPMWorkspaceTests: XCTestCase {
checkNot("-arch", arguments: arguments)
check("-target", arguments: arguments) // Only one!
#if os(macOS)
let versionString = PackageModel.Platform.macOS.oldestSupportedVersion.versionString
check("-target",
hostTriple.tripleString(forPlatformVersion: "10.10"), arguments: arguments)
hostTriple.tripleString(forPlatformVersion: versionString), arguments: arguments)
check("-isysroot", arguments: arguments)
check("-F", arguments: arguments)
#else
Expand Down