Add arguments when creating Driver for tests so that tests can run #449
Conversation
|
@swift-ci please test |
|
@swift-ci please test |
|
@swift-ci please test |
|
@swift-ci please test |
| @@ -81,7 +81,9 @@ final class SwiftDriverTests: XCTestCase { | |||
| XCTAssertNoThrow(try Driver(args: ["swift", ".foo"])) | |||
| XCTAssertNoThrow(try Driver(args: ["swift", "/foo"])) | |||
|
|
|||
| XCTAssertThrowsError(try Driver(args: ["swift", "foo"])) | |||
| XCTAssertThrowsError(try Driver(args: ["swift", "foo", | |||
There was a problem hiding this comment.
It took me a while to figure out that the extra arguments were added to prevent the initializer from inserting them between "swift" and "foo", this seems kind of error-prone.
There was a problem hiding this comment.
Yes, I think you are right.
| } | ||
| } | ||
|
|
||
| private func augment(args: [String]) throws -> [String] { |
There was a problem hiding this comment.
Nit: Perhaps a more descriptive name than 'augment(args:)' could be used here.
There was a problem hiding this comment.
I'll try to come up with something; it's a good point.
| // The frontend fails to load the standard library because it cannot | ||
| // find it relative to the execution path used by the Swift Driver. | ||
| // So, pass in the sdk path explicitly. | ||
| if let sdkPath = try cachedSDKPath.get(), !args.contains("-sdk") { |
There was a problem hiding this comment.
We don't search for the SDK except in immediate mode. The expectation is that users and tests will provide SDKROOT in the environment or invoke swiftc via xcrun so the environment is configured for them. I recommend we provide SDKROOT in the testing environment until we land in a toolchain.
There was a problem hiding this comment.
Yes, that might be better.
|
I'll rework this PR--thanks all for your ideas! |
Ensure the diagnostics are not colored, and that the frontend jobs can find the sdk.