diff options
| author | Paul Phillips <paulp@improving.org> | 2012-02-23 10:39:31 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-02-23 10:46:57 -0800 |
| commit | 119c9554cf948163433ab12ce8cdd36814f63e4a (patch) | |
| tree | 2e56acaa69bfdb48a93acd256046d82fd4db3cdb /src | |
| parent | 17a84df3db5c3dfaf36e05ac1b65bb0d1b39442a (diff) | |
| download | scala-119c9554cf948163433ab12ce8cdd36814f63e4a.tar.gz scala-119c9554cf948163433ab12ce8cdd36814f63e4a.tar.bz2 scala-119c9554cf948163433ab12ce8cdd36814f63e4a.zip | |
Make partest not fail over code.jar's placement.
Diffstat (limited to 'src')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/PathSettings.scala | 8 |
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 = { |