Fixed a path issue in partest, no review.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@25214 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

Author: extempore

src/partest/scala/tools/partest/nest/ConsoleFileManager.scala

@@ -65,7 +65,7 @@ class ConsoleFileManager extends FileManager {
   }
 
   CLASSPATH = {
-    val libs = (srcDir / Directory("lib")).files filter (_ hasExtension "jar") map (_.normalize.path)
+    val libs = (srcDir / Directory("lib")).files filter (_ hasExtension "jar") map (_.toCanonical.path)
 
     // add all jars in libs
     (CLASSPATH :: libs.toList) mkString pathSeparator
@@ -74,11 +74,11 @@ class ConsoleFileManager extends FileManager {
   def findLatest() {
     NestUI.verbose("test parent: "+testParent)
 
-    def prefixFileWith(parent: File, relPath: String) = (io.File(parent) / relPath).normalize
-    def prefixFile(relPath: String) = (testParent / relPath).normalize
+    def prefixFileWith(parent: File, relPath: String) = (io.File(parent) / relPath).toCanonical
+    def prefixFile(relPath: String) = (testParent / relPath).toCanonical
 
     if (!testClasses.isEmpty) {
-      testClassesDir = Path(testClasses.get).normalize.toDirectory
+      testClassesDir = Path(testClasses.get).toCanonical.toDirectory
       NestUI.verbose("Running with classes in "+testClassesDir)
 
       latestFile        = testClassesDir.parent / "bin"

src/partest/scala/tools/partest/nest/ConsoleRunner.scala

@@ -211,10 +211,13 @@ class ConsoleRunner extends DirectRunner {
    * @return (success count, failure count)
    */
   def testCheckAll(enabledSets: List[TestSet]): (Int, Int) = {
-    def kindOf(f: File) = (srcDir relativize Path(f).normalize).segments.head
+    def kindOf(f: File) = (srcDir relativize Path(f).toCanonical).segments.head
 
     val (valid, invalid) = testFiles partition (x => testSetKinds contains kindOf(x))
-    invalid foreach (x => NestUI.failure("Invalid test file '%s', skipping.\n" format x))
+    invalid foreach (x => NestUI.failure(
+      "Invalid test file '%s', skipping.\n".format(x) +
+      "(Test kind '%s' not in known set '%s')".format(kindOf(x), testSetKinds))
+    )
 
     val grouped = (valid groupBy kindOf).toList sortBy (x => testSetKinds indexOf x._1)
     val runTestsFileLists =

src/partest/scala/tools/partest/nest/PathSettings.scala

@@ -25,7 +25,7 @@ object PathSettings {
   }
 
   // Directory <root>/test/files
-  lazy val srcDir = Directory(testRoot / srcDirName normalize)
+  lazy val srcDir = Directory(testRoot / srcDirName toCanonical)
 
   // Directory <root>/test/files/lib
   lazy val srcLibDir = Directory(srcDir / "lib")