Tests: Augment Command Tests

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/.gitignore

@@ -0,0 +1,8 @@
+.DS_Store
+/.build
+/Packages
+xcuserdata/
+DerivedData/
+.swiftpm/configuration/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Package.swift

@@ -0,0 +1,56 @@
+// swift-tools-version: 6.1
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "ExecutableTargetWhen",
+    products: [
+        .executable(
+            name: "test",
+            targets: ["ExecutableTargetWhen"]
+        )
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package, defining a module or a test suite.
+        // Targets can depend on other targets in this package and products from dependencies.
+        .executableTarget(
+            name: "ExecutableTargetWhen",
+            dependencies: [
+                .target(name:"LinuxOnly", condition: .when(platforms:[.linux])),
+                .target(name:"MacOSOnly", condition: .when(platforms:[.macOS])),
+                .target(name:"WindowsOnly", condition: .when(platforms:[.windows])),
+                .target(name:"AllPlatforms")
+            ]
+        ),
+        .target(
+            name: "AllPlatforms"
+        ),
+        .target(
+            name: "LinuxOnly",
+            dependencies: [
+                "CLibArchive",
+                "AllPlatforms"
+            ]
+        ),
+        .target(
+            name: "MacOSOnly",
+            dependencies: [
+                "AllPlatforms"
+            ]
+        ),
+        .target(
+            name: "WindowsOnly",
+            dependencies: [
+                "AllPlatforms"
+            ]
+        ),
+        .systemLibrary(
+            name: "CLibArchive",
+            pkgConfig: "libarchive",
+            providers: [
+                .apt(["libarchive-dev"]),
+            ]
+        ),
+    ]
+)

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Sources/AllPlatforms/AllPlatforms.swift

@@ -0,0 +1,20 @@
+public func getPlatform() throws -> String {
+    #if os(Windows)
+    return "Windows"
+    #else
+        #if os(macOS)
+        return "macOS"
+        #else
+            #if os(linux)
+                return "Linux"
+            #else
+                return "Unknown platform"
+            #endif
+        #endif
+    #endif
+}
+
+
+public protocol MyProtocol {
+    static var name: String { get }
+}

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Sources/CLibArchive/module.modulemap

@@ -0,0 +1,5 @@
+module CLibArchive [system] {
+    header "shim.h"
+    link "archive"
+    export *
+}

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Sources/CLibArchive/shim.h

@@ -0,0 +1,2 @@
+#include "archive.h"
+#include "archive_entry.h"

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Sources/ExecutableTargetWhen/main.swift

@@ -0,0 +1,19 @@
+// The Swift Programming Language
+// https://docs.swift.org/swift-book
+
+import AllPlatforms
+
+#if os(Windows)
+    import WindowsOnly
+#else
+    #if os(macOS)
+    import MacOSOnly
+    #else
+        #if os(linux)
+        import LinuxOnly
+        #endif
+    #endif
+#endif
+
+let platform = try getPlatform()
+print("Hello, world on \(platform)!  OSplatform: \(OSPlatform.name)")

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Sources/LinuxOnly/Linux.swift

@@ -0,0 +1,11 @@
+import CLibArchive
+
+import AllPlatforms
+
+public struct OSPlatform: MyProtocol {
+
+    public static var name: String {
+        return "Linux"
+    }
+
+}

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Sources/MacOSOnly/MacOS.swift

@@ -0,0 +1,8 @@
+import AllPlatforms
+public struct OSPlatform: MyProtocol {
+
+    public static var name: String {
+        return "macOS"
+    }
+
+}

Fixtures/Miscellaneous/TargetConditionals/ExecutableTargetContainsPlatformConditional/Sources/WindowsOnly/Windows.swift

@@ -0,0 +1,9 @@
+import AllPlatforms
+
+public struct OSPlatform: MyProtocol {
+
+    public static var name: String {
+        return "Windows"
+    }
+
+}

