Augment the suites to run against release/debug and native/SwiftBuild

Author: bkhouri

Tests/FunctionalTests/ModuleMapTests.swift

@@ -19,7 +19,10 @@ import _InternalTestSupport
 import Workspace
 import Testing
 
+import struct SPMBuildCore.BuildSystemProvider
+
 @Suite(
+    .serialized, // crash occurs when executed in parallel. needs investigation
     .tags(
         .FunctionalArea.ModuleMaps,
     ),
@@ -29,14 +32,15 @@ struct ModuleMapsTestCase {
         name: String,
         cModuleName: String,
         rootpkg: String,
+        buildSystem: BuildSystemProvider.Kind,
         config: BuildConfiguration,
         body: @escaping (AbsolutePath, [String]) async throws -> Void
     ) async throws {
         try await fixture(name: name) { fixturePath in
             let input = fixturePath.appending(components: cModuleName, "C", "foo.c")
-            let triple = try UserToolchain.default.targetTriple
-            let outdir = fixturePath.appending(components: rootpkg, ".build", triple.platformBuildPathComponent, "\(config)")
+            let outdir = try fixturePath.appending(components: [rootpkg] + buildSystem.binPath(for: config))
             try makeDirectories(outdir)
+            let triple = try UserToolchain.default.targetTriple
             let output = outdir.appending("libfoo\(triple.dynamicLibraryExtension)")
             try await AsyncProcess.checkNonZeroExit(args: executableName("clang"), "-shared", input.pathString, "-o", output.pathString)
 
@@ -50,53 +54,67 @@ struct ModuleMapsTestCase {
     }
 
     @Test(
-        arguments: BuildConfiguration.allCases,
+        arguments: getBuildData(for: SupportedBuildSystemOnAllPlatforms),
     )
     func directDependency(
-        configuration: BuildConfiguration,
+        buildData: BuildData,
     ) async throws {
+        let configuration = buildData.config
+        let buildSystem = buildData.buildSystem
         try await withKnownIssue(isIntermittent: true) {
-            try await localFixture(name: "ModuleMaps/Direct", cModuleName: "CFoo", rootpkg: "App", config: configuration) { fixturePath, Xld in
-                await #expect(throws: Never.self) {
-                    try await executeSwiftBuild(
-                        fixturePath.appending("App"),
-                        configuration: configuration,
-                        Xld: Xld,
-                        buildSystem: .native,
-                    )
-                }
+            try await localFixture(
+                name: "ModuleMaps/Direct",
+                cModuleName: "CFoo",
+                rootpkg: "App",
+                buildSystem: buildSystem,
+                config: configuration,
+            ) { fixturePath, Xld in
+                try await executeSwiftBuild(
+                    fixturePath.appending("App"),
+                    configuration: configuration,
+                    Xld: Xld,
+                    buildSystem: buildSystem,
+                )
 
-                let triple = try UserToolchain.default.targetTriple
+                let executable = try fixturePath.appending(components: ["App"] + buildSystem.binPath(for: configuration) + ["App"])
                 let releaseout = try await AsyncProcess.checkNonZeroExit(
-                    args: fixturePath.appending(components: "App", ".build", triple.platformBuildPathComponent, "\(configuration)", "App").pathString
+                    args: executable.pathString
                 )
                 #expect(releaseout == "123\n")
             }
         } when: {
             ProcessInfo.hostOperatingSystem == .windows
+            || (buildSystem == .swiftbuild && configuration == .release)
         }
     }
 
     @Test(
-        arguments: BuildConfiguration.allCases,
+        .serialized, // crash occurs when executed in parallel. needs investigation
+        arguments: getBuildData(for: SupportedBuildSystemOnAllPlatforms),
     )
     func transitiveDependency(
-        configuration: BuildConfiguration,
+        buildData: BuildData,
     ) async throws {
+        let configuration = buildData.config
+        let buildSystem = buildData.buildSystem
         try await withKnownIssue(isIntermittent: true) {
-            try await localFixture(name: "ModuleMaps/Transitive", cModuleName: "packageD", rootpkg: "packageA", config: configuration) { fixturePath, Xld in
-                await #expect(throws: Never.self) {
-                    try await executeSwiftBuild(
-                        fixturePath.appending("packageA"),
-                        configuration: configuration,
-                        Xld: Xld,
-                        buildSystem: .native,
-                    )
-                }
+            try await localFixture(
+                name: "ModuleMaps/Transitive",
+                cModuleName: "packageD",
+                rootpkg: "packageA",
+                buildSystem: buildSystem,
+                config: configuration,
+            ) { fixturePath, Xld in
+                try await executeSwiftBuild(
+                    fixturePath.appending("packageA"),
+                    configuration: configuration,
+                    Xld: Xld,
+                    buildSystem: buildSystem,
+                )
 
-                let triple = try UserToolchain.default.targetTriple
+                let executable = try fixturePath.appending(components: ["packageA"] + buildSystem.binPath(for: configuration) + ["packageA"])
                 let out = try await AsyncProcess.checkNonZeroExit(
-                    args: fixturePath.appending(components: "packageA", ".build", triple.platformBuildPathComponent, "\(configuration)", "packageA").pathString
+                    args: executable.pathString
                 )
                 #expect(out == """
                     calling Y.bar()
@@ -108,6 +126,7 @@ struct ModuleMapsTestCase {
             }
         } when: {
             ProcessInfo.hostOperatingSystem == .windows
+            || (buildSystem == .swiftbuild && configuration == .release)
         }
     }
 }