Merge branch 'main' into fix-test-issues

# Conflicts:
#	Tests/SWBBuildSystemTests/BuildOperationTests.swift

Author: MojtabaHs

Sources/SWBTestSupport/BuildOperationTester.swift

@@ -1342,7 +1342,7 @@ package final class BuildOperationTester {
     }
 
     /// Construct the build description for the given build parameters, and check it.
-    @discardableResult package func checkBuildDescription<T>(_ parameters: BuildParameters? = nil, runDestination: SWBProtocol.RunDestinationInfo? = .macOS, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, workspaceContext: WorkspaceContext? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildDescriptionResults) async throws -> T) async throws -> T {
+    @discardableResult package func checkBuildDescription<T>(_ parameters: BuildParameters? = nil, runDestination: SWBProtocol.RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, workspaceContext: WorkspaceContext? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildDescriptionResults) async throws -> T) async throws -> T {
         let parameters = effectiveBuildParameters(parameters, runDestination: runDestination)
 
         let clientDelegate = clientDelegate ?? self.clientDelegate
@@ -1422,12 +1422,12 @@ package final class BuildOperationTester {
     }
 
     /// Construct the tasks for the given build parameters, and test the result.
-    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: SWBProtocol.RunDestinationInfo? = .macOS, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T) async throws -> T {
+    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: SWBProtocol.RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T) async throws -> T {
         try await checkBuild(name, parameters: parameters, runDestination: runDestination, buildRequest: inputBuildRequest, buildCommand: buildCommand, schemeCommand: schemeCommand, persistent: persistent, serial: serial, buildOutputMap: buildOutputMap, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs, clientDelegate: clientDelegate, sourceLocation: sourceLocation, body: body, performBuild: { await $0.buildWithTimeout() })
     }
 
     /// Construct the tasks for the given build parameters, and test the result.
