 
   /// Test the libSwiftScan dependency scanning.
   func testDependencyScanning() throws {
-    let (_, _, toolchain, hostTriple) = try getDriverArtifactsForScanning()
+    let (stdlibPath, shimsPath, toolchain, hostTriple) = try getDriverArtifactsForScanning()
 
     // The dependency oracle wraps an instance of libSwiftScan and ensures thread safety across
     // queries.

      var driver = try Driver(args: ["swiftc",
                                     "-I", cHeadersPath.nativePathString().escaped(),
                                     "-I", swiftModuleInterfacesPath.nativePathString().escaped(),
                                     "-import-objc-header",
                                     "-explicit-module-build",
                                     "-working-directory", path.pathString.nativePathString().escaped(),

        return (sdkroot
                  .appending(component: "usr")
                  .appending(component: "lib")
                  .appending(component: "swift")
                  .appending(component: "windows")
                  // TODO(compnerd) this should be dropped, but we need to
                  // synchronize with the frontend and installer to ensure that
                  // everything is setup properly.  With the swiftmodule
                  // directory structure being supported, we no longer need to
                  // put the swiftmodules in the architecture directory, only
                  // the import libraries.
                  .appending(component: driver.targetTriple.archName),
                sdkroot
                  .appending(component: "usr")
                  .appending(component: "lib")
