Use a different file name for the test product's entry point main function.

Author: grynspan

Sources/Build/BuildManifest/LLBuildManifestBuilder.swift

@@ -266,8 +266,9 @@ extension LLBuildManifestBuilder {
 
             let outputs = testEntryPointTarget.target.sources.paths
 
-            guard let mainOutput = (outputs.first { $0.basename == TestEntryPointTool.mainFileName }) else {
-                throw InternalError("main output (\(TestEntryPointTool.mainFileName)) not found")
+            let mainFileName = TestEntryPointTool.mainFileName(for: buildParameters.testingParameters.library)
+            guard let mainOutput = (outputs.first { $0.basename == mainFileName }) else {
+                throw InternalError("main output (\(mainFileName)) not found")
             }
             let cmdName = mainOutput.pathString
             self.manifest.addTestEntryPointCmd(

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -200,15 +200,22 @@ final class TestDiscoveryCommand: CustomLLBuildCommand, TestBuildCommand {
     }
 }
 
+extension TestEntryPointTool {
+    public static func mainFileName(for library: BuildParameters.Testing.Library) -> String {
+        "runner-\(library).swift"
+    }
+}
+
 final class TestEntryPointCommand: CustomLLBuildCommand, TestBuildCommand {
     private func execute(fileSystem: Basics.FileSystem, tool: TestEntryPointTool) throws {
         let outputs = tool.outputs.compactMap { try? AbsolutePath(validating: $0.name) }
 
         // Find the main output file
+        let mainFileName = TestEntryPointTool.mainFileName(for: self.context.buildParameters.testingParameters.library)
         guard let mainFile = outputs.first(where: { path in
-            path.basename == TestEntryPointTool.mainFileName
+            path.basename == mainFileName
         }) else {
-            throw InternalError("main file output (\(TestEntryPointTool.mainFileName)) not found")
+            throw InternalError("main file output (\(mainFileName)) not found")
         }
 
         // Write the main file.

Sources/Build/BuildPlan/BuildPlan+Test.swift

@@ -106,7 +106,8 @@ extension BuildPlan {
             /// point API and leverages the test discovery target to reference which tests to run.
             func generateSynthesizedEntryPointTarget(discoveryTarget: SwiftTarget, discoveryResolvedTarget: ResolvedTarget) throws -> SwiftTargetBuildDescription {
                 let entryPointDerivedDir = buildParameters.buildPath.appending(components: "\(testProduct.name).derived")
-                let entryPointMainFile = entryPointDerivedDir.appending(component: TestEntryPointTool.mainFileName)
+                let entryPointMainFileName = TestEntryPointTool.mainFileName(for: buildParameters.testingParameters.library)
+                let entryPointMainFile = entryPointDerivedDir.appending(component: entryPointMainFileName)
                 let entryPointSources = Sources(paths: [entryPointMainFile], root: entryPointDerivedDir)
 
                 let entryPointTarget = SwiftTarget(

Sources/LLBuildManifest/Tools.swift

@@ -63,7 +63,6 @@ public struct TestDiscoveryTool: ToolProtocol {
 
 public struct TestEntryPointTool: ToolProtocol {
     public static let name: String = "test-entry-point-tool"
-    public static let mainFileName: String = "runner.swift"
 
     public var inputs: [Node]
     public var outputs: [Node]