Tests: Update test expectation - take 2

Update test expectation for executing SwiftPM tests using the build.ps1
script found in swiftlang/swift/utils/build.ps1.

Relates to: swiftlang/swift#80405

Author: bkhouri

Tests/CommandsTests/PackageCommandTests.swift

@@ -4410,6 +4410,15 @@ class PackageCommandNativeTests: PackageCommandTestCase {
     override func testNoParameters() async throws {
         try await super.testNoParameters()
     }
+
+    override func testMigrateCommandWhenDependencyBuildsForHostAndTarget() async throws {
+        try XCTSkipOnWindows(
+            because: "error: build planning stopped due to build-tool plugin failures",
+            skipPlatformCi: true,
+        )
+
+        try await super.testMigrateCommandWhenDependencyBuildsForHostAndTarget()
+    }
 }
 
 class PackageCommandSwiftBuildTests: PackageCommandTestCase {
@@ -4422,6 +4431,78 @@ class PackageCommandSwiftBuildTests: PackageCommandTestCase {
         try await super.testNoParameters()
     }
 
+    override func testMigrateCommand() async throws {
+        try XCTSkipOnWindows(
+            because: """
+            Possibly https://github.com/swiftlang/swift-package-manager/issues/8602:
+            error: Could not choose a single platform for target 'AllIncludingTests' from the supported platforms 'android qnx webassembly'. Specialization parameters imposed by workspace: platform 'nil' sdkVariant 'nil' supportedPlatforms: 'nil' toolchain: 'nil'
+            """,
+            skipPlatformCi: true,
+        )
+
+        try await super.testMigrateCommand()
+    }
+
+    override func testMigrateCommandUpdateManifest2Targets() async throws {
+        try XCTSkipOnWindows(
+            because: """
+            Possibly https://github.com/swiftlang/swift-package-manager/issues/8602:
+            error: Could not choose a single platform for target 'A' from the supported platforms 'android qnx webassembly'. Specialization parameters imposed by workspace: platform 'nil' sdkVariant 'nil' supportedPlatforms: 'nil' toolchain: 'nil'
+            """,
+            skipPlatformCi: true,
+        )
+
+        try await super.testMigrateCommandUpdateManifest2Targets()
+    }
+
+    override func testMigrateCommandUpdateManifestSingleTarget() async throws {
+        try XCTSkipOnWindows(
+            because: """
+            Possibly https://github.com/swiftlang/swift-package-manager/issues/8602:
+            error: Could not choose a single platform for target 'A' from the supported platforms 'android qnx webassembly'. Specialization parameters imposed by workspace: platform 'nil' sdkVariant 'nil' supportedPlatforms: 'nil' toolchain: 'nil'
+            """,
+            skipPlatformCi: true,
+        )
+
+        try await super.testMigrateCommandUpdateManifestSingleTarget()
+    }
+
+    override func testMigrateCommandUpdateManifestWithErrors() async throws {
+        try XCTSkipOnWindows(
+            because: """
+            Possibly https://github.com/swiftlang/swift-package-manager/issues/8602:
+            error: Could not choose a single platform for target 'A' from the supported platforms 'android qnx webassembly'. Specialization parameters imposed by workspace: platform 'nil' sdkVariant 'nil' supportedPlatforms: 'nil' toolchain: 'nil'
+            """,
+            skipPlatformCi: true,
+        )
+
+        try await super.testMigrateCommandUpdateManifestWithErrors()
+    }
+
+    override func testMigrateCommandWhenDependencyBuildsForHostAndTarget() async throws {
+        try XCTSkipOnWindows(
+            because: """
+            Possibly https://github.com/swiftlang/swift-package-manager/issues/8602:
+            error: Could not choose a single platform for target 'A' from the supported platforms 'android qnx webassembly'. Specialization parameters imposed by workspace: platform 'nil' sdkVariant 'nil' supportedPlatforms: 'nil' toolchain: 'nil'
+            """,
+            skipPlatformCi: true,
+        )
+
+        try await super.testMigrateCommandWhenDependencyBuildsForHostAndTarget()
+    }
+
+    override func testMigrateCommandWithBuildToolPlugins() async throws {
+        try XCTSkipOnWindows(
+            because: """
+            Possibly https://github.com/swiftlang/swift-package-manager/issues/8602:
+            error: Could not choose a single platform for target 'A' from the supported platforms 'android qnx webassembly'. Specialization parameters imposed by workspace: platform 'nil' sdkVariant 'nil' supportedPlatforms: 'nil' toolchain: 'nil'
+            """,
+            skipPlatformCi: true,
+        )
+
+        try await super.testMigrateCommandWithBuildToolPlugins()
+    }
+
     override func testCommandPluginSymbolGraphCallbacks() async throws {
         try XCTSkipOnWindows(because: "TSCBasic/Path.swift:969: Assertion failed, https://github.com/swiftlang/swift-package-manager/issues/8602")
         try await super.testCommandPluginSymbolGraphCallbacks()

Tests/CommandsTests/RunCommandTests.swift

@@ -399,7 +399,9 @@ struct RunCommandTests {
     }
 
     @Test(
-        .bug("https://github.com/swiftlang/swift-package-manager/issues/8844"),
+        .issue("https://github.com/swiftlang/swift-package-manager/issues/8844", relationship: .verifies),
+        .issue("https://github.com/swiftlang/swift-package-manager/issues/8911", relationship: .defect),
+        .issue("https://github.com/swiftlang/swift-package-manager/issues/8912", relationship: .defect),
         arguments: SupportedBuildSystemOnPlatform, BuildConfiguration.allCases
     )
     func swiftRunQuietLogLevel(
@@ -423,9 +425,12 @@ struct RunCommandTests {
                 #expect(stdout == "done\n")
            }
         } when: {
-            ProcessInfo.hostOperatingSystem == .linux &&
-            buildSystem == .swiftbuild &&
-            CiEnvironment.runningInSelfHostedPipeline
+            (
+                ProcessInfo.hostOperatingSystem == .linux &&
+                buildSystem == .swiftbuild &&
+                CiEnvironment.runningInSelfHostedPipeline
+            )
+            || (CiEnvironment.runningInSmokeTestPipeline && ProcessInfo.hostOperatingSystem == .windows)
         }
     }
 

Tests/CommandsTests/TestCommandTests.swift

@@ -243,7 +243,8 @@ struct TestCommandTests {
             }
         } when: {
             (buildSystem == .swiftbuild && .linux == ProcessInfo.hostOperatingSystem)
-            || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
+            // || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
+            || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem )
         }
     }
 

Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift

@@ -86,7 +86,7 @@ struct PackageDescription6_2LoadingTests {
                 results.checkIsEmpty()
             }
         } when: {
-            isWindows
+            isWindows && !CiEnvironment.runningInSmokeTestPipeline
         }
     }
 }