Merge pull request #403 from apple/revert-393-enable-test-once-use-frontend-path-woris

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

Author: artemcm

Sources/SwiftDriver/Driver/Driver.swift

@@ -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 {
@@ -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(

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -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)