Skip to content

Commit 1824325

Browse files
committed
Code review and test cases changes
This commit if added will 1. Removes redundant isDarwin check for -static-stdlib DarwinToolchain arg validation , 2. Adds Darwin platform target for all 3 tests introduced,
1 parent 60931b1 commit 1824325

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Sources/SwiftDriver/Toolchains/DarwinToolchain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public final class DarwinToolchain: Toolchain {
159159
throw ToolchainValidationError.unsupportedTargetVariant(variant: targetVariantTriple)
160160
}
161161
// Validating darwin unsupported -static-stdlib argument.
162-
if parsedOptions.hasArgument(.staticStdlib) && targetTriple.isDarwin {
162+
if parsedOptions.hasArgument(.staticStdlib) {
163163
throw ToolchainValidationError.argumentNotSupported("-static-stdlib")
164164
}
165165
// If a C++ standard library is specified, it has to be libc++.

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1541,22 +1541,22 @@ final class SwiftDriverTests: XCTestCase {
15411541
}
15421542
}
15431543

1544-
XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-static-stdlib",
1544+
XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-static-stdlib", "-target", "x86_64-apple-macosx10.14",
15451545
"foo.swift"])) { error in
15461546
guard case DarwinToolchain.ToolchainValidationError.argumentNotSupported("-static-stdlib") = error else {
15471547
XCTFail()
15481548
return
15491549
}
15501550
}
15511551

1552-
XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-experimental-cxx-stdlib", "libstdc++",
1552+
XCTAssertThrowsError(try Driver(args: ["swiftc", "-c", "-target", "x86_64-apple-macosx10.14", "-experimental-cxx-stdlib", "libstdc++",
15531553
"foo.swift"])) { error in
15541554
guard case DarwinToolchain.ToolchainValidationError.darwinOnlySupportsLibCxx = error else {
15551555
XCTFail()
15561556
return
15571557
}
15581558
}
1559-
try assertNoDriverDiagnostics(args: "swiftc", "-c", "-link-objc-runtime", "foo.swift")
1559+
try assertNoDriverDiagnostics(args: "swiftc", "-c", "-target", "x86_64-apple-macosx10.14", "-link-objc-runtime", "foo.swift")
15601560
}
15611561

15621562
func testDSYMGeneration() throws {

0 commit comments

Comments
 (0)