Make SKCoreTests build in Swift 6 mode

Author: ahoppen

Sources/SKTestSupport/WrappedSemaphore.swift

@@ -17,8 +17,8 @@ import Dispatch
 ///
 /// This should only be used for tests that test priority escalation and thus cannot await a `Task` (which would cause
 /// priority elevations).
-public struct WrappedSemaphore {
-  let semaphore = DispatchSemaphore(value: 0)
+public struct WrappedSemaphore: Sendable {
+  private let semaphore = DispatchSemaphore(value: 0)
 
   public init() {}
 

Tests/SKCoreTests/BuildServerBuildSystemTests.swift

@@ -20,34 +20,57 @@ import SKTestSupport
 import TSCBasic
 import XCTest
 
-final class BuildServerBuildSystemTests: XCTestCase {
-  /// The path to the INPUTS directory of shared test projects.
-  private static var skTestSupportInputsDirectory: URL = {
-    #if os(macOS)
-    // FIXME: Use Bundle.module.resourceURL once the fix for SR-12912 is released.
-
-    var resources = XCTestCase.productsDirectory
-      .appendingPathComponent("SourceKitLSP_SKTestSupport.bundle")
-      .appendingPathComponent("Contents")
-      .appendingPathComponent("Resources")
-    if !FileManager.default.fileExists(atPath: resources.path) {
-      // Xcode and command-line swiftpm differ about the path.
-      resources.deleteLastPathComponent()
-      resources.deleteLastPathComponent()
-    }
-    #else
-    let resources = XCTestCase.productsDirectory
-      .appendingPathComponent("SourceKitLSP_SKTestSupport.resources")
-    #endif
-    guard FileManager.default.fileExists(atPath: resources.path) else {
-      fatalError("missing resources \(resources.path)")
-    }
-    return resources.appendingPathComponent("INPUTS", isDirectory: true).standardizedFileURL
-  }()
+/// The bundle of the currently executing test.
+private let testBundle: Bundle = {
+  #if os(macOS)
+  if let bundle = Bundle.allBundles.first(where: { $0.bundlePath.hasSuffix(".xctest") }) {
+    return bundle
+  }
+  fatalError("couldn't find the test bundle")
+  #else
+  return Bundle.main
+  #endif
+}()
+
+/// The path to the built products directory.
+private let productsDirectory: URL = {
+  #if os(macOS)
+  return testBundle.bundleURL.deletingLastPathComponent()
+  #else
+  return testBundle.bundleURL
+  #endif
+}()
+
+/// The path to the INPUTS directory of shared test projects.
+private let skTestSupportInputsDirectory: URL = {
+  #if os(macOS)
+  // FIXME: Use Bundle.module.resourceURL once the fix for SR-12912 is released.
+
+  var resources =
+    productsDirectory
+    .appendingPathComponent("SourceKitLSP_SKTestSupport.bundle")
+    .appendingPathComponent("Contents")
+    .appendingPathComponent("Resources")
+  if !FileManager.default.fileExists(atPath: resources.path) {
+    // Xcode and command-line swiftpm differ about the path.
+    resources.deleteLastPathComponent()
+    resources.deleteLastPathComponent()
+  }
+  #else
+  let resources = XCTestCase.productsDirectory
+    .appendingPathComponent("SourceKitLSP_SKTestSupport.resources")
+  #endif
+  guard FileManager.default.fileExists(atPath: resources.path) else {
+    fatalError("missing resources \(resources.path)")
+  }
+  return resources.appendingPathComponent("INPUTS", isDirectory: true).standardizedFileURL
+}()
 
+final class BuildServerBuildSystemTests: XCTestCase {
   private var root: AbsolutePath {
     try! AbsolutePath(
-      validating: Self.skTestSupportInputsDirectory
+      validating:
+        skTestSupportInputsDirectory
         .appendingPathComponent(testDirectoryName, isDirectory: true).path
     )
   }

Tests/SKCoreTests/BuildSystemManagerTests.swift

@@ -88,6 +88,7 @@ final class BuildSystemManagerTests: XCTestCase {
     await assertEqual(bsm._cachedMainFile(for: d), nil)
   }
 
+  @MainActor
   func testSettingsMainFile() async throws {
     let a = try DocumentURI(string: "bsm:a.swift")
     let mainFiles = ManualMainFilesProvider([a: [a]])
@@ -112,6 +113,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([changed])
   }
 
+  @MainActor
   func testSettingsMainFileInitialNil() async throws {
     let a = try DocumentURI(string: "bsm:a.swift")
     let mainFiles = ManualMainFilesProvider([a: [a]])
@@ -134,6 +136,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([changed])
   }
 
+  @MainActor
   func testSettingsMainFileWithFallback() async throws {
     let a = try DocumentURI(string: "bsm:a.swift")
     let mainFiles = ManualMainFilesProvider([a: [a]])
@@ -164,6 +167,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([revert])
   }
 
+  @MainActor
   func testSettingsMainFileInitialIntersect() async throws {
     let a = try DocumentURI(string: "bsm:a.swift")
     let b = try DocumentURI(string: "bsm:b.swift")
@@ -205,6 +209,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([changedBothA, changedBothB])
   }
 
+  @MainActor
   func testSettingsMainFileUnchanged() async throws {
     let a = try DocumentURI(string: "bsm:a.swift")
     let b = try DocumentURI(string: "bsm:b.swift")
@@ -236,6 +241,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([changed])
   }
 
+  @MainActor
   func testSettingsHeaderChangeMainFile() async throws {
     let h = try DocumentURI(string: "bsm:header.h")
     let cpp1 = try DocumentURI(string: "bsm:main.cpp")
@@ -292,6 +298,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([changed4])
   }
 
+  @MainActor
   func testSettingsOneMainTwoHeader() async throws {
     let h1 = try DocumentURI(string: "bsm:header1.h")
     let h2 = try DocumentURI(string: "bsm:header2.h")
@@ -340,6 +347,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([changed1, changed2])
   }
 
+  @MainActor
   func testSettingsChangedAfterUnregister() async throws {
     let a = try DocumentURI(string: "bsm:a.swift")
     let b = try DocumentURI(string: "bsm:b.swift")
@@ -384,6 +392,7 @@ final class BuildSystemManagerTests: XCTestCase {
     try await fulfillmentOfOrThrow([changedB])
   }
 
+  @MainActor
   func testDependenciesUpdated() async throws {
     let a = try DocumentURI(string: "bsm:a.swift")
     let mainFiles = ManualMainFilesProvider([a: [a]])
@@ -434,6 +443,7 @@ private final actor ManualMainFilesProvider: MainFilesProvider {
 }
 
 /// A simple `BuildSystem` that wraps a dictionary, for testing.
+@MainActor
 class ManualBuildSystem: BuildSystem {
   var projectRoot = try! AbsolutePath(validating: "/")