More fixes to test path recording

Author: owenv

Sources/SPMBuildCore/BuildParameters/BuildParameters.swift

@@ -327,7 +327,11 @@ public struct BuildParameters: Encodable {
                     let base = "\(product.name).xctest"
                     return try RelativePath(validating: "\(base)/Contents/MacOS/\(product.name)")
                 } else {
-                    let base = "\(product.name)-test-runner"
+                    var base = "\(product.name)-test-runner"
+                    let ext = self.triple.executableExtension
+                    if !ext.isEmpty {
+                        base += ".\(ext)"
+                    }
                     return try RelativePath(validating: base)
                 }
             }

Sources/SPMBuildCore/BuiltTestProduct.swift

@@ -28,6 +28,10 @@ public struct BuiltTestProduct: Codable {
     /// When the test product is not bundled (for instance, when using XCTest on
     /// non-Darwin targets), this path is equal to ``binaryPath``.
     public var bundlePath: AbsolutePath {
+        // If the binary path is a test runner binary, return it as-is.
+        guard !binaryPath.basenameWithoutExt.hasSuffix("test-runner") else {
+            return binaryPath
+        }
         // Go up the folder hierarchy until we find the .xctest bundle.
         let pathExtension = ".xctest"
         let hierarchySequence = sequence(first: binaryPath, next: { $0.isRoot ? nil : $0.parentDirectory })