Skip to content

Revert "[Incremental] Enable testBatchModeContinueAfterErrors & skip frontend query even if no extra arguments to -driver-use-frontend-path" #403

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
Dec 8, 2020
Merged

Revert "[Incremental] Enable testBatchModeContinueAfterErrors & skip frontend query even if no extra arguments to -driver-use-frontend-path" #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/SwiftDriver/Driver/Driver.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2061,10 +2061,8 @@ extension Driver {
toolDirectory: toolDir)

// Find the Swift compiler executable.
let hasFrontendBeenRedirectedForTesting: Bool
let swiftCompilerPrefixArgs: [String]
if let frontendPath = parsedOptions.getLastArgument(.driverUseFrontendPath){
hasFrontendBeenRedirectedForTesting = true
var frontendCommandLine =
frontendPath.asSingle.split(separator: ";").map { String($0) }
if frontendCommandLine.isEmpty {
Expand All @@ -2077,9 +2075,11 @@ extension Driver {
swiftCompilerPrefixArgs = frontendCommandLine
}
} else {
hasFrontendBeenRedirectedForTesting = false
swiftCompilerPrefixArgs = []
}
var hasFrontendBeenRedirectedForTesting: Bool {
return !swiftCompilerPrefixArgs.isEmpty
}

// Find the SDK, if any.
let sdkPath: VirtualPath? = Self.computeSDKPath(
Expand Down
1 change: 1 addition & 0 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,6 +1472,7 @@ final class SwiftDriverTests: XCTestCase {
}

func testBatchModeContinueAfterErrors() throws {
throw XCTSkip("This test requires the fix to honoring -driver-use-frontend-path")
struct MockExecutor: DriverExecutor {
let resolver = try! ArgsResolver(fileSystem: localFileSystem)

Expand Down