IntegrationTests/Tests/IntegrationTests/SwiftPMTests.swift

@@ -57,11 +57,25 @@ final class SwiftPMTests: XCTestCase {
         #endif
 
         // Test SwiftBuildSystem
-        try withTemporaryDirectory { tmpDir in
-            let packagePath = tmpDir.appending(component: "foo")
-            try localFileSystem.createDirectory(packagePath)
-            try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "executable")
-            try sh(swiftBuild, "--package-path", packagePath, "--build-system", "swiftbuild")
+        do {
+            try withTemporaryDirectory { tmpDir in
+                let packagePath = tmpDir.appending(component: "foo")
+                try localFileSystem.createDirectory(packagePath)
+                try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "executable")
+                try sh(swiftBuild, "--package-path", packagePath, "--build-system", "swiftbuild")
+                let (stdout, stderr)  = try sh(swiftRun, "--package-path", packagePath, "--build-system", "swiftbuild")
+                XCTAssertMatch(stdout, .contains("Hello, world!"))
+            }
+        }
+
+        do {
+            try withTemporaryDirectory { tmpDir in
+                let packagePath = tmpDir.appending(component: "foo")
+                try localFileSystem.createDirectory(packagePath)
+                try sh(swiftPackage, "--package-path", packagePath, "init", "--type", "library")
+                try sh(swiftBuild, "--package-path", packagePath, "--build-system", "swiftbuild")
+                try sh(swiftTest, "--package-path", packagePath, "--build-system", "swiftbuild")
+            }
         }
     }
 

Sources/SPMBuildCore/BuildSystem/BuildSystem.swift

@@ -191,3 +191,16 @@ public enum BuildSystemUtilities {
         return try AbsolutePath(validating: env, relativeTo: workingDir)
     }
 }
+
+
+extension BuildSystemProvider.Kind {
+
+    public var useXcodeBuildSystemPath: Bool {
+        switch self {
+            case .native: return false
+            case .swiftbuild: return true
+            case .xcode: return true
+        }
+    }
+
+}

Sources/SwiftBuildSupport/SwiftBuildSystem.swift

