diff --git a/Tests/IntegrationTests/BasicTests.swift b/Tests/IntegrationTests/BasicTests.swift index d0239106903..97f541de5b9 100644 --- a/Tests/IntegrationTests/BasicTests.swift +++ b/Tests/IntegrationTests/BasicTests.swift @@ -69,7 +69,7 @@ private struct BasicTests { #expect(dealerOutput.filter(\.isPlayingCardSuit).count == 10) // Verify that the 'git status' is clean after a build. - let gitOutput = try sh("git\(ProcessInfo.exeSuffix)", "status", workingDirectory: packagePath).stdout + let gitOutput = try sh("git\(ProcessInfo.exeSuffix)", "-C", packagePath, "status").stdout #expect(gitOutput.contains("nothing to commit, working tree clean")) // Verify that another 'swift build' does nothing. diff --git a/Tests/SwiftPMBuildServerTests/BuildServerTests.swift b/Tests/SwiftPMBuildServerTests/BuildServerTests.swift index 832de0137bc..a1f8992dc6f 100644 --- a/Tests/SwiftPMBuildServerTests/BuildServerTests.swift +++ b/Tests/SwiftPMBuildServerTests/BuildServerTests.swift @@ -41,8 +41,7 @@ fileprivate func withSwiftPMBSP(fixtureName: String, body: (Connection, Notifica bspProcess.standardInput = outPipe let execPath = SwiftPM.xctestBinaryPath(for: "swift-package").pathString bspProcess.executableURL = URL(filePath: execPath) - bspProcess.arguments = ["experimental-build-server", "--build-system", "swiftbuild"] - bspProcess.currentDirectoryURL = URL(filePath: fixture.pathString) + bspProcess.arguments = ["--package-path", fixture.pathString, "experimental-build-server", "--build-system", "swiftbuild"] async let terminationPromise: Void = try await bspProcess.run() let notificationCollector = NotificationCollectingMessageHandler() connection.start(receiveHandler: notificationCollector)