Revert "Add SwiftBuild coverage support (#9162)"

Sources/Commands/SwiftTestCommand.swift

@@ -14,7 +14,6 @@ import ArgumentParser
 
 @_spi(SwiftPMInternal)
 import Basics
-import struct Basics.Triple
 
 import _Concurrency
 
@@ -598,11 +597,7 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
         for product in testProducts {
             // Export the codecov data as JSON.
             let jsonPath = productsBuildParameters.codeCovAsJSONPath(packageName: rootManifest.displayName)
-            try await exportCodeCovAsJSON(
-                to: jsonPath,
-                testBinary: product.binaryPath,
-                swiftCommandState: swiftCommandState,
-            )
+            try await exportCodeCovAsJSON(to: jsonPath, testBinary: product.binaryPath, swiftCommandState: swiftCommandState)
         }
     }
 
@@ -624,6 +619,7 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
             }
         }
         args += ["-o", productsBuildParameters.codeCovDataFile.pathString]
+
         try await AsyncProcess.checkNonZeroExit(arguments: args)
     }
 
@@ -636,17 +632,11 @@ public struct SwiftTestCommand: AsyncSwiftCommand {
         // Export using the llvm-cov tool.
         let llvmCov = try swiftCommandState.getTargetToolchain().getLLVMCov()
         let (productsBuildParameters, _) = try swiftCommandState.buildParametersForTest(options: self.options)
-        let archArgs: [String] = if let arch = productsBuildParameters.triple.llvmCovArchArgument {
-            ["--arch", "\(arch)"]
-        } else {
-            []
-        }
         let args = [
             llvmCov.pathString,
             "export",
             "-instr-profile=\(productsBuildParameters.codeCovDataFile)",
-        ] + archArgs + [
-            testBinary.pathString,
+            testBinary.pathString
         ]
         let result = try await AsyncProcess.popen(arguments: args)
 
@@ -719,21 +709,6 @@ extension SwiftTestCommand {
     }
 }
 
