diff --git a/Sources/SKTestSupport/SwiftPMDependencyProject.swift b/Sources/SKTestSupport/SwiftPMDependencyProject.swift index 496834c5c..e0f38f2aa 100644 --- a/Sources/SKTestSupport/SwiftPMDependencyProject.swift +++ b/Sources/SKTestSupport/SwiftPMDependencyProject.swift @@ -22,8 +22,13 @@ import struct TSCBasic.ProcessResult /// A SwiftPM package that gets written to disk and for which a Git repository is initialized with a commit tagged /// `1.0.0`. This repository can then be used as a dependency for another package, usually a `SwiftPMTestProject`. public class SwiftPMDependencyProject { + /// The scratch directory created for the dependency project. + public let scratchDirectory: URL + /// The directory in which the repository lives. - public let packageDirectory: URL + public var packageDirectory: URL { + return scratchDirectory.appendingPathComponent("MyDependency") + } private func runGitCommand(_ arguments: [String], workingDirectory: URL) async throws { enum Error: Swift.Error { @@ -66,7 +71,7 @@ public class SwiftPMDependencyProject { manifest: String = defaultPackageManifest, testName: String = #function ) async throws { - packageDirectory = try testScratchDir(testName: testName).appendingPathComponent("MyDependency") + scratchDirectory = try testScratchDir(testName: testName) var files = files files["Package.swift"] = manifest @@ -94,7 +99,7 @@ public class SwiftPMDependencyProject { deinit { if cleanScratchDirectories { - try? FileManager.default.removeItem(at: packageDirectory) + try? FileManager.default.removeItem(at: scratchDirectory) } } diff --git a/Tests/SourceKitLSPTests/IndexTests.swift b/Tests/SourceKitLSPTests/IndexTests.swift index c5ae0d14a..52be924a0 100644 --- a/Tests/SourceKitLSPTests/IndexTests.swift +++ b/Tests/SourceKitLSPTests/IndexTests.swift @@ -120,6 +120,7 @@ final class IndexTests: XCTestCase { 2️⃣foo() } """, + workspaceDirectory: workspaceDirectory, cleanUp: cleanUp )