Merge pull request swiftlang#1767 from ahoppen/no-isdbtestsupport

Remove dependency on ISDBTestSupport
ahoppen · Oct 17, 2024 · c71471a · c71471a
2 parents 5eff39c + ee1fc93
commit c71471a
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 12 deletions.
diff --git a/Package.swift b/Package.swift
@@ -307,7 +307,6 @@ let package = Package(
         "SourceKitLSP",
         "SwiftExtensions",
         "ToolchainRegistry",
-        .product(name: "ISDBTestSupport", package: "indexstore-db"),
         .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
       ],
       resources: [.copy("INPUTS")],
@@ -384,7 +383,6 @@ let package = Package(
         "SourceKitLSP",
         "ToolchainRegistry",
         .product(name: "IndexStoreDB", package: "indexstore-db"),
-        .product(name: "ISDBTestSupport", package: "indexstore-db"),
         .product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
         // Depend on `SwiftCompilerPlugin` and `SwiftSyntaxMacros` so the modules are built before running tests and can
         // be used by test cases that test macros (see `SwiftPMTestProject.macroPackageManifest`)

diff --git a/Sources/SKTestSupport/BuildServerTestProject.swift b/Sources/SKTestSupport/BuildServerTestProject.swift
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import ISDBTestSupport
 import XCTest
 
 fileprivate let sdkArgs =
@@ -37,7 +36,8 @@ private let skTestSupportInputsDirectory: URL = {
     resources.deleteLastPathComponent()
   }
   #else
-  let resources = XCTestCase.productsDirectory
+  let resources =
+    productsDirectory
     .appendingPathComponent("SourceKitLSP_SKTestSupport.resources")
   #endif
   guard FileManager.default.fileExists(atPath: resources.path) else {

diff --git a/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift b/Tests/BuildSystemIntegrationTests/BuildServerBuildSystemTests.swift
@@ -13,7 +13,6 @@
 import BuildServerProtocol
 import BuildSystemIntegration
 import Foundation
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKSupport
 import SKTestSupport

diff --git a/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift b/Tests/BuildSystemIntegrationTests/LegacyBuildServerBuildSystemTests.swift
@@ -13,7 +13,6 @@
 import BuildServerProtocol
 import BuildSystemIntegration
 import Foundation
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKSupport
 import SKTestSupport

diff --git a/Tests/SourceKitDTests/CrashRecoveryTests.swift b/Tests/SourceKitDTests/CrashRecoveryTests.swift
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKLogging
 import SKSupport

diff --git a/Tests/SourceKitDTests/SourceKitDTests.swift b/Tests/SourceKitDTests/SourceKitDTests.swift
@@ -12,7 +12,6 @@
 
 import Csourcekitd
 import Foundation
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKSupport
 import SKTestSupport

diff --git a/Tests/SourceKitLSPTests/CallHierarchyTests.swift b/Tests/SourceKitLSPTests/CallHierarchyTests.swift
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKTestSupport
 import TSCBasic

diff --git a/Tests/SourceKitLSPTests/ImplementationTests.swift b/Tests/SourceKitLSPTests/ImplementationTests.swift
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKTestSupport
 import TSCBasic

diff --git a/Tests/SourceKitLSPTests/SwiftInterfaceTests.swift b/Tests/SourceKitLSPTests/SwiftInterfaceTests.swift
@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKLogging
 import SKSupport

diff --git a/Tests/SourceKitLSPTests/TypeHierarchyTests.swift b/Tests/SourceKitLSPTests/TypeHierarchyTests.swift
@@ -10,7 +10,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-import ISDBTestSupport
 import LanguageServerProtocol
 import SKTestSupport
 import TSCBasic