Skip to content

Commit 119c955

Browse files
committed
Make partest not fail over code.jar's placement.
1 parent 17a84df commit 119c955

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/partest/scala/tools/partest/nest/PathSettings.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,11 @@ object PathSettings {
4343
// Directory <root>/test/files/codelib
4444
lazy val srcCodeLibDir = Directory(srcDir / "codelib")
4545

46-
lazy val srcCodeLib: File = findJar(srcCodeLibDir, "code") getOrElse {
47-
sys.error("No code.jar found in %s".format(srcCodeLibDir))
48-
}
46+
lazy val srcCodeLib: File = (
47+
findJar(srcCodeLibDir, "code")
48+
orElse findJar(Directory(testRoot / "files" / "codelib"), "code") // work with --srcpath pending
49+
getOrElse sys.error("No code.jar found in %s".format(srcCodeLibDir))
50+
)
4951

5052
// Directory <root>/build
5153
lazy val buildDir: Directory = {

0 commit comments

Comments
 (0)