Merge pull request #1508 from cachemeifyoucan/eng/PR-1507

Author: cachemeifyoucan

Tests/SwiftDriverTests/CachingBuildTests.swift

@@ -205,6 +205,20 @@ private func checkCachingBuildJobDependencies(job: Job,
 
 
 final class CachingBuildTests: XCTestCase {
+  override func setUpWithError() throws {
+    try super.setUpWithError()
+
+    // If the toolchain doesn't support caching, skip directly.
+    let driver = try Driver(args: ["swiftc", "-v"])
+#if os(Windows)
+    throw XCTSkip("caching not supported on windows")
+#else
+    guard driver.isFeatureSupported(.cache_compile_job) else {
+      throw XCTSkip("caching not supported")
+    }
+#endif
+  }
+
   private func pathMatchesSwiftModule(path: VirtualPath, _ name: String) -> Bool {
     return path.basenameWithoutExt.starts(with: "\(name)-") &&
            path.extension! == FileType.swiftModule.rawValue
@@ -234,9 +248,6 @@ final class CachingBuildTests: XCTestCase {
                                      "-cache-compile-job", "-cas-path", casPath.nativePathString(escaped: true),
                                      "-import-objc-header", bridgingHeaderpath.nativePathString(escaped: true),
                                      main.nativePathString(escaped: true)] + sdkArgumentsForTesting)
-      guard driver.isFeatureSupported(.cache_compile_job) else {
-        throw XCTSkip("toolchain does not support caching.")
-      }
 
       let jobs = try driver.planBuild()
       let dependencyGraph = try driver.gatherModuleDependencies()
@@ -361,9 +372,6 @@ final class CachingBuildTests: XCTestCase {
       guard driver.supportExplicitModuleVerifyInterface() else {
         throw XCTSkip("-typecheck-module-from-interface doesn't support explicit build.")
       }
-      guard driver.isFeatureSupported(.cache_compile_job) else {
-        throw XCTSkip("toolchain does not support caching.")
-      }
 
       let jobs = try driver.planBuild()
       // Figure out which Triples to use.
@@ -492,9 +500,6 @@ final class CachingBuildTests: XCTestCase {
                                      "-working-directory", path.nativePathString(escaped: true),
                                      main.nativePathString(escaped: true)] + sdkArgumentsForTesting,
                               env: ProcessEnv.vars)
-      guard driver.isFeatureSupported(.cache_compile_job) else {
-        throw XCTSkip("toolchain does not support caching.")
-      }
       let jobs = try driver.planBuild()
       try driver.run(jobs: jobs)
       XCTAssertFalse(driver.diagnosticEngine.hasErrors)
@@ -553,10 +558,6 @@ final class CachingBuildTests: XCTestCase {
                                       + sdkArgumentsForTesting,
                                       env: ProcessEnv.vars)
 
-      // Ensure this tooling supports this functionality
-      guard fooBuildDriver.isFeatureSupported(.cache_compile_job) else {
-        throw XCTSkip("toolchain does not support caching.")
-      }
       let dependencyOracle = InterModuleDependencyOracle()
       let scanLibPath = try XCTUnwrap(fooBuildDriver.toolchain.lookupSwiftScanLib())
       guard try dependencyOracle
@@ -623,9 +624,6 @@ final class CachingBuildTests: XCTestCase {
                                      "-disable-clang-target",
                                      main.nativePathString(escaped: true)] + sdkArgumentsForTesting,
                               env: ProcessEnv.vars)
-      guard driver.isFeatureSupported(.cache_compile_job) else {
-        throw XCTSkip("toolchain does not support caching.")
-      }
       let dependencyOracle = InterModuleDependencyOracle()
       let scanLibPath = try XCTUnwrap(driver.toolchain.lookupSwiftScanLib())
       guard try dependencyOracle
@@ -674,38 +672,42 @@ final class CachingBuildTests: XCTestCase {
                                                  // FIXME: We need to differentiate the scanning action hash,
                                                  // though the module-name above should be sufficient.
                                                  "-I/tmp/foo/bar/\(index)"]
-        let dependencyGraph =
-          try! dependencyOracle.getDependencies(workingDirectory: path,
-                                                commandLine: iterationCommand)
-
-        // The _Concurrency and _StringProcessing modules are automatically
-        // imported in newer versions of the Swift compiler. If they happened to
-        // be provided, adjust our expectations accordingly.
-        let hasConcurrencyModule = dependencyGraph.modules.keys.contains {
-          $0.moduleName == "_Concurrency"
-        }
-        let hasConcurrencyShimsModule = dependencyGraph.modules.keys.contains {
-          $0.moduleName == "_SwiftConcurrencyShims"
-        }
-        let hasStringProcessingModule = dependencyGraph.modules.keys.contains {
-          $0.moduleName == "_StringProcessing"
-        }
-        let adjustedExpectedNumberOfDependencies =
-            expectedNumberOfDependencies +
-            (hasConcurrencyModule ? 1 : 0) +
-            (hasConcurrencyShimsModule ? 1 : 0) +
-            (hasStringProcessingModule ? 1 : 0)
-
-        if (dependencyGraph.modules.count != adjustedExpectedNumberOfDependencies) {
-          lock.lock()
-          print("Unexpected Dependency Scanning Result (\(dependencyGraph.modules.count) modules):")
-          dependencyGraph.modules.forEach {
-            print($0.key.moduleName)
+        do {
+          let dependencyGraph =
+            try dependencyOracle.getDependencies(workingDirectory: path,
+                                                 commandLine: iterationCommand)
+
+          // The _Concurrency and _StringProcessing modules are automatically
+          // imported in newer versions of the Swift compiler. If they happened to
+          // be provided, adjust our expectations accordingly.
+          let hasConcurrencyModule = dependencyGraph.modules.keys.contains {
+            $0.moduleName == "_Concurrency"
+          }
+          let hasConcurrencyShimsModule = dependencyGraph.modules.keys.contains {
+            $0.moduleName == "_SwiftConcurrencyShims"
           }
-          lock.unlock()
+          let hasStringProcessingModule = dependencyGraph.modules.keys.contains {
+            $0.moduleName == "_StringProcessing"
+          }
+          let adjustedExpectedNumberOfDependencies =
+              expectedNumberOfDependencies +
+              (hasConcurrencyModule ? 1 : 0) +
+              (hasConcurrencyShimsModule ? 1 : 0) +
+              (hasStringProcessingModule ? 1 : 0)
+
+          if (dependencyGraph.modules.count != adjustedExpectedNumberOfDependencies) {
+            lock.lock()
+            print("Unexpected Dependency Scanning Result (\(dependencyGraph.modules.count) modules):")
+            dependencyGraph.modules.forEach {
+              print($0.key.moduleName)
+            }
+            lock.unlock()
+          }
+          XCTAssertTrue(dependencyGraph.modules.count ==
+                        adjustedExpectedNumberOfDependencies)
+        } catch {
+          XCTFail("Unexpected error: \(error)")
         }
-        XCTAssertTrue(dependencyGraph.modules.count ==
-                      adjustedExpectedNumberOfDependencies)
       }
 
       // Change CAS path is an error.
@@ -759,9 +761,6 @@ final class CachingBuildTests: XCTestCase {
                                      "-scanner-prefix-map", path.description + "=/^tmp",
                                      main.nativePathString(escaped: true)] + sdkArgumentsForTesting,
                               env: ProcessEnv.vars)
-      guard driver.isFeatureSupported(.cache_compile_job) else {
-        throw XCTSkip("toolchain does not support caching.")
-      }
       guard driver.isFrontendArgSupported(.scannerPrefixMap) else {
         throw XCTSkip("frontend doesn't support prefix map")
       }
@@ -832,9 +831,6 @@ final class CachingBuildTests: XCTestCase {
                                      "-working-directory", path.nativePathString(escaped: true),
                                      main.nativePathString(escaped: true)] + sdkArgumentsForTesting,
                               env: ProcessEnv.vars)
-      guard driver.isFeatureSupported(.cache_compile_job) else {
-        throw XCTSkip("toolchain does not support caching.")
-      }
       let jobs = try driver.planBuild()
       try driver.run(jobs: jobs)
       XCTAssertFalse(driver.diagnosticEngine.hasErrors)

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -1441,38 +1441,42 @@ final class ExplicitModuleBuildTests: XCTestCase {
                                                  // FIXME: We need to differentiate the scanning action hash,
                                                  // though the module-name above should be sufficient.
                                                  "-I/tmp/foo/bar/\(index)"]
-        let dependencyGraph =
-          try! dependencyOracle.getDependencies(workingDirectory: path,
-                                                commandLine: iterationCommand)
-
-        // The _Concurrency and _StringProcessing modules are automatically
-        // imported in newer versions of the Swift compiler. If they happened to
-        // be provided, adjust our expectations accordingly.
-        let hasConcurrencyModule = dependencyGraph.modules.keys.contains {
-          $0.moduleName == "_Concurrency"
-        }
-        let hasConcurrencyShimsModule = dependencyGraph.modules.keys.contains {
-          $0.moduleName == "_SwiftConcurrencyShims"
-        }
-        let hasStringProcessingModule = dependencyGraph.modules.keys.contains {
-          $0.moduleName == "_StringProcessing"
-        }
-        let adjustedExpectedNumberOfDependencies =
-            expectedNumberOfDependencies +
-            (hasConcurrencyModule ? 1 : 0) +
-            (hasConcurrencyShimsModule ? 1 : 0) +
-            (hasStringProcessingModule ? 1 : 0)
-
-        if (dependencyGraph.modules.count != adjustedExpectedNumberOfDependencies) {
-          lock.lock()
-          print("Unexpected Dependency Scanning Result (\(dependencyGraph.modules.count) modules):")
-          dependencyGraph.modules.forEach {
-            print($0.key.moduleName)
+        do {
+          let dependencyGraph =
+            try dependencyOracle.getDependencies(workingDirectory: path,
+                                                 commandLine: iterationCommand)
+
+          // The _Concurrency and _StringProcessing modules are automatically
+          // imported in newer versions of the Swift compiler. If they happened to
+          // be provided, adjust our expectations accordingly.
+          let hasConcurrencyModule = dependencyGraph.modules.keys.contains {
+            $0.moduleName == "_Concurrency"
+          }
+          let hasConcurrencyShimsModule = dependencyGraph.modules.keys.contains {
+            $0.moduleName == "_SwiftConcurrencyShims"
+          }
+          let hasStringProcessingModule = dependencyGraph.modules.keys.contains {
+            $0.moduleName == "_StringProcessing"
+          }
+          let adjustedExpectedNumberOfDependencies =
+              expectedNumberOfDependencies +
+              (hasConcurrencyModule ? 1 : 0) +
+              (hasConcurrencyShimsModule ? 1 : 0) +
+              (hasStringProcessingModule ? 1 : 0)
+
+          if (dependencyGraph.modules.count != adjustedExpectedNumberOfDependencies) {
+            lock.lock()
+            print("Unexpected Dependency Scanning Result (\(dependencyGraph.modules.count) modules):")
+            dependencyGraph.modules.forEach {
+              print($0.key.moduleName)
+            }
+            lock.unlock()
           }
-          lock.unlock()
+          XCTAssertTrue(dependencyGraph.modules.count ==
+                        adjustedExpectedNumberOfDependencies)
+        } catch {
+          XCTFail("Unexpected error: \(error)")
         }
-        XCTAssertTrue(dependencyGraph.modules.count ==
-                      adjustedExpectedNumberOfDependencies)
       }
     }
   }