Some work on classpaths.

at https://lampsvn.epfl.ch/trac/scala/wiki/Classpath modulo some minor
details which remain to be investigated. It is not entirely integrated,
and should not involve any behavioral changes. The patch also contains a
number of small improvements targetting widely duplicated code.

PathResolver offers a main method. If run with no arguments it will
output a pile of information about classpath relevant environment vars
and properties. If given arguments, it will output the classpath info
that any scala runner script would use if given the same args. There is
a wrapper in the tools directory. Example:

tools/pathResolver -extdirs /foo -sourcepath /bar | egrep
"sourcePath|scalaExtDirs"

  scalaExtDirs         = /foo
  sourcePath           = /bar

There is also a (probably temporary) command line option -Ylog-classpath
which will print out the settings.classpath value anytime it changes.
Review by community.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/partest/scala/tools/partest/nest/TestFile.scala b/src/partest/scala/tools/partest/nest/TestFile.scala
index a7656a3c12..3ae46399ec 100644
--- a/src/partest/scala/tools/partest/nest/TestFile.scala
+++ b/src/partest/scala/tools/partest/nest/TestFile.scala
@@ -8,7 +8,7 @@
 package scala.tools.partest
 package nest
 
-import java.io.{File, BufferedReader, FileReader}
+import java.io.File
 import scala.tools.nsc.Settings
 import scala.tools.nsc.io.{ Path, Directory }
 
@@ -30,13 +30,8 @@ abstract class TestFile(kind: String) {
       settings.outdir.value = (Path(dir) / objDir).createDirectory(true).path
 
     // add additional flags found in 'testname.flags'
-    val flagsFile = new File(dir, fileBase + ".flags")
-    if (flagsFile.exists) {
-      val reader = new BufferedReader(new java.io.FileReader(flagsFile))
-      val flags = reader.readLine
-      if (flags ne null)
-        settings.parseParams(settings.splitParams(flags))
-    }
+    def flagsPath = Path(dir) / (fileBase + ".flags")
+    flagsPath ifFile { _.slurp().trim } foreach (settings processArgumentString _)
   }
 
   def defineSettings(settings: Settings) {