Remove default run destination argument from build description tests

This makes it more obvious that a test is targeting the macOS platform, and makes our test infrastructure slightly less Apple-centric by ceasing to encode an implicit assumption of a default platform.

Author: jakepetroules

Sources/SWBTestSupport/BuildDescriptionBasedTests.swift

@@ -31,7 +31,7 @@ extension BuildDescription {
 /// Category for tests which need to use BuildDescription objects.
 extension CoreBasedTests {
     // This should be private, but is public to work around a compiler bug: rdar://108924001 (Unexpected missing symbol in tests (optimizer issue?))
-    package func buildGraph(for workspaceContext: WorkspaceContext, buildRequestContext: BuildRequestContext, configuration: String = "Debug", activeRunDestination: RunDestinationInfo? = .macOS, overrides: [String: String] = [:], useImplicitDependencies: Bool = false, dependencyScope: DependencyScope = .workspace, fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool) async -> TargetBuildGraph {
+    package func buildGraph(for workspaceContext: WorkspaceContext, buildRequestContext: BuildRequestContext, configuration: String = "Debug", activeRunDestination: RunDestinationInfo?, overrides: [String: String] = [:], useImplicitDependencies: Bool = false, dependencyScope: DependencyScope = .workspace, fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool) async -> TargetBuildGraph {
         // Create a fake build request to build all targets.
         let parameters = BuildParameters(configuration: configuration, activeRunDestination: activeRunDestination, overrides: overrides)
         let buildTargets = workspaceContext.workspace.projects.flatMap{ project in
@@ -45,7 +45,7 @@ extension CoreBasedTests {
         return await TargetBuildGraph(workspaceContext: workspaceContext, buildRequest: buildRequest, buildRequestContext: buildRequestContext)
     }
 
-    package func planRequest(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo? = .macOS, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool) async throws -> BuildPlanRequest {
+    package func planRequest(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo?, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool) async throws -> BuildPlanRequest {
         // Create a workspace context.
         let workspaceContext = try await WorkspaceContext(core: getCore(), workspace: workspace, fs: fs, processExecutionCache: .sharedForTesting)
 
@@ -69,12 +69,12 @@ extension CoreBasedTests {
         return BuildPlanRequest(workspaceContext: buildGraph.workspaceContext, buildRequest: buildGraph.buildRequest, buildRequestContext: buildRequestContext, buildGraph: buildGraph, provisioningInputs: provisioningInputs)
     }
 
-    package func buildDescription(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo? = .macOS, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool = { _ in true }) async throws -> (BuildDescription, WorkspaceContext) {
+    package func buildDescription(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo?, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool = { _ in true }) async throws -> (BuildDescription, WorkspaceContext) {
         let tuple: (BuildDescriptionDiagnosticResults, WorkspaceContext) = try await buildDescription(for: workspace, configuration: configuration, activeRunDestination: activeRunDestination, overrides: overrides, fs: fs, includingTargets: predicate)
         return (tuple.0.buildDescription, tuple.1)
     }
 
-    @_disfavoredOverload package func buildDescription(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo? = .macOS, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool = { _ in true }) async throws -> (BuildDescriptionDiagnosticResults, WorkspaceContext) {
+    @_disfavoredOverload package func buildDescription(for workspace: Workspace, configuration: String = "Debug", activeRunDestination: RunDestinationInfo?, overrides: [String: String] = [:], fs: any FSProxy = PseudoFS(), includingTargets predicate: (Target) -> Bool = { _ in true }) async throws -> (BuildDescriptionDiagnosticResults, WorkspaceContext) {
         let planRequest = try await self.planRequest(for: workspace, configuration: configuration, activeRunDestination: activeRunDestination, overrides: overrides, fs: fs, includingTargets: predicate)
         let delegate = MockTestBuildDescriptionConstructionDelegate()
         guard let results = try await BuildDescriptionManager.constructBuildDescription(planRequest, signature: "", inDirectory: .root, fs: fs, bypassActualTasks: true, clientDelegate: MockTestTaskPlanningClientDelegate(), constructionDelegate: delegate).map({ BuildDescriptionDiagnosticResults(buildDescription: $0, workspace: workspace) }) ?? nil else {

Tests/SWBTaskExecutionTests/BuildDescriptionTests.swift

@@ -110,7 +110,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let taskActionRegistry = try await TaskActionRegistry(pluginManager: core.pluginManager)
 
             let fs1 = PseudoFS()
-            let (description1, _) = try await buildDescription(for: workspace1, fs: fs1)
+            let (description1, _) = try await buildDescription(for: workspace1, activeRunDestination: .macOS, fs: fs1)
             let manifest1Contents = try fs1.read(description1.manifestPath).bytes
             let serialized1 = { () -> ByteString in
                 let serializer = MsgPackSerializer(delegate: BuildDescriptionSerializerDelegate(taskActionRegistry: taskActionRegistry))
@@ -122,7 +122,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             for _ in 0 ..< 10 {
                 let workspace2 = try await testWorkspace.load(getCore())
                 let fs2 = PseudoFS()
-                let (description2, _) = try await buildDescription(for: workspace2, fs: fs2)
+                let (description2, _) = try await buildDescription(for: workspace2, activeRunDestination: .macOS, fs: fs2)
 
                 #expect(description1.targetDependencies == description2.targetDependencies)
 
@@ -200,7 +200,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let workspace1 = try await testWorkspace.load(getCore())
 
             let fs1 = PseudoFS()
-            let (results, _) = try await buildDescription(for: workspace1, fs: fs1) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace1, activeRunDestination: .macOS, fs: fs1) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
 
             let interestingDiagnostics = results.errors.filter({ message -> Bool in
                 message.hasPrefix("Multiple commands produce")
@@ -319,7 +319,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let tester = try await TaskConstructionTester(getCore(), project)
             let fs1 = PseudoFS()
             let (results, _) =
-            try await buildDescription(for: tester.workspace, overrides: ["PACKAGE_BUILD_DYNAMICALLY": "YES"], fs: fs1)
+            try await buildDescription(for: tester.workspace, activeRunDestination: .macOS, overrides: ["PACKAGE_BUILD_DYNAMICALLY": "YES"], fs: fs1)
             as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             let interestingDiagnostics = results.errors.filter({ message -> Bool in
                 message.hasPrefix("Multiple commands produce")
@@ -365,7 +365,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
                 await deferrable.addBlock { await manager.waitForBuildDescriptionSerialization() }
 
                 func check(fs: any FSProxy, expected: [String], expectedSource: BuildDescriptionRetrievalSource) async throws {
-                    let planRequest = try await self.planRequest(for: workspace, fs: fs, includingTargets: { _ in true })
+                    let planRequest = try await self.planRequest(for: workspace, activeRunDestination: .macOS, fs: fs, includingTargets: { _ in true })
                     let info = try await manager.getNewOrCachedBuildDescription(planRequest, clientDelegate: MockTestTaskPlanningClientDelegate())!
                     #expect(info.source == expectedSource)
 
@@ -434,7 +434,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
-            let (results, _) = try await buildDescription(for: workspace) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace, activeRunDestination: .macOS) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             results.checkNoDiagnostics()
         }
     }
@@ -472,7 +472,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
-            let (results, _) = try await buildDescription(for: workspace) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace, activeRunDestination: .macOS) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             results.checkNoDiagnostics()
         }
     }
@@ -510,7 +510,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
-            let (results, _) = try await buildDescription(for: workspace) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace, activeRunDestination: .macOS) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             #expect(results.errors.isEmpty, "Unexpected errors in build description: \(results.errors)")
             #expect(results.warnings == ["None of the architectures in ARCHS (foo) are valid. Consider setting ARCHS to $(ARCHS_STANDARD) or updating it to include at least one value from VALID_ARCHS (bar). (in target \'NoArchs\' from project 'aProject')"])
         }
@@ -547,7 +547,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
-            let (results, _) = try await buildDescription(for: workspace) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace, activeRunDestination: .macOS) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             #expect(results.errors.isEmpty, "Unexpected errors in build description: \(results.errors)")
             #expect(results.warnings == ["None of the architectures in ARCHS (foo) are valid. Consider setting ARCHS to $(ARCHS_STANDARD) or updating it to include at least one value from VALID_ARCHS (bar). (in target \'NoArchs\' from project 'aProject')"])
         }
@@ -585,7 +585,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
-            let (results, _) = try await buildDescription(for: workspace) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace, activeRunDestination: .macOS) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             #expect(results.errors.isEmpty, "Unexpected errors in build description: \(results.errors)")
             #expect(results.warnings == ["The active architecture (foo) is not valid - it is the only architecture considered because ONLY_ACTIVE_ARCH is enabled. Consider setting ARCHS to $(ARCHS_STANDARD) or updating it to include at least one value from VALID_ARCHS (bar). (in target \'NoArchs\' from project 'aProject')"])
         }
@@ -621,7 +621,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
-            let (results, _) = try await buildDescription(for: workspace) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace, activeRunDestination: .macOS) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             #expect(results.errors.isEmpty, "Unexpected errors in build description: \(results.errors)")
             #expect(results.warnings == ["There are no architectures to compile for because the VALID_ARCHS build setting is an empty list. (in target \'NoArchs\' from project 'aProject')"])
         }
@@ -657,7 +657,7 @@ fileprivate struct BuildDescriptionTests: CoreBasedTests {
             let testWorkspace = TestWorkspace("aWorkspace", sourceRoot: tmpDirPath, projects: [testProject])
             let workspace = try await testWorkspace.load(getCore())
 
-            let (results, _) = try await buildDescription(for: workspace) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
+            let (results, _) = try await buildDescription(for: workspace, activeRunDestination: .macOS) as (BuildDescriptionDiagnosticResults, WorkspaceContext)
             #expect(results.errors.isEmpty, "Unexpected errors in build description: \(results.errors)")
             #expect(results.warnings == ["There are no architectures to compile for because the ARCHS build setting is an empty list. Consider setting ARCHS to $(ARCHS_STANDARD) or updating it to include at least one value from VALID_ARCHS (bar). (in target \'NoArchs\' from project 'aProject')"])
         }

Tests/SWBTaskExecutionTests/StaleFileRemovalTests.swift

@@ -174,7 +174,7 @@ fileprivate struct StaleFileRemovalTests: CoreBasedTests {
                             for sanitizer in sanitizers {
                                 overrides[sanitizer.settingName] = "YES"
                             }
-                            let planRequest = try await self.planRequest(for: workspace, configuration: configuration, overrides: overrides, fs: fs, includingTargets: { _ in true })
+                            let planRequest = try await self.planRequest(for: workspace, configuration: configuration, activeRunDestination: .macOS, overrides: overrides, fs: fs, includingTargets: { _ in true })
                             let delegate = MockTestBuildDescriptionConstructionDelegate()
                             let _ = try await manager.getNewOrCachedBuildDescription(planRequest, clientDelegate: MockTestTaskPlanningClientDelegate(), constructionDelegate: delegate)!