-fileprivate extension Triple {
-    var llvmCovArchArgument: String? {
-        guard let arch = self.arch else {
-            return nil
-        }
-        switch arch {
-        case .aarch64:
-            // Apple platforms uses arm64
-            return self.isApple() ? "arm64" : "aarch64"
-        default:
-            return "\(arch)"
-        }
-    }
-}
-
 extension SwiftTestCommand {
     struct Last: SwiftCommand {
         @OptionGroup(visibility: .hidden)

Sources/SwiftBuildSupport/SwiftBuildSystem.swift

@@ -1109,9 +1109,8 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
 
     private static func constructTestingSettingsOverrides(from parameters: BuildParameters.Testing) -> [String: String] {
         var settings: [String: String] = [:]
-
-        // Coverage settings
-        settings["CLANG_COVERAGE_MAPPING"] = parameters.enableCodeCoverage ? "YES" : "NO"
+        // TODO: enableCodeCoverage
+        // explicitlyEnabledTestability
 
         switch parameters.explicitlyEnabledTestability {
         case true:

Sources/_InternalTestSupport/SwiftTesting+TraitsBug.swift

@@ -54,13 +54,6 @@ extension Trait where Self == Testing.Bug {
         )
     }
 
-    public static var IssueWindowsPathTestsFailures: Self {
-        .issue(
-            "https://github.com/swiftlang/swift-package-manager/issues/8511",
-            relationship: .defect,
-        )
-    }
-
     public static var IssueWindowsCannotSaveAttachment: Self {
         // error: unable to write file 'C:\Users\ContainerAdministrator\AppData\Local\Temp\CFamilyTargets_CDynamicLookup.hNxGHC\CFamilyTargets_CDynamicLookup\.build\x86_64-unknown-windows-msvc\Intermediates.noindex\CDynamicLookup.build\Release-windows\CDynamicLookup.build\Objects-normal\x86_64\CDynamicLookup.LinkFileList': No such file or directory (2)
         .issue(

Tests/BasicsTests/FileSystem/PathTests.swift

@@ -43,7 +43,6 @@ struct PathTests {
         }
 
         @Test(
-            .IssueWindowsPathTestsFailures,
             arguments: [
                 (path: "/ab/cd/ef/", expected: (windows ? #"\ab\cd\ef"# : "/ab/cd/ef"), label: "Trailing path seperator"),
                 (path: "/ab/cd/ef//", expected: (windows ? #"\ab\cd\ef"# : "/ab/cd/ef"), label: "Trailing path seperator"),
@@ -111,7 +110,6 @@ struct PathTests {
             }
 
             @Test(
-                .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "/./a", expected: (windows ? #"\"# : "/")),
                     (path: "/../..", expected: (windows ? #"\"# : "/")),
@@ -145,7 +143,6 @@ struct PathTests {
             }
 
             @Test(
-                .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "/../..", expected: "/"),
                 ]
@@ -181,7 +178,6 @@ struct PathTests {
             }
 
             @Test(
-                .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "/../..", expected:  "/"),
                 ]
@@ -208,7 +204,6 @@ struct PathTests {
                 #expect(actual == expectedPath)
             }
             @Test(
-                .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "/", numParentDirectoryCalls: 1, expected: "/"),
                     (path: "/", numParentDirectoryCalls: 2, expected: "/"),
@@ -220,7 +215,6 @@ struct PathTests {
             }
 
             @Test(
-                .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "/bar/../foo/..//", numParentDirectoryCalls: 2, expected: "/"),
                     (path: "/bar/../foo/..//yabba/a/b", numParentDirectoryCalls: 2, expected: "/yabba")
@@ -237,7 +231,6 @@ struct PathTests {
         }
 
         @Test(
-            .IssueWindowsPathTestsFailures,
             arguments: [
                 (path: "/", expected: ["/"]),
                 (path: "/.", expected: ["/"]),
@@ -375,7 +368,6 @@ struct PathTests {
         }
 
         @Test(
-            .IssueWindowsPathTestsFailures,
             arguments: [
                 (path: "ab//cd//ef", expected: (windows ? #"ab\cd\ef"# : "ab/cd/ef"), label: "repeated path seperators"),
                 (path: "ab//cd///ef", expected: (windows ? #"ab\cd\ef"# : "ab/cd/ef"), label: "repeated path seperators"),
@@ -448,8 +440,7 @@ struct PathTests {
             }
 
             @Test(
-             .IssueWindowsPathTestsFailures,
-               arguments: [
+                arguments: [
                     (path: "../a/..", expected: "."),
                     (path: "a/..", expected: "."),
                     (path: "a/../////../////./////", expected: "."),
@@ -490,7 +481,6 @@ struct PathTests {
             }
 
             @Test(
-                .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "a/..", expected:  "."),
                     (path: "a/../////../////./////", expected:  ".."),
@@ -529,7 +519,6 @@ struct PathTests {
             }
 
             @Test(
-            .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "../..", expected:  ".."),
                     (path: "../a/..", expected:  ".."),
@@ -571,8 +560,7 @@ struct PathTests {
             }
 
             @Test(
-             .IssueWindowsPathTestsFailures,
-               arguments:[
+                arguments:[
                     "a.",
                     ".a",
                     "",
@@ -613,7 +601,6 @@ struct PathTests {
             }
 
             @Test(
-            .IssueWindowsPathTestsFailures,
                 arguments: [
                     (path: "foo/bar/..", expected: ["foo"]),
                     (path: "bar/../foo", expected: ["foo"]),
@@ -635,22 +622,21 @@ struct PathTests {
             }
         }
 
-        @Test(
-            .IssueWindowsPathTestsFailures,
-        )
+        @Test
         func relativePathValidation() throws {
             #expect(throws: Never.self) { 
                 try RelativePath(validating: "a/b/c/d")
             }
 
-            withKnownIssue("https://github.com/swiftlang/swift-package-manager/issues/8511: \\") {
+            withKnownIssue {
                 #expect {try RelativePath(validating: "/a/b/d")} throws: { error in
                     ("\(error)" == "invalid relative path '/a/b/d'; relative path should not begin with '/'")
                 }
             } when: {
                 ProcessInfo.hostOperatingSystem == .windows
             }
         }
+
     }
 
     @Test

Tests/BasicsTests/HTTPClientTests.swift

@@ -259,8 +259,11 @@ struct HTTPClientTests {
         var request = HTTPClient.Request(method: .get, url: "http://test")
         request.options.validResponseCodes = [200]
 
-        await #expect(throws: HTTPClientError.badResponseStatusCode(statusCode)) {
-            try await httpClient.execute(request)
+        do {
+            let response = try await httpClient.execute(request)
+            Issue.record("unexpected success \(response)")
+        } catch {
+            #expect(error as? HTTPClientError == .badResponseStatusCode(statusCode))
         }
     }
 
@@ -404,8 +407,11 @@ struct HTTPClientTests {
         var request = HTTPClient.Request(url: "http://test")
         request.options.maximumResponseSizeInBytes = 10
 
-        await #expect(throws: HTTPClientError.responseTooLarge(maxSize * 2)) {
-            try await httpClient.execute(request)
+        do {
+            let response = try await httpClient.execute(request)
+            Issue.record("unexpected success \(response)")
+        } catch {
+            #expect(error as? HTTPClientError == .responseTooLarge(maxSize * 2))
         }
     }
 

Tests/BuildTests/PluginsBuildPlanTests.swift

@@ -28,7 +28,7 @@ struct PluginsBuildPlanTests {
         .tags(
             .Feature.Command.Build,
         ),
-        .IssueWindowsPathTestsFailures,  // Fails to build the project to due to incorrect Path handling
+        .issue("https://github.com/swiftlang/swift-package-manager/issues/8511", relationship: .defect), // Fails to build the project to due to incorrect Path handling
         arguments: BuildConfiguration.allCases,
     )
     func buildToolsDatabasePath(