diff --git a/Sources/_InternalTestSupport/XCTAssertHelpers.swift b/Sources/_InternalTestSupport/XCTAssertHelpers.swift index 33ad7eac963..b558a0692bf 100644 --- a/Sources/_InternalTestSupport/XCTAssertHelpers.swift +++ b/Sources/_InternalTestSupport/XCTAssertHelpers.swift @@ -101,6 +101,13 @@ public func XCTRequires( } } +public func XCTSkipIfCompilerLessThan6_2() throws { + #if compiler(>=6.2) + #else + throw XCTSkip("Skipping as compiler version is less thann 6.2") + #endif +} + /// An `async`-friendly replacement for `XCTAssertThrowsError`. public func XCTAssertAsyncThrowsError( _ expression: @autoclosure () async throws -> T, diff --git a/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift b/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift index a327711979d..0a550e24fe0 100644 --- a/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift +++ b/Tests/WorkspaceTests/ManifestSourceGenerationTests.swift @@ -796,7 +796,7 @@ final class ManifestSourceGenerationTests: XCTestCase { } func testStrictMemorySafety() async throws { - try XCTSkipOnWindows(because: "compilation error: type 'SwiftSetting' has no member 'strictMemorySafety'") + try XCTSkipIfCompilerLessThan6_2() let manifestContents = """ // swift-tools-version:6.2 @@ -865,7 +865,7 @@ final class ManifestSourceGenerationTests: XCTestCase { } func testDefaultIsolation() async throws { - try XCTSkipOnWindows(because: "there are compilation errors") + try XCTSkipOnWindows(because: "https://github.com/swiftlang/swift-package-manager/issues/8543: there are compilation errors") let manifest = Manifest.createRootManifest( displayName: "pkg", diff --git a/Tests/WorkspaceTests/WorkspaceTests.swift b/Tests/WorkspaceTests/WorkspaceTests.swift index c79f5dee0f8..15180376160 100644 --- a/Tests/WorkspaceTests/WorkspaceTests.swift +++ b/Tests/WorkspaceTests/WorkspaceTests.swift @@ -16145,8 +16145,6 @@ final class WorkspaceTests: XCTestCase { } func testInvalidTrait_WhenParentPackageEnablesTraits() async throws { - try XCTSkipOnWindows(because: #"\tmp\ws doesn't exist in file system"#) - let sandbox = AbsolutePath("/tmp/ws/") let fs = InMemoryFileSystem() @@ -16208,8 +16206,6 @@ final class WorkspaceTests: XCTestCase { } func testInvalidTraitConfiguration_ForRootPackage() async throws { - try XCTSkipOnWindows(because: #"\tmp\ws doesn't exist in file system"#) - let sandbox = AbsolutePath("/tmp/ws/") let fs = InMemoryFileSystem()