@@ -242,6 +242,8 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
 
         do {
             try await withSession(service: service, name: buildParameters.pifManifest.pathString) { session, _ in
+                self.outputStream.send("Building for \(self.buildParameters.configuration == .debug ? "debugging" : "production")...\n")
+
                 // Load the workspace, and set the system information to the default
                 do {
                     try await session.loadWorkspace(containerPath: self.buildParameters.pifManifest.pathString)

Sources/_InternalTestSupport/misc.swift

@@ -117,6 +117,10 @@ public func testWithTemporaryDirectory<Result>(
     }
 }
 
+public enum TestError: Error {
+    case platformNotSupported
+}
+
 @discardableResult public func fixture<T>(
     name: String,
     createGitRepo: Bool = true,
@@ -252,7 +256,7 @@ public func getBuildSystemArgs(for buildSystem: BuildSystemProvider.Kind?) -> [S
 
 @discardableResult
 public func executeSwiftBuild(
-    _ packagePath: AbsolutePath,
+    _ packagePath: AbsolutePath?,
     configuration: Configuration = .Debug,
     extraArgs: [String] = [],
     Xcc: [String] = [],
@@ -274,8 +278,8 @@ public func executeSwiftBuild(
 
 @discardableResult
 public func executeSwiftRun(
-    _ packagePath: AbsolutePath,
-    _ executable: String,
+    _ packagePath: AbsolutePath?,
+    _ executable: String?,
     configuration: Configuration = .Debug,
     extraArgs: [String] = [],
     Xcc: [String] = [],
@@ -292,13 +296,15 @@ public func executeSwiftRun(
         Xswiftc: Xswiftc,
         buildSystem: buildSystem
     )
-    args.append(executable)
+    if let executable {
+        args.append(executable)
+    }
     return try await SwiftPM.Run.execute(args, packagePath: packagePath, env: env)
 }
 
 @discardableResult
 public func executeSwiftPackage(
-    _ packagePath: AbsolutePath,
+    _ packagePath: AbsolutePath?,
     configuration: Configuration = .Debug,
     extraArgs: [String] = [],
     Xcc: [String] = [],
@@ -320,7 +326,7 @@ public func executeSwiftPackage(
 
 @discardableResult
 public func executeSwiftPackageRegistry(
-    _ packagePath: AbsolutePath,
+    _ packagePath: AbsolutePath?,
     configuration: Configuration = .Debug,
     extraArgs: [String] = [],
     Xcc: [String] = [],
@@ -342,13 +348,14 @@ public func executeSwiftPackageRegistry(
 
 @discardableResult
 public func executeSwiftTest(
-    _ packagePath: AbsolutePath,
+    _ packagePath: AbsolutePath?,
     configuration: Configuration = .Debug,
     extraArgs: [String] = [],
     Xcc: [String] = [],
     Xld: [String] = [],
     Xswiftc: [String] = [],
     env: Environment? = nil,
+    throwIfCommandFails: Bool = false,
     buildSystem: BuildSystemProvider.Kind = .native
 ) async throws -> (stdout: String, stderr: String) {
     let args = swiftArgs(
@@ -359,7 +366,7 @@ public func executeSwiftTest(
         Xswiftc: Xswiftc,
         buildSystem: buildSystem
     )
-    return try await SwiftPM.Test.execute(args, packagePath: packagePath, env: env)
+    return try await SwiftPM.Test.execute(args, packagePath: packagePath, env: env, throwIfCommandFails: throwIfCommandFails)
 }
 
 private func swiftArgs(

Tests/CommandsTests/APIDiffTests.swift

@@ -13,6 +13,7 @@
 import Basics
 import Build
 import Commands
+import SPMBuildCore
 
 @_spi(SwiftPMInternal)
 import DriverSupport
@@ -24,7 +25,11 @@ import _InternalTestSupport
 import Workspace
 import XCTest
 
-final class APIDiffTests: CommandsTestCase {
+class APIDiffTestCase: CommandsBuildProviderTestCase {
+    override func setUpWithError() throws {
+        try XCTSkipIf(type(of: self) == APIDiffTestCase.self, "Pay no attention to the class behind the curtain.")
+    }
+
     @discardableResult
     private func execute(
         _ args: [String],
@@ -34,7 +39,12 @@ final class APIDiffTests: CommandsTestCase {
         var environment = env ?? [:]
         // don't ignore local packages when caching
         environment["SWIFTPM_TESTS_PACKAGECACHE"] = "1"
-        return try await SwiftPM.Package.execute(args, packagePath: packagePath, env: environment)
+        return try await executeSwiftPackage(
+            packagePath,
+            extraArgs: args,
+            env: environment,
+            buildSystem: buildSystemProvider
+        )
     }
 
     func skipIfApiDigesterUnsupportedOrUnset() throws {
@@ -449,3 +459,26 @@ final class APIDiffTests: CommandsTestCase {
         }
     }
 }
+
+class APIDiffNativeTests: APIDiffTestCase {
+
+    override open var buildSystemProvider: BuildSystemProvider.Kind {
+        return .native
+    }
+
+    override func skipIfApiDigesterUnsupportedOrUnset() throws {
+        try super.skipIfApiDigesterUnsupportedOrUnset()
+    }
+
+}
+
+class APIDiffSwiftBuildTests: APIDiffTestCase {
+
+    override open var buildSystemProvider: BuildSystemProvider.Kind {
+        return .swiftbuild
+    }
+
+    override func skipIfApiDigesterUnsupportedOrUnset() throws {
+        try super.skipIfApiDigesterUnsupportedOrUnset()
+    }
+}