diff options
| author | Paul Phillips <paulp@improving.org> | 2010-09-09 17:04:19 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-09-09 17:04:19 +0000 |
| commit | 5a150395e7a3ff7e2795a044ae302702a2e0c904 (patch) | |
| tree | 93b7d529184b1620c8778d2f60479798f4707916 | |
| parent | 4d0f311f8fde1fd37e59dff7fcbc73e663effcd2 (diff) | |
| download | scala-5a150395e7a3ff7e2795a044ae302702a2e0c904.tar.gz scala-5a150395e7a3ff7e2795a044ae302702a2e0c904.tar.bz2 scala-5a150395e7a3ff7e2795a044ae302702a2e0c904.zip | |
Unbroke the command line ~/test/partest tool, w...
Unbroke the command line ~/test/partest tool, which was displeased at
being unable to find scalacheck.jar. No review.
| -rw-r--r-- | src/partest/scala/tools/partest/nest/PathSettings.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala index bf551b1aba..fd8eb4cdfa 100644 --- a/src/partest/scala/tools/partest/nest/PathSettings.scala +++ b/src/partest/scala/tools/partest/nest/PathSettings.scala @@ -37,8 +37,11 @@ object PathSettings { // Directory <root>/build/pack/lib lazy val buildPackLibDir = Directory(buildDir / "pack" / "lib") - lazy val scalaCheck = buildPackLibDir.files find (_.name startsWith "scalacheck") getOrElse { - error("No scalacheck jar found in '%s'" format srcLibDir) + lazy val scalaCheck = { + (buildPackLibDir.files find (_.name startsWith "scalacheck")) orElse + (srcLibDir.files find (_.name startsWith "scalacheck")) getOrElse { + error("No scalacheck jar found in '%s' or '%s'".format(buildPackLibDir, srcLibDir)) + } } } |