-    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo? = .macOS, buildRequest inputBuildRequest: BuildRequest? = nil, operationBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T, performBuild: @escaping (any BuildSystemOperation) async throws -> Void) async throws -> T {
+    @discardableResult package func checkBuild<T>(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, operationBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, sourceLocation: SourceLocation = #_sourceLocation, body: (BuildResults) async throws -> T, performBuild: @escaping (any BuildSystemOperation) async throws -> Void) async throws -> T {
         try await checkBuildDescription(parameters, runDestination: runDestination, buildRequest: inputBuildRequest, buildCommand: buildCommand, schemeCommand: schemeCommand, persistent: persistent, serial: serial, signableTargets: signableTargets, signableTargetInputs: signableTargetInputs, clientDelegate: clientDelegate) { results throws in
             // Check that there are no duplicate task identifiers - it is a fatal error if there are, unless `continueBuildingAfterErrors` is set.
             var tasksByTaskIdentifier: [TaskIdentifier: Task] = [:]
@@ -1511,7 +1511,7 @@ package final class BuildOperationTester {
     }
 
     /// Ensure that the build is a null build.
-    package func checkNullBuild(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo? = .macOS, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, excludedTasks: Set<String> = ["ClangStatCache", "LinkAssetCatalogSignature"], diagnosticsToValidate: Set<DiagnosticKind> = [.note, .error, .warning], sourceLocation: SourceLocation = #_sourceLocation) async throws {
+    package func checkNullBuild(_ name: String? = nil, parameters: BuildParameters? = nil, runDestination: RunDestinationInfo?, buildRequest inputBuildRequest: BuildRequest? = nil, buildCommand: BuildCommand? = nil, schemeCommand: SchemeCommand? = .launch, persistent: Bool = false, serial: Bool = false, buildOutputMap: [String:String]? = nil, signableTargets: Set<String> = [], signableTargetInputs: [String: ProvisioningTaskInputs] = [:], clientDelegate: (any ClientDelegate)? = nil, excludedTasks: Set<String> = ["ClangStatCache", "LinkAssetCatalogSignature"], diagnosticsToValidate: Set<DiagnosticKind> = [.note, .error, .warning], sourceLocation: SourceLocation = #_sourceLocation) async throws {
 
         func body(results: BuildResults) throws -> Void {
             results.consumeTasksMatchingRuleTypes(excludedTasks)
@@ -1615,7 +1615,7 @@ package final class BuildOperationTester {
         let operationParameters = buildRequest.parameters.replacing(activeRunDestination: runDestination, activeArchitecture: nil)
         let operationBuildRequest = buildRequest.with(parameters: operationParameters, buildTargets: [])
 
-        return try await checkBuild(buildRequest: buildRequest, operationBuildRequest: operationBuildRequest, persistent: persistent, sourceLocation: sourceLocation, body: body, performBuild: { await $0.buildWithTimeout() })
+        return try await checkBuild(runDestination: nil, buildRequest: buildRequest, operationBuildRequest: operationBuildRequest, persistent: persistent, sourceLocation: sourceLocation, body: body, performBuild: { await $0.buildWithTimeout() })
     }
 
     package struct BuildGraphResult: Sendable {

Tests/SWBBuildSystemPerfTests/ClangExplicitModulesPerfTests.swift

@@ -109,10 +109,10 @@ fileprivate struct ClangExplicitModulesPerfTests: CoreBasedTests, PerfTests {
             }
 
             try await measure {
-                try await tester.checkBuild(persistent: true) { results in
+                try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                     results.checkNoDiagnostics()
                 }
-                try await tester.checkBuild(buildCommand: BuildCommand.cleanBuildFolder(style: .regular), body: { _ in })
+                try await tester.checkBuild(runDestination: .macOS, buildCommand: BuildCommand.cleanBuildFolder(style: .regular), body: { _ in })
             }
         }
     }
@@ -206,7 +206,7 @@ fileprivate struct ClangExplicitModulesPerfTests: CoreBasedTests, PerfTests {
             }
 
             try await measure {
-                try await tester.checkBuild(persistent: true) { results in
+                try await tester.checkBuild(runDestination: .macOS, persistent: true) { results in
                     results.checkNoDiagnostics()
                 }
                 try tester.fs.touch(tmpDirPath.join("Test/aProject/file-\((0..<numSources).randomElement()!).m"))

Tests/SWBBuildSystemPerfTests/DependencyValidatorPerfTests.swift

@@ -63,10 +63,10 @@ fileprivate struct DependencyValidatorPerfTests: CoreBasedTests, PerfTests {
                     }
                 }
 
-                let parameters = BuildParameters(action: .build, configuration: "Debug", activeRunDestination: .macOS)
+                let parameters = BuildParameters(action: .build, configuration: "Debug")
                 let buildRequest = BuildRequest(parameters: parameters, buildTargets: tester.workspace.allTargets.map { BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }, dependencyScope: .workspace, continueBuildingAfterErrors: true, useParallelTargets: false, useImplicitDependencies: true, useDryRun: false)
 
-                try await tester.checkBuild(parameters: parameters, buildRequest: buildRequest) { results in
+                try await tester.checkBuild(parameters: parameters, runDestination: .macOS, buildRequest: buildRequest) { results in
                     results.checkTasks(.matchRuleItem("SwiftDriver")) { tasks in
                         #expect(tasks.count == targets.count)
                     }

Tests/SWBBuildSystemPerfTests/ModulesVerifierPerfTests.swift

@@ -99,7 +99,7 @@ fileprivate struct ModulesVerifierPerfTests: CoreBasedTests, PerfTests {
                 "ENABLE_MODULE_VERIFIER": verify ? "YES" : "NO",
             ])
 
-            try await tester.checkBuild(parameters: params, serial: true) { results in
+            try await tester.checkBuild(parameters: params, runDestination: .macOS, serial: true) { results in
             }
 
             let filesToTouch = [srcRoot.join("PublicHeader.h"), srcRoot.join("PrivateHeader.h")]
@@ -109,7 +109,7 @@ fileprivate struct ModulesVerifierPerfTests: CoreBasedTests, PerfTests {
                     for file in filesToTouch {
                         try tester.fs.touch(file)
                     }
-                    try await tester.checkBuild(parameters: params, serial: true) { results in
+                    try await tester.checkBuild(parameters: params, runDestination: .macOS, serial: true) { results in
                     }
                 }
             }

Tests/SWBBuildSystemPerfTests/SwiftDriverPerfTests.swift

@@ -89,12 +89,12 @@ fileprivate struct SwiftDriverPerfTests: CoreBasedTests, PerfTests {
             for _ in 0..<Config.iterations {
 
                 do {
-                    try await tester.checkBuild(buildRequest: buildRequest, serial: true) { results in
+                    try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, serial: true) { results in
                         resultsCheck(results)
                     }
 
                     if clean {
-                        try await tester.checkBuild(buildCommand: BuildCommand.cleanBuildFolder(style: .regular), body: { _ in })
+                        try await tester.checkBuild(runDestination: .macOS, buildCommand: BuildCommand.cleanBuildFolder(style: .regular), body: { _ in })
                     }
                 } catch {
                     Issue.record("Can't test build: \(error)")
@@ -157,13 +157,13 @@ fileprivate struct SwiftDriverPerfTests: CoreBasedTests, PerfTests {
             let tester = try await BuildOperationTester(getCore(), testWorkspace, simulated: false)
             let parameters = BuildParameters(configuration: "Debug")
             let buildRequest = BuildRequest(parameters: parameters, buildTargets: tester.workspace.projects[0].targets.map({ BuildRequest.BuildTargetInfo(parameters: parameters, target: $0) }), dependencyScope: .workspace, continueBuildingAfterErrors: true, useParallelTargets: true, useImplicitDependencies: false, useDryRun: false)
-            try await tester.checkBuild(buildRequest: buildRequest, persistent: true) { results in
+            try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                 results.checkNoDiagnostics()
             }
-            try await tester.checkNullBuild()
+            try await tester.checkNullBuild(runDestination: .macOS)
             try await measure {
                 try localFS.touch(SRCROOT.join(filenames.randomElement()))
-                try await tester.checkBuild(buildRequest: buildRequest, persistent: true) { results in
+                try await tester.checkBuild(runDestination: .macOS, buildRequest: buildRequest, persistent: true) { results in
                     results.checkNoDiagnostics()
                 }
             }

Tests/SWBBuildSystemTests/AppIntentsNLTrainingTests.swift

@@ -144,8 +144,8 @@ fileprivate struct AppIntentsNLTrainingTests: CoreBasedTests {
                     """
             }
 
-            let parameters = BuildParameters(action: .install, configuration: "Debug", activeRunDestination: .iOS)
-            try await tester.checkBuild(parameters: parameters) { results in
+            let parameters = BuildParameters(action: .install, configuration: "Debug")
+            try await tester.checkBuild(parameters: parameters, runDestination: .iOS) { results in
                 results.checkNoErrors()
             }
         }

Tests/SWBBuildSystemTests/AppShortcutsStringsValidationTests.swift

@@ -91,7 +91,7 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
                     """
             }
 
-            try await tester.checkBuild(parameters: parameters) { results in
+            try await tester.checkBuild(parameters: parameters, runDestination: .macOS) { results in
                 results.checkError(.contains("Couldn't parse property list because the input data was in an invalid format"))
                 results.checkWarning(.contains("Unable to find extract.actionsdata in '--input-data-path' directory path"))
                 results.checkError(.contains("Command ValidateAppShortcutStringsMetadata failed."))
@@ -197,7 +197,7 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
             let metadataFolderPath = "\(SRCROOT)/build/UninstalledProducts/macosx/testTarget.bundle/Contents/Resources/Metadata.appintents"
 
             // Check that there is 1 error per invalid line
-            try await tester.checkBuild(parameters: parameters) { results in
+            try await tester.checkBuild(parameters: parameters, runDestination: .macOS) { results in
                 results.checkTask(.matchRuleType("ValidateAppShortcutStringsMetadata")) { task in
                     let executableName = task.commandLine.first
                     if let executableName,
@@ -227,7 +227,7 @@ fileprivate struct AppShortcutsStringsValidationTests: CoreBasedTests {
                     """
             }
 
-            try await tester.checkBuild(parameters: parameters) { results in
+            try await tester.checkBuild(parameters: parameters, runDestination: .macOS) { results in
                 results.checkWarning(.contains("This phrase is not used in any App Shortcut or as a Negative Phrase."))
                 results.checkNoErrors()
             }

Tests/SWBBuildSystemTests/AppleScriptTests.swift

@@ -78,7 +78,7 @@ fileprivate struct AppleScriptTests: CoreBasedTests {
 
             let provisioningInputs = ["App": ProvisioningTaskInputs(identityHash: "-", signedEntitlements: .plDict([:]), simulatedEntitlements: .plDict([:]))]
 
-            try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
+            try await tester.checkBuild(parameters: BuildParameters(configuration: "Debug"), runDestination: .macOS, signableTargets: Set(provisioningInputs.keys), signableTargetInputs: provisioningInputs) { results in
                 // Check that the delegate was passed build started and build ended events in the right place.
                 results.checkCapstoneEvents()
                 results.checkTask(.matchRuleType("CodeSign")) { _ in }