Skip to content

Commit c5b6cb0

Browse files
committed
cleanup use of main file for test-discovery (#3994)
motivation: small follow up cleanup to #3992 which consolidates the use of a share defintiion for the main file used for test discovery changes: use the shared defintiion for the main file name used for test discovery everywhere
1 parent c449f42 commit c5b6cb0

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Sources/Build/BuildPlan.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
*/
1010

1111
import Basics
12-
import TSCBasic
13-
import TSCUtility
14-
import PackageModel
12+
import Foundation
13+
import LLBuildManifest
1514
import PackageGraph
1615
import PackageLoading
17-
import Foundation
16+
import PackageModel
1817
import SPMBuildCore
1918
@_implementationOnly import SwiftDriver
19+
import TSCBasic
20+
import TSCUtility
2021

2122
extension String {
2223
fileprivate var asSwiftStringLiteralConstant: String {
@@ -1478,7 +1479,7 @@ public class BuildPlan {
14781479
} else {
14791480
// We'll generate sources containing the test names as part of the build process.
14801481
let derivedTestListDir = buildParameters.buildPath.appending(components: "\(testProduct.name).derived")
1481-
let mainFile = derivedTestListDir.appending(component: "runner.swift")
1482+
let mainFile = derivedTestListDir.appending(component: LLBuildManifest.TestDiscoveryTool.mainFileName)
14821483

14831484
var paths: [AbsolutePath] = []
14841485
paths.append(mainFile)

0 commit comments

Comments
 (0)