Simplified classpath handling

6 files changed, 21 insertions, 23 deletions

diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
index 3fc38ea09f..c25a91379a 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
@@ -40,9 +40,9 @@ else
     testroot.getAbsolutePath
   }
 
-  var EXT_CLASSPATH = {
+  CLASSPATH = CLASSPATH + File.pathSeparator + {
     val libs = new File(TESTROOT, "files/lib")
-    // add all jars in libs to EXT_CLASSPATH
+    // add all jars in libs
     (libs.listFiles(new FilenameFilter {
       def accept(dir: File, name: String) = name endsWith ".jar"
     }) map {file => file.getCanonicalFile.getAbsolutePath}).mkString(""+File.pathSeparator)
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala
index 8a814ea54b..f83882d078 100644
--- a/src/partest/scala/tools/partest/nest/FileManager.scala
+++ b/src/partest/scala/tools/partest/nest/FileManager.scala
@@ -47,7 +47,6 @@ trait FileManager {
   var JAVACMD: String
 
   var CLASSPATH: String
-  var EXT_CLASSPATH: String
   var LATEST_LIB: String
 
   var showDiff = false
diff --git a/src/partest/scala/tools/partest/nest/NestUI.scala b/src/partest/scala/tools/partest/nest/NestUI.scala
index 21eeb0b1b7..ae36e7f205 100644
--- a/src/partest/scala/tools/partest/nest/NestUI.scala
+++ b/src/partest/scala/tools/partest/nest/NestUI.scala
@@ -61,12 +61,17 @@ object NestUI {
 
   def usage() {
     println("Usage: NestRunner [<options>] [<testfile> ..] [<resfile>]")
+    println("version Mar3")
     println("    --pos          next files test a compilation success")
     println("    --neg          next files test a compilation failure")
-    println("    --jvm          next files test the JVM backend")
     println("    --run          next files test the interpreter and all backends")
+    println("    --jvm          next files test the JVM backend")
+    println("    --jvm5         next files test the JVM backend")
+    println("    --res          next files test the resident compiler")
+    println("    --shootout     next files are shootout tests")
+    println("    --script       next files test the script runner")
     println("    --verbose      display progress information")
-    println("    --version      output version information and exit")
+    //println("    --version      display version information")
     println
     println("Send bugs to <scala@listes.epfl.ch>")
     exit(1)
diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
index ba04267609..e65012c4f3 100644
--- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
+++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala
@@ -39,6 +39,11 @@ class ReflectiveRunner {
 
   def main(args: String) {
     val cargs: Array[AnyRef] = Array(args)
+    val debug = System.getProperty("partest.debug", "false") equals "true"
+    if (debug) {
+      println("Loading classes from:")
+      sepUrls foreach { url => println(url) }
+    }
     sepMainMethod.invoke(sepRunner, cargs)
   }
 }
diff --git a/src/partest/scala/tools/partest/nest/TestFile.scala b/src/partest/scala/tools/partest/nest/TestFile.scala
index 94812e6c1f..38d599bf4b 100644
--- a/src/partest/scala/tools/partest/nest/TestFile.scala
+++ b/src/partest/scala/tools/partest/nest/TestFile.scala
@@ -49,60 +49,49 @@ class TestFile(kind: String, val file: File, val fileManager: FileManager) {
 }
 
 case class PosTestFile(override val file: File, override val fileManager: FileManager) extends TestFile("pos", file, fileManager) {
-  import fileManager.CLASSPATH
-
   override def defineSettings(settings: Settings) {
     baseSettings(settings)
-    settings.classpath.value = CLASSPATH
+    settings.classpath.value = fileManager.CLASSPATH
     //println("settings.classpath.value="+settings.classpath.value)
   }
 }
 
 case class NegTestFile(override val file: File, override val fileManager: FileManager) extends TestFile("neg", file, fileManager) {
-  import fileManager.CLASSPATH
-
   override def defineSettings(settings: Settings) {
     baseSettings(settings)
-    settings.classpath.value = CLASSPATH
+    settings.classpath.value = fileManager.CLASSPATH
     //println("settings.classpath.value="+settings.classpath.value)
   }
 }
 
 case class RunTestFile(override val file: File, override val fileManager: FileManager) extends TestFile("run", file, fileManager) {
-  import fileManager.CLASSPATH
   override def defineSettings(settings: Settings) {
     baseSettings(settings)
-    settings.classpath.value = CLASSPATH
+    settings.classpath.value = fileManager.CLASSPATH
   }
 }
 
 case class JvmTestFile(override val file: File, override val fileManager: FileManager) extends TestFile("jvm", file, fileManager) {
-  import fileManager.{CLASSPATH, EXT_CLASSPATH}
-
   override def defineSettings(settings: Settings) {
     baseSettings(settings)
-    settings.classpath.value = CLASSPATH+File.pathSeparatorChar+EXT_CLASSPATH
+    settings.classpath.value = fileManager.CLASSPATH
     //println("settings.classpath.value="+settings.classpath.value)
   }
 }
 
 case class Jvm5TestFile(override val file: File, override val fileManager: FileManager) extends TestFile("jvm5", file, fileManager) {
-  import fileManager.{CLASSPATH, EXT_CLASSPATH}
-
   override def defineSettings(settings: Settings) {
     baseSettings(settings)
-    settings.classpath.value = CLASSPATH+File.pathSeparatorChar+EXT_CLASSPATH
+    settings.classpath.value = fileManager.CLASSPATH
     settings.target.value = "jvm-1.5"
     //println("settings.classpath.value="+settings.classpath.value)
   }
 }
 
 case class ShootoutTestFile(override val file: File, override val fileManager: FileManager) extends TestFile("shootout", file, fileManager) {
-  import fileManager.CLASSPATH
-
   override def defineSettings(settings: Settings) {
     baseSettings(settings)
-    settings.classpath.value = CLASSPATH
+    settings.classpath.value = fileManager.CLASSPATH
     //println("settings.classpath.value="+settings.classpath.value)
     settings.outdir.value = file.getParent
   }
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala
index 84f8212084..62fe8fc34e 100644
--- a/src/partest/scala/tools/partest/nest/Worker.scala
+++ b/src/partest/scala/tools/partest/nest/Worker.scala
@@ -122,7 +122,7 @@ class Worker(val fileManager: FileManager) extends Actor {
   def execTest(outDir: File, logFile: File) {
     val cmd =
       JAVACMD+
-      " -classpath "+outDir+File.pathSeparatorChar+CLASSPATH+File.pathSeparatorChar+EXT_CLASSPATH+
+      " -classpath "+outDir+File.pathSeparatorChar+CLASSPATH+
       " -Djava.library.path="+logFile.getParentFile.getAbsolutePath+
       " -Dscalatest.output="+outDir.getAbsolutePath+
       " -Dscalatest.lib="+LATEST_LIB+