Partest changes - partest now uses scalacheck.j...

Partest changes - partest now uses scalacheck.jar from the build/pack dir.

Review by phaller.

2 files changed, 21 insertions, 1 deletions

diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala
index 41bba5782e..bf551b1aba 100644
--- a/src/partest/scala/tools/partest/nest/PathSettings.scala
+++ b/src/partest/scala/tools/partest/nest/PathSettings.scala
@@ -31,7 +31,13 @@ object PathSettings {
   // Directory <root>/test/files/lib
   lazy val srcLibDir = Directory(srcDir / "lib")
 
-  lazy val scalaCheck = srcLibDir.files find (_.name startsWith "scalacheck") getOrElse {
+  // Directory <root>/build
+  lazy val buildDir = Directory("build")
+
+  // 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)
   }
 }
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 931bc5cc13..623a7a9674 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -43,9 +43,21 @@ class LogFile(parent: File, child: String) extends File(parent, child) {
   var toDelete = false
 }
 
+class ScalaCheckFileManager(val origmanager: FileManager) extends FileManager {
+  def testRootDir: Directory = origmanager.testRootDir
+  def testRootPath: String = origmanager.testRootPath
+
+  var JAVACMD: String = origmanager.JAVACMD
+  var JAVAC_CMD: String = origmanager.JAVAC_CMD
+
+  var CLASSPATH: String = origmanager.CLASSPATH + java.io.File.pathSeparator + PathSettings.scalaCheck
+  var LATEST_LIB: String = origmanager.LATEST_LIB
+}
+
 class Worker(val fileManager: FileManager) extends Actor {
   import fileManager._
 
+  val scalaCheckFileManager = new ScalaCheckFileManager(fileManager)
   var reporter: ConsoleReporter = _
   val timer = new Timer
 
@@ -305,6 +317,8 @@ class Worker(val fileManager: FileManager) extends Actor {
    */
   def runTests(kind: String, files: List[File])(topcont: ImmMap[String, Int] => Unit) {
     val compileMgr = new CompileManager(fileManager)
+    if (kind == "scalacheck") fileManager.CLASSPATH += File.pathSeparator + PathSettings.scalaCheck
+
     var errors = 0
     var succeeded = true
     var diff = ""