Merge pull request #1421 from tshortli/address-warnings-in-tests

Tests: Address warnings about unused results and variables
apple · Aug 21, 2023 · e5b7226 · e5b7226
2 parents 56f498f + 88b4a7c
commit e5b7226
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 36 deletions.
diff --git a/Tests/SwiftDriverTests/DependencyGraphSerializationTests.swift b/Tests/SwiftDriverTests/DependencyGraphSerializationTests.swift
@@ -27,12 +27,7 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
     let graph = Self.mockGraphCreator.mockUpAGraph()
     let currentVersion = ModuleDependencyGraph.serializedGraphVersion
     let alteredVersion = currentVersion.withAlteredMinor
-    let outputFileMap = OutputFileMap.mock(maxIndex: Self.maxIndex)
-    let diagnosticsEngine = DiagnosticsEngine()
-    let info = BuildRecordInfo.mock(
-      diagnosticEngine: diagnosticsEngine,
-      outputFileMap: outputFileMap,
-      compilerVersion: "Swift 99")
+
     try graph.blockingConcurrentAccessOrMutation {
       try graph.write(
         to: mockPath,
@@ -63,11 +58,7 @@ class DependencyGraphSerializationTests: XCTestCase, ModuleDependencyGraphMocker
     let mockPath = try VirtualPath.absolute(AbsolutePath(validating: "/module-dependency-graph"))
     let fs = InMemoryFileSystem()
     let outputFileMap = OutputFileMap.mock(maxIndex: Self.maxIndex)
-    let diagnosticsEngine = DiagnosticsEngine()
-    let buildRecord = BuildRecordInfo.mock(
-      diagnosticEngine: diagnosticsEngine,
-      outputFileMap: outputFileMap,
-      compilerVersion: "Swift 99")
+
     try originalGraph.blockingConcurrentMutation {
       try originalGraph.write(
         to: mockPath, on: fs,

diff --git a/Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift b/Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift
@@ -73,29 +73,6 @@ private func checkExplicitModuleBuildJobDependencies(job: Job,
                                                      moduleInfo : ModuleInfo,
                                                      dependencyGraph: InterModuleDependencyGraph
 ) throws {
-  var validateModuleMapCommandLineDependency: (ModuleDependencyId, ModuleInfo) throws -> Void = { dependencyId, dependencyInfo in
-    // Load the dependency JSON and verify this dependency was encoded correctly
-    let explicitDepsFlag =
-      SwiftDriver.Job.ArgTemplate.flag(String("-explicit-swift-module-map-file"))
-    XCTAssert(job.commandLine.contains(explicitDepsFlag))
-    let jsonDepsPathIndex = job.commandLine.firstIndex(of: explicitDepsFlag)
-    let jsonDepsPathArg = job.commandLine[jsonDepsPathIndex! + 1]
-    guard case .path(let jsonDepsPath) = jsonDepsPathArg else {
-      XCTFail("No JSON dependency file path found.")
-      return
-    }
-    guard case let .temporaryWithKnownContents(_, contents) = jsonDepsPath else {
-      XCTFail("Unexpected path type")
-      return
-    }
-    let dependencyInfoList = try JSONDecoder().decode(Array<SwiftModuleArtifactInfo>.self,
-                                                      from: contents)
-    let dependencyArtifacts =
-      dependencyInfoList.first(where:{ $0.moduleName == dependencyId.moduleName })
-    XCTAssertEqual(dependencyArtifacts!.modulePath, dependencyInfo.modulePath)
-  }
-
-
   let validateSwiftCommandLineDependency: (ModuleDependencyId, ModuleInfo) -> Void = { dependencyId, dependencyInfo in
     let inputModulePath = dependencyInfo.modulePath.path
     XCTAssertTrue(job.inputs.contains(TypedVirtualPath(file: inputModulePath, type: .swiftModule)))

diff --git a/Tests/SwiftDriverTests/SwiftDriverTests.swift b/Tests/SwiftDriverTests/SwiftDriverTests.swift
@@ -6863,8 +6863,8 @@ final class SwiftDriverTests: XCTestCase {
       let jobs = try driver.planBuild().removingAutolinkExtractJobs()
       XCTAssertEqual(jobs.count, 2)
       let (compileJob, linkJob) = (jobs[0], jobs[1])
-      compileJob.commandLine.contains(.flag("--gcc-toolchain=foo/as/blarpy"))
-      linkJob.commandLine.contains(.flag("--gcc-toolchain=foo/as/blarpy"))
+      XCTAssert(compileJob.commandLine.contains(.flag("--gcc-toolchain=foo/as/blarpy")))
+      XCTAssert(linkJob.commandLine.contains(.flag("--gcc-toolchain=foo/as/blarpy")))
   }
 
   func testPluginPaths() throws {