Fix once more

Author: grynspan

Sources/SPMTestSupport/SwiftPMProduct.swift

@@ -44,6 +44,10 @@ extension SwiftPM {
         }
     }
 
+    public var xctestBinaryPath: AbsolutePath {
+        Self.xctestBinaryPath(for: executableName)
+    }
+
     public static func xctestBinaryPath(for executableName: RelativePath) -> AbsolutePath {
         #if canImport(Darwin)
         for bundle in Bundle.allBundles where bundle.bundlePath.hasSuffix(".xctest") {
@@ -109,15 +113,15 @@ extension SwiftPM {
 #endif
         // FIXME: We use this private environment variable hack to be able to
         // create special conditions in swift-build for swiftpm tests.
-        environment["SWIFTPM_TESTS_MODULECACHE"] = Self.xctestBinaryPath(for: executableName).parentDirectory.pathString
+        environment["SWIFTPM_TESTS_MODULECACHE"] = xctestBinaryPath.parentDirectory.pathString
 #if !os(Windows)
         environment["SDKROOT"] = nil
 #endif
 
         // Unset the internal env variable that allows skipping certain tests.
         environment["_SWIFTPM_SKIP_TESTS_LIST"] = nil
 
-        var completeArgs = [Self.xctestBinaryPath(for: executableName).pathString]
+        var completeArgs = [xctestBinaryPath.pathString]
         if let packagePath = packagePath {
             completeArgs += ["--package-path", packagePath.pathString]
         }

Tests/CommandsTests/RunToolTests.swift

@@ -122,9 +122,8 @@ final class RunToolTests: CommandsTestCase {
 
             let sync = DispatchGroup()
             let outputHandler = OutputHandler(sync: sync)
-            let xctestBinaryPath = SwiftPM.xctestBinaryPath(for: SwiftPM.Run.executableName).pathString
             let process = Process(
-                arguments: [xctestBinaryPath, "--package-path", fixturePath.pathString],
+                arguments: [SwiftPM.Run.xctestBinaryPath.pathString, "--package-path", fixturePath.pathString],
                 outputRedirection: .stream(stdout: outputHandler.handle(bytes:), stderr: outputHandler.handle(bytes:))
             )