Skip to content

Commit 98a7c59

Browse files
authored
Revert "[Incremental] Enable testBatchModeContinueAfterErrors & skip frontend query even if no extra arguments to -driver-use-frontend-path"
1 parent d71d974 commit 98a7c59

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

Sources/SwiftDriver/Driver/Driver.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2061,10 +2061,8 @@ extension Driver {
20612061
toolDirectory: toolDir)
20622062

20632063
// Find the Swift compiler executable.
2064-
let hasFrontendBeenRedirectedForTesting: Bool
20652064
let swiftCompilerPrefixArgs: [String]
20662065
if let frontendPath = parsedOptions.getLastArgument(.driverUseFrontendPath){
2067-
hasFrontendBeenRedirectedForTesting = true
20682066
var frontendCommandLine =
20692067
frontendPath.asSingle.split(separator: ";").map { String($0) }
20702068
if frontendCommandLine.isEmpty {
@@ -2077,9 +2075,11 @@ extension Driver {
20772075
swiftCompilerPrefixArgs = frontendCommandLine
20782076
}
20792077
} else {
2080-
hasFrontendBeenRedirectedForTesting = false
20812078
swiftCompilerPrefixArgs = []
20822079
}
2080+
var hasFrontendBeenRedirectedForTesting: Bool {
2081+
return !swiftCompilerPrefixArgs.isEmpty
2082+
}
20832083

20842084
// Find the SDK, if any.
20852085
let sdkPath: VirtualPath? = Self.computeSDKPath(

Tests/SwiftDriverTests/SwiftDriverTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,7 @@ final class SwiftDriverTests: XCTestCase {
14721472
}
14731473

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

0 commit comments

Comments
 (0)