From 5a150395e7a3ff7e2795a044ae302702a2e0c904 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 9 Sep 2010 17:04:19 +0000 Subject: 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. --- src/partest/scala/tools/partest/nest/PathSettings.scala | 7 +++++-- 1 file 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 /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)) + } } } -- cgit v1.2.3