Tests: Update expectation

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/BuildCommandTests.swift

@@ -489,18 +489,14 @@ struct BuildCommandTestCases {
                 return
             }
 
-            try withKnownIssue {
-                if .native == buildSystem {
-                    #expect(stderr.contains("error: no product named '\(productName)'"))
-                } else {
-                    let expectedErrorMessageRegex = try Regex("error: Could not find target named '\(productName).*'")
-                    #expect(
-                        stderr.contains(expectedErrorMessageRegex),
-                        "expect log not emitted.\nstdout: '\(stdout)'\n\nstderr: '\(stderr)'",
-                    )
-                }
-            } when: {
-                buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSmokeTestPipeline
+            if .native == buildSystem {
+                #expect(stderr.contains("error: no product named '\(productName)'"))
+            } else {
+                let expectedErrorMessageRegex = try Regex("error: Could not find target named '\(productName).*'")
+                #expect(
+                    stderr.contains(expectedErrorMessageRegex),
+                    "expect log not emitted.\nstdout: '\(stdout)'\n\nstderr: '\(stderr)'",
+                )
             }
         }
     }
@@ -530,14 +526,10 @@ struct BuildCommandTestCases {
             } else {
                 expectedErrorMessage = "error: Could not find target named '\(targetName)'"
             }
-            withKnownIssue{
-                #expect(
-                    stderr.contains(expectedErrorMessage),
-                    "expect log not emitted.\nstdout: '\(stdout)'\n\nstderr: '\(stderr)'",
-                )
-            } when: {
-                buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSmokeTestPipeline
-            }
+            #expect(
+                stderr.contains(expectedErrorMessage),
+                "expect log not emitted.\nstdout: '\(stdout)'\n\nstderr: '\(stderr)'",
+            )
         }
     }
 
@@ -748,7 +740,7 @@ struct BuildCommandTestCases {
                     result.stdout.contains("Building for \(expectedString)"),
                     "expect log not emitted.  got stdout: '\(result.stdout)'\n\nstderr '\(result.stderr)'")
             } when: {
-                buildSystem == .xcode || (buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSmokeTestPipeline)
+                buildSystem == .xcode
             }
         }
     }

Tests/CommandsTests/RunCommandTests.swift

@@ -129,7 +129,8 @@ struct RunCommandTests {
             }
         }
         } when: {
-            .swiftbuild == buildSystem && ProcessInfo.hostOperatingSystem == .windows
+            (.swiftbuild == buildSystem && ProcessInfo.hostOperatingSystem == .windows)
+            || (.native == buildSystem && ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSmokeTestPipeline)
         }
     }
 
@@ -168,6 +169,7 @@ struct RunCommandTests {
             }
         } when: {
             (.windows == ProcessInfo.hostOperatingSystem && buildSystem == .swiftbuild)
+            || (.windows == ProcessInfo.hostOperatingSystem && buildSystem == .native && CiEnvironment.runningInSmokeTestPipeline)
             || (.linux == ProcessInfo.hostOperatingSystem && buildSystem == .swiftbuild && CiEnvironment.runningInSelfHostedPipeline)
         }
     }
@@ -229,7 +231,8 @@ struct RunCommandTests {
             #expect(runOutput.contains("2"))
         }
         } when: {
-            [.windows, .linux].contains(ProcessInfo.hostOperatingSystem) && buildSystem == .swiftbuild && CiEnvironment.runningInSelfHostedPipeline
+            ([.windows, .linux].contains(ProcessInfo.hostOperatingSystem) && buildSystem == .swiftbuild && CiEnvironment.runningInSelfHostedPipeline)
+            || (.windows == ProcessInfo.hostOperatingSystem && [.native, .swiftbuild].contains(buildSystem) && CiEnvironment.runningInSmokeTestPipeline)
         }
     }
 
@@ -249,7 +252,7 @@ struct RunCommandTests {
                 #expect(String(outputLines[0]).contains("BTarget2"))
             }
         } when: {
-            (ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSmokeTestPipeline && buildSystem == .native)
+            (ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSmokeTestPipeline && [.native, .swiftbuild].contains(buildSystem))
             || (ProcessInfo.hostOperatingSystem ==  .linux && buildSystem == .swiftbuild && CiEnvironment.runningInSelfHostedPipeline)
         }
     }

Tests/FunctionalTests/PluginTests.swift

@@ -64,7 +64,7 @@ final class PluginTests {
                 #expect(stderr.contains("file(s) which are unhandled; explicitly declare them as resources or exclude from the target"), "expected warning not emitted")
             }
         } when: {
-            ProcessInfo.hostOperatingSystem == .windows
+            ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSelfHostedPipeline
         }
 
         // Try again with the Swift Build build system

Tests/FunctionalTests/TraitTests.swift

@@ -494,8 +494,7 @@ struct TraitTests {
             #expect(stdout.contains(expectedOut))
         }
         } when: {
-            ProcessInfo.hostOperatingSystem == .windows && CiEnvironment.runningInSmokeTestPipeline
-            || (buildSystem == .swiftbuild && [.windows].contains(ProcessInfo.hostOperatingSystem))
+            (buildSystem == .swiftbuild && [.windows].contains(ProcessInfo.hostOperatingSystem))
         }
     }
 

Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift

@@ -68,33 +68,21 @@ struct PackageDescription6_2LoadingTests {
             """
 
         let observability = ObservabilitySystem.makeForTesting()
-        try await withKnownIssue("https://github.com/swiftlang/swift-package-manager/issues/8543: there are compilation errors on Windows") {
-            let (_, validationDiagnostics) = try await PackageDescriptionLoadingTests
-                .loadAndValidateManifest(
-                    content,
-                    toolsVersion: .v6_2,
-                    packageKind: .fileSystem(.root),
-                    manifestLoader: ManifestLoader(
-                        toolchain: try! UserToolchain.default
-                    ),
-                    observabilityScope: observability.topScope
-                )
-            try expectDiagnostics(validationDiagnostics) { results in
-                results.checkIsEmpty()
-            }
-            try expectDiagnostics(observability.diagnostics) { results in
-                results.checkIsEmpty()
-            }
-        } when: {
-            isWindows
+        let (_, validationDiagnostics) = try await PackageDescriptionLoadingTests
+            .loadAndValidateManifest(
+                content,
+                toolsVersion: .v6_2,
+                packageKind: .fileSystem(.root),
+                manifestLoader: ManifestLoader(
+                    toolchain: try! UserToolchain.default
+                ),
+                observabilityScope: observability.topScope
+            )
+        try expectDiagnostics(validationDiagnostics) { results in
+            results.checkIsEmpty()
+        }
+        try expectDiagnostics(observability.diagnostics) { results in
+            results.checkIsEmpty()
         }
     }
 }
-
-private var isWindows: Bool {
-#if os(Windows)
-    true
-#else
-    false
-#endif
-}