Tests: Update test expectation - take 2

bkhouri · bkhouri · commit a206392725db · 2025-07-14T21:01:15.000-04:00
Update test expectation for executing SwiftPM tests using the build.ps1 script found in swiftlang/swift/utils/build.ps1. Relates to: swiftlang/swift#80405
diff --git a/Tests/CommandsTests/RunCommandTests.swift b/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)
         }
     }
 
diff --git a/Tests/CommandsTests/TestCommandTests.swift b/Tests/CommandsTests/TestCommandTests.swift
@@ -239,7 +239,8 @@ struct TestCommandTests {
             }
         } when: {
             (buildSystem == .swiftbuild && .linux == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
-            || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
+            // || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)
+            || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem )
         }
     }
 
diff --git a/Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift b/Tests/PackageLoadingTests/PD_6_2_LoadingTests.swift
@@ -86,7 +86,7 @@ struct PackageDescription6_2LoadingTests {
                 results.checkIsEmpty()
             }
         } when: {
-            isWindows
+            isWindows && !CiEnvironment.runningInSmokeTestPipeline
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,9 @@ struct RunCommandTests {`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`@Test(`
`402`		`- .bug("https://github.com/swiftlang/swift-package-manager/issues/8844"),`
	`402`	`+ .issue("https://github.com/swiftlang/swift-package-manager/issues/8844", relationship: .verifies),`
	`403`	`+ .issue("https://github.com/swiftlang/swift-package-manager/issues/8911", relationship: .defect),`
	`404`	`+ .issue("https://github.com/swiftlang/swift-package-manager/issues/8912", relationship: .defect),`
`403`	`405`	`arguments: SupportedBuildSystemOnPlatform, BuildConfiguration.allCases`
`404`	`406`	`)`
`405`	`407`	`func swiftRunQuietLogLevel(`
`@@ -423,9 +425,12 @@ struct RunCommandTests {`
`423`	`425`	`#expect(stdout == "done\n")`
`424`	`426`	`}`
`425`	`427`	`} when: {`
`426`		`- ProcessInfo.hostOperatingSystem == .linux &&`
`427`		`- buildSystem == .swiftbuild &&`
`428`		`- CiEnvironment.runningInSelfHostedPipeline`
	`428`	`+ (`
	`429`	`+ ProcessInfo.hostOperatingSystem == .linux &&`
	`430`	`+ buildSystem == .swiftbuild &&`
	`431`	`+ CiEnvironment.runningInSelfHostedPipeline`
	`432`	`+ )`
	`433`	`+ \|\| (CiEnvironment.runningInSmokeTestPipeline && ProcessInfo.hostOperatingSystem == .windows)`
`429`	`434`	`}`
`430`	`435`	`}`
`431`	`436`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,8 @@ struct TestCommandTests {`
`239`	`239`	`}`
`240`	`240`	`} when: {`
`241`	`241`	`(buildSystem == .swiftbuild && .linux == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)`
`242`		`- \|\| (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)`
	`242`	`+ // \|\| (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline)`
	`243`	`+ \|\| (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem )`
`243`	`244`	`}`
`244`	`245`	`}`
`245`	`246`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ struct PackageDescription6_2LoadingTests {`
`86`	`86`	`results.checkIsEmpty()`
`87`	`87`	`}`
`88`	`88`	`} when: {`
`89`		`- isWindows`
	`89`	`+ isWindows && !CiEnvironment.runningInSmokeTestPipeline`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`