Skip to content

Commit f28eed9

Browse files
committed
Tests: mostly repair the SwiftDriverTests on Windows
With this set of changes, we are now down to 1 failure on the SwiftDriverTests on Windows. While we are not near the original state of tests on Windows (the full test suite used to pass), this is a step in the right direction.
1 parent 569b684 commit f28eed9

File tree

2 files changed

+90
-50
lines changed

2 files changed

+90
-50
lines changed

Sources/SwiftDriver/Toolchains/Toolchain.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ extension Toolchain {
222222
let path = lookupExecutablePath(filename: executableName(executable), currentWorkingDirectory: nil, searchPaths: [toolDir]) {
223223
// Looking for tools from the tools directory.
224224
return path
225-
} else if let path = lookupExecutablePath(filename: executableName(executable), currentWorkingDirectory: nil, searchPaths: [try executableDir]) {
225+
} else if let path = lookupExecutablePath(filename: executableName(executable), currentWorkingDirectory: fileSystem.currentWorkingDirectory, searchPaths: [try executableDir]) {
226226
return path
227227
} else if let path = try? xcrunFind(executable: executableName(executable)) {
228228
return path

0 commit comments

Comments
 (0)