Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Commit fe3b3fb

Browse files
manually check for a .exe
canExecute does not guarantee an executable file, and will find java.dll before java.exe on Windows
1 parent b8ded66 commit fe3b3fb

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/main/scala/scala/tools/partest/PartestDefaults.scala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ object PartestDefaults {
2525
import scala.reflect.io.Path, Path._
2626
Some(Path(jdkHome) / "bin") filter (_.isDirectory) flatMap { p =>
2727
val candidates = (p walkFilter { e => (e.name == name || e.name.startsWith(s"$name.")) && e.jfile.canExecute }).toList
28-
(candidates find (_.name == name) orElse candidates.headOption) map (_.path)
28+
val plain = candidates find (_.name == name)
29+
val exe = candidates find (_.name == s"${name}.exe")
30+
(plain orElse exe orElse candidates.headOption).map(_.path)
2931
}
3032
}
3133
}

0 commit comments

Comments
 (0)