Fixup Broken Incremental Tests

These tests were stomping over each other and reading stale priors data that was just hanging around from the last run in the driver-computed temporary directory. Even within a single test, this is wrong because multiple modules will read the same priors file. Use the name of the module to diversify things here.

Author: CodaFi

Tests/SwiftDriverTests/CrossModuleIncrementalBuildTests.swift

@@ -19,13 +19,14 @@ import TestUtilities
 class CrossModuleIncrementalBuildTests: XCTestCase {
   func makeOutputFileMap(
     in workingDirectory: AbsolutePath,
+    module: String,
     for files: [AbsolutePath],
     outputTransform transform: (String) -> String = { $0 }
   ) -> String {
     """
     {
       "": {
-        "swift-dependencies": "\(workingDirectory.appending(component: "module.swiftdeps").nativePathString(escaped: true))"
+        "swift-dependencies": "\(workingDirectory.appending(component: "\(module).swiftdeps").nativePathString(escaped: true))"
       }
     """.appending(files.map { file in
       """
@@ -53,7 +54,7 @@ class CrossModuleIncrementalBuildTests: XCTestCase {
 
       let ofm = path.appending(component: "ofm.json")
       try localFileSystem.writeFileContents(ofm) {
-        $0 <<< self.makeOutputFileMap(in: path, for: [ magic ]) {
+        $0 <<< self.makeOutputFileMap(in: path, module: "MagicKit", for: [ magic ]) {
           $0 + "-some_suffix"
         }
       }
@@ -75,7 +76,7 @@ class CrossModuleIncrementalBuildTests: XCTestCase {
       }
 
       try localFileSystem.writeFileContents(ofm) {
-        $0 <<< self.makeOutputFileMap(in: path, for: [ magic ]) {
+        $0 <<< self.makeOutputFileMap(in: path, module: "MagicKit", for: [ magic ]) {
           $0 + "-some_other_suffix"
         }
       }
@@ -102,7 +103,7 @@ class CrossModuleIncrementalBuildTests: XCTestCase {
 
         let ofm = path.appending(component: "ofm.json")
         try localFileSystem.writeFileContents(ofm) {
-          $0 <<< self.makeOutputFileMap(in: path, for: [ magic ])
+          $0 <<< self.makeOutputFileMap(in: path, module: "MagicKit", for: [ magic ])
         }
 
         var driver = try Driver(args: [
@@ -127,7 +128,7 @@ class CrossModuleIncrementalBuildTests: XCTestCase {
 
       let ofm = path.appending(component: "ofm2.json")
       try localFileSystem.writeFileContents(ofm) {
-        $0 <<< self.makeOutputFileMap(in: path, for: [ main ])
+        $0 <<< self.makeOutputFileMap(in: path, module: "theModule", for: [ main ])
       }
 
       var driver = try Driver(args: [

Tests/SwiftDriverTests/DependencyGraphSerializationTests.swift

@@ -22,7 +22,7 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
   ///
   /// Ensure that a round-trip fails when the minor version number changes
   func testSerializedVersionChangeDetection() throws {
-    let mockPath = VirtualPath.absolute(AbsolutePath("/module-dependency-graph"))
+    let mockPath = try VirtualPath.absolute(AbsolutePath(validating: "/module-dependency-graph"))
     let fs = InMemoryFileSystem()
     let graph = Self.mockGraphCreator.mockUpAGraph()
     let currentVersion = ModuleDependencyGraph.serializedGraphVersion
@@ -37,7 +37,7 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
       try graph.write(
         to: mockPath,
         on: fs,
-        buildRecord: info,
+        buildRecord: graph.buildRecord,
         mockSerializedGraphVersion: alteredVersion)
     }
 
@@ -60,7 +60,7 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
   }
 
   func roundTrip(_ originalGraph: ModuleDependencyGraph) throws {
-    let mockPath = VirtualPath.absolute(AbsolutePath("/module-dependency-graph"))
+    let mockPath = try VirtualPath.absolute(AbsolutePath(validating: "/module-dependency-graph"))
     let fs = InMemoryFileSystem()
     let outputFileMap = OutputFileMap.mock(maxIndex: Self.maxIndex)
     let diagnosticsEngine = DiagnosticsEngine()
@@ -69,13 +69,14 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
       outputFileMap: outputFileMap,
       compilerVersion: "Swift 99")
     try originalGraph.blockingConcurrentMutation {
-      try originalGraph.write(to: mockPath, on: fs, buildRecord: buildRecord)
+      try originalGraph.write(
+        to: mockPath, on: fs,
+        buildRecord: originalGraph.buildRecord)
     }
 
     let info = IncrementalCompilationState.IncrementalDependencyAndInputSetup.mock(outputFileMap: outputFileMap, fileSystem: fs)
-    let deserializedGraph =  try info.blockingConcurrentAccessOrMutation {
-      try ModuleDependencyGraph.read(from: mockPath,
-                                     info: info)!
+    let deserializedGraph = try info.blockingConcurrentAccessOrMutation {
+      try XCTUnwrap(ModuleDependencyGraph.read(from: mockPath, info: info))
     }
 
     let descsToCompare = [originalGraph, deserializedGraph].map {