Skip to content

Commit 57aa4dc

Browse files
authored
Merge pull request #385 from benlangmuir/target-version-change
[test] Fix swiftpm tests that relied on minimum deployment target
2 parents ca3b452 + b1bc1d8 commit 57aa4dc

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import SPMBuildCore
1515
#endif
1616
import Build
1717
import LanguageServerProtocol
18+
import PackageModel
1819
import SKCore
1920
import SKSwiftPMWorkspace
2021
import SKTestSupport
@@ -83,8 +84,6 @@ final class SwiftPMWorkspaceTests: XCTestCase {
8384
}
8485

8586
func testBasicSwiftArgs() throws {
86-
throw XCTSkip("rdar://76191577");
87-
8887
// FIXME: should be possible to use InMemoryFileSystem.
8988
let fs = localFileSystem
9089
try! withTemporaryDirectory(removeTreeOnDeinit: true) { tempDir in
@@ -120,7 +119,8 @@ final class SwiftPMWorkspaceTests: XCTestCase {
120119

121120
check("-target", arguments: arguments) // Only one!
122121
#if os(macOS)
123-
check("-target", hostTriple.tripleString(forPlatformVersion: "10.10"), arguments: arguments)
122+
let versionString = PackageModel.Platform.macOS.oldestSupportedVersion.versionString
123+
check("-target", hostTriple.tripleString(forPlatformVersion: versionString), arguments: arguments)
124124
check("-sdk", arguments: arguments)
125125
check("-F", arguments: arguments)
126126
#else
@@ -323,8 +323,6 @@ final class SwiftPMWorkspaceTests: XCTestCase {
323323
}
324324

325325
func testBasicCXXArgs() throws {
326-
throw XCTSkip("rdar://76191577");
327-
328326
// FIXME: should be possible to use InMemoryFileSystem.
329327
let fs = localFileSystem
330328
try! withTemporaryDirectory(removeTreeOnDeinit: true) { tempDir in
@@ -362,8 +360,9 @@ final class SwiftPMWorkspaceTests: XCTestCase {
362360
checkNot("-arch", arguments: arguments)
363361
check("-target", arguments: arguments) // Only one!
364362
#if os(macOS)
363+
let versionString = PackageModel.Platform.macOS.oldestSupportedVersion.versionString
365364
check("-target",
366-
hostTriple.tripleString(forPlatformVersion: "10.10"), arguments: arguments)
365+
hostTriple.tripleString(forPlatformVersion: versionString), arguments: arguments)
367366
check("-isysroot", arguments: arguments)
368367
check("-F", arguments: arguments)
369368
#else

0 commit comments

Comments
 (0)