Gate 6.0 dependent tests with a 6.0 compiler check

IntegrationTests/Tests/IntegrationTests/BasicTests.swift

@@ -225,8 +225,8 @@ final class BasicTests: XCTestCase {
  }
 
  func testSwiftRun() throws {
- #if swift(<5.5)
- try XCTSkipIf(true, "skipping because host compiler doesn't support '-entry-point-function-name'")
+ #if swift(<6.0)
+ try XCTSkipIf(true, "Skipping because test requires at least Swift 6.0")
  #endif
 
  try withTemporaryDirectory { tempDir in

Sources/SPMTestSupport/XCTSkipHelpers.swift

@@ -0,0 +1,61 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See http://swift.org/LICENSE.txt for license information
+// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import Basics
+import PackageModel
+import RegexBuilder
+import XCTest
+
+import class TSCBasic.Process
+import struct TSCBasic.StringError
+
+extension Toolchain {
+ package func skipUnlessSwiftVersion(
+ major: Int,
+ minor: Int,
+ file: StaticString = #file,
+ line: UInt = #line
+ ) async throws {
+ let currentVersion = try await getSwiftVersion(swiftCompilerPath)
+ guard let currentVersion else {
+ throw StringError("Failed to fine Swift version for '\(swiftCompilerPath)'")
+ }
+
+ if currentVersion.major < major || currentVersion.minor < minor {
+ throw XCTSkip("""
+ Skipping because toolchain has Swift version \(currentVersion.major).\(currentVersion.minor) \
+ but test requires at least \(major).\(minor)
+ """, file: file, line: line)
+ }
+ }
+}
+
+/// Return the major and minor version of Swift for a `swiftc` compiler at `swiftcPath`.
+fileprivate func getSwiftVersion(_ swiftcPath: AbsolutePath) async throws -> (major: Int, minor: Int)? {
+ let process = Process(args: swiftcPath.pathString, "--version")
+ try process.launch()
+ let result = try await process.waitUntilExit()
+ let output = String(bytes: try result.output.get(), encoding: .utf8)
+ let regex = Regex {
+ "Swift version "
+ Capture { OneOrMore(.digit) }
+ "."
+ Capture { OneOrMore(.digit) }
+ }
+ guard let match = output?.firstMatch(of: regex) else {
+ return nil
+ }
+ guard let major = Int(match.1), let minor = Int(match.2) else {
+ return nil
+ }
+ return (major, minor)
+}

Tests/BuildTests/BuildSystemDelegateTests.swift

@@ -17,7 +17,8 @@ import XCTest
 import var TSCBasic.localFileSystem
 
 final class BuildSystemDelegateTests: XCTestCase {
- func testDoNotFilterLinkerDiagnostics() throws {
+ func testDoNotFilterLinkerDiagnostics() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
  try XCTSkipIf(!UserToolchain.default.supportsSDKDependentTests(), "skipping because test environment doesn't support this test")
  try fixture(name: "Miscellaneous/DoNotFilterLinkerDiagnostics") { fixturePath in
  #if !os(macOS)

Tests/FunctionalTests/PluginTests.swift

@@ -178,7 +178,9 @@ final class PluginTests: XCTestCase {
  }
  }
 
- func testBuildToolWithoutOutputs() throws {
+ func testBuildToolWithoutOutputs() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  // Only run the test if the environment in which we're running actually supports Swift concurrency (which the plugin APIs require).
  try XCTSkipIf(!UserToolchain.default.supportsSwiftConcurrency(), "skipping because test environment doesn't support concurrency")
 
@@ -1159,7 +1161,9 @@ final class PluginTests: XCTestCase {
  }
  }
 
- func testURLBasedPluginAPI() throws {
+ func testURLBasedPluginAPI() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  // Only run the test if the environment in which we're running actually supports Swift concurrency (which the plugin APIs require).
  try XCTSkipIf(!UserToolchain.default.supportsSwiftConcurrency(), "skipping because test environment doesn't support concurrency")
 
@@ -1169,7 +1173,9 @@ final class PluginTests: XCTestCase {
  }
  }
 
- func testDependentPlugins() throws {
+ func testDependentPlugins() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try XCTSkipIf(!UserToolchain.default.supportsSwiftConcurrency(), "skipping because test environment doesn't support concurrency")
 
  try fixture(name: "Miscellaneous/Plugins/DependentPlugins") { fixturePath in

Tests/FunctionalTests/ResourcesTests.swift

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
+import PackageModel
 import SPMTestSupport
 import XCTest
 
@@ -126,7 +127,9 @@ class ResourcesTests: XCTestCase {
  }
  }
 
- func testResourcesOutsideOfTargetCanBeIncluded() throws {
+ func testResourcesOutsideOfTargetCanBeIncluded() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try testWithTemporaryDirectory { tmpPath in
  let packageDir = tmpPath.appending(components: "MyPackage")
 

Tests/PackageLoadingTests/ManifestLoaderCacheTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift open source project
 //
-// Copyright (c) 2020-2023 Apple Inc. and the Swift project authors
+// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
@@ -22,7 +22,10 @@ import func TSCTestSupport.withCustomEnv
 
 @available(macOS 13, iOS 16, tvOS 16, watchOS 9, *)
 final class ManifestLoaderCacheTests: XCTestCase {
+
  func testDBCaching() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try await testWithTemporaryDirectory { path in
  let fileSystem = localFileSystem
  let observability = ObservabilitySystem.makeForTesting()
@@ -117,6 +120,8 @@ final class ManifestLoaderCacheTests: XCTestCase {
  }
 
  func testInMemoryCaching() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  let fileSystem = InMemoryFileSystem()
  let observability = ObservabilitySystem.makeForTesting()
 
@@ -206,6 +211,8 @@ final class ManifestLoaderCacheTests: XCTestCase {
  }
 
  func testContentBasedCaching() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try await testWithTemporaryDirectory { path in
  let manifest = """
  import PackageDescription
@@ -265,6 +272,8 @@ final class ManifestLoaderCacheTests: XCTestCase {
  }
 
  func testCacheInvalidationOnEnv() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try await testWithTemporaryDirectory { path in
  let fileSystem = InMemoryFileSystem()
  let observability = ObservabilitySystem.makeForTesting()
@@ -330,6 +339,8 @@ final class ManifestLoaderCacheTests: XCTestCase {
  }
 
  func testCacheDoNotInvalidationExpectedEnv() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try await testWithTemporaryDirectory { path in
  let fileSystem = InMemoryFileSystem()
  let observability = ObservabilitySystem.makeForTesting()
@@ -415,6 +426,8 @@ final class ManifestLoaderCacheTests: XCTestCase {
  }
 
  func testInMemoryCacheHappyCase() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  let content = """
  import PackageDescription
  let package = Package(

Tests/PackageLoadingTests/PD_6_0_LoadingTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift open source project
 //
-// Copyright (c) 2023 Apple Inc. and the Swift project authors
+// Copyright (c) 2023-2024 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
@@ -16,12 +16,14 @@ import SourceControl
 import SPMTestSupport
 import XCTest
 
-class PackageDescription6_0LoadingTests: PackageDescriptionLoadingTests {
+final class PackageDescription6_0LoadingTests: PackageDescriptionLoadingTests {
  override var toolsVersion: ToolsVersion {
  .v6_0
  }
 
  func testPackageContextGitStatus() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  let content = """
  import PackageDescription
  let package = Package(name: "\\(Context.gitInformation?.hasUncommittedChanges == true)")
@@ -34,6 +36,8 @@ class PackageDescription6_0LoadingTests: PackageDescriptionLoadingTests {
  }
 
  func testPackageContextGitTag() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  let content = """
  import PackageDescription
  let package = Package(name: "\\(Context.gitInformation?.currentTag ?? "")")
@@ -46,6 +50,8 @@ class PackageDescription6_0LoadingTests: PackageDescriptionLoadingTests {
  }
 
  func testPackageContextGitCommit() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  let content = """
  import PackageDescription
  let package = Package(name: "\\(Context.gitInformation?.currentCommit ?? "")")

Tests/WorkspaceTests/InitTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift open source project
 //
-// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors
+// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
@@ -16,7 +16,7 @@ import PackageModel
 import Workspace
 import XCTest
 
-class InitTests: XCTestCase {
+final class InitTests: XCTestCase {
 
  // MARK: TSCBasic package creation for each package type.
 
@@ -53,8 +53,10 @@ class InitTests: XCTestCase {
  XCTAssertMatch(manifestContents, .contains(packageWithNameOnly(named: name)))
  }
  }
-
- func testInitPackageExecutable() throws {
+
+ func testInitPackageExecutable() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try testWithTemporaryDirectory { tmpPath in
  let fs = localFileSystem
  let path = tmpPath.appending("Foo")
@@ -98,7 +100,9 @@ class InitTests: XCTestCase {
  }
  }
 
- func testInitPackageLibraryWithXCTestOnly() throws {
+ func testInitPackageLibraryWithXCTestOnly() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try testWithTemporaryDirectory { tmpPath in
  let fs = localFileSystem
  let path = tmpPath.appending("Foo")
@@ -148,7 +152,7 @@ class InitTests: XCTestCase {
  XCTAssertFileExists(path.appending(components: ".build", triple.platformBuildPathComponent, "debug", "Modules", "Foo.swiftmodule"))
  }
  }
- 
+
  func testInitPackageLibraryWithSwiftTestingOnly() throws {
  try testWithTemporaryDirectory { tmpPath in
  let fs = localFileSystem
@@ -235,7 +239,9 @@ class InitTests: XCTestCase {
  }
  }
 
- func testInitPackageLibraryWithNoTests() throws {
+ func testInitPackageLibraryWithNoTests() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try testWithTemporaryDirectory { tmpPath in
  let fs = localFileSystem
  let path = tmpPath.appending("Foo")
@@ -339,8 +345,9 @@ class InitTests: XCTestCase {
  }
 
  // MARK: Special case testing
-
- func testInitPackageNonc99Directory() throws {
+
+ func testInitPackageNonc99Directory() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
  try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
  XCTAssertDirectoryExists(tempDirPath)
 
@@ -367,7 +374,9 @@ class InitTests: XCTestCase {
  }
  }
 
- func testNonC99NameExecutablePackage() throws {
+ func testNonC99NameExecutablePackage() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try withTemporaryDirectory(removeTreeOnDeinit: true) { tempDirPath in
  XCTAssertDirectoryExists(tempDirPath)
 

Tests/WorkspaceTests/ManifestSourceGenerationTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift open source project
 //
-// Copyright (c) 2020-2021 Apple Inc. and the Swift project authors
+// Copyright (c) 2020-2024 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
@@ -33,8 +33,7 @@ extension String {
  }
 }
 
-class ManifestSourceGenerationTests: XCTestCase {
-
+final class ManifestSourceGenerationTests: XCTestCase {
  /// Private function that writes the contents of a package manifest to a temporary package directory and then loads it, then serializes the loaded manifest back out again and loads it once again, after which it compares that no information was lost. Return the source of the newly generated manifest.
  @discardableResult
  private func testManifestWritingRoundTrip(
@@ -591,6 +590,7 @@ class ManifestSourceGenerationTests: XCTestCase {
  }
 
  func testManifestGenerationWithSwiftLanguageVersion() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
  let manifest = Manifest.createRootManifest(
  displayName: "pkg",
  path: "/pkg",

Tests/WorkspaceTests/WorkspaceTests.swift

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift open source project
 //
-// Copyright (c) 2014-2023 Apple Inc. and the Swift project authors
+// Copyright (c) 2014-2024 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
@@ -156,6 +156,8 @@ final class WorkspaceTests: XCTestCase {
  }
 
  func testInterpreterFlags() throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  let fs = localFileSystem
 
  try testWithTemporaryDirectory { path in
@@ -5252,6 +5254,8 @@ final class WorkspaceTests: XCTestCase {
 
  // This verifies that the simplest possible loading APIs are available for package clients.
  func testSimpleAPI() async throws {
+ try await UserToolchain.default.skipUnlessSwiftVersion(major: 6, minor: 0)
+
  try await testWithTemporaryDirectory { path in
  // Create a temporary package as a test case.
  let packagePath = path.appending("MyPkg")