Made partest stop crashing on test directories ...

Made partest stop crashing on test directories without a lib directory.
No review.

1 files changed, 8 insertions, 7 deletions

diff --git a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
index c8ec9a9f6f..eeb7f96342 100644
--- a/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
+++ b/src/partest/scala/tools/partest/nest/ConsoleFileManager.scala
@@ -8,9 +8,11 @@
 package scala.tools.partest
 package nest
 
-import java.io.{File, FilenameFilter, IOException, StringWriter}
+import java.io.{ File, FilenameFilter, IOException, StringWriter }
 import java.net.URI
 import scala.tools.util.PathResolver
+import scala.tools.nsc.io.{ Path }
+import File.pathSeparator
 
 class ConsoleFileManager extends FileManager {
 
@@ -112,14 +114,13 @@ else
     }
   }
 
-  LIB_DIR = (new File(testRootFile.getParentFile, "lib")).getCanonicalFile.getAbsolutePath
+  LIB_DIR = (Path(testRootFile.getParentFile) / "lib").normalize.toAbsolute.path
+
+  CLASSPATH = {
+    val libs = (Path(srcDir) / "lib").toDirectory.files filter (_ hasExtension "jar") map (_.normalize.toAbsolute.path)
 
-  CLASSPATH = CLASSPATH + File.pathSeparator + {
-    val libs = new File(srcDir, "lib")
     // 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)
+    (CLASSPATH :: libs.toList) mkString pathSeparator
   }
 
   def findLatest() {