summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/partest/scala/tools/partest/nest/PathSettings.scala8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala
index e0a2f65b80..4fe337b19f 100644
--- a/src/partest/scala/tools/partest/nest/PathSettings.scala
+++ b/src/partest/scala/tools/partest/nest/PathSettings.scala
@@ -43,9 +43,11 @@ object PathSettings {
// Directory <root>/test/files/codelib
lazy val srcCodeLibDir = Directory(srcDir / "codelib")
- lazy val srcCodeLib: File = findJar(srcCodeLibDir, "code") getOrElse {
- sys.error("No code.jar found in %s".format(srcCodeLibDir))
- }
+ lazy val srcCodeLib: File = (
+ findJar(srcCodeLibDir, "code")
+ orElse findJar(Directory(testRoot / "files" / "codelib"), "code") // work with --srcpath pending
+ getOrElse sys.error("No code.jar found in %s".format(srcCodeLibDir))
+ )
// Directory <root>/build
lazy val buildDir: Directory = {