diff options
| author | Paul Phillips <paulp@improving.org> | 2010-02-22 00:15:32 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-02-22 00:15:32 +0000 |
| commit | 91cdb1531656d9240e9ee64509ab528d727d1b51 (patch) | |
| tree | a33bbdb66b0ee1bb147bb8628902f66bc7f66756 /src/partest | |
| parent | f07bdbab911a7bcef042373d45fab302753f5a1f (diff) | |
| download | scala-91cdb1531656d9240e9ee64509ab528d727d1b51.tar.gz scala-91cdb1531656d9240e9ee64509ab528d727d1b51.tar.bz2 scala-91cdb1531656d9240e9ee64509ab528d727d1b51.zip | |
More laboring on Settings, ClassPaths, Ant Task...
More laboring on Settings, ClassPaths, Ant Tasks, Partest, and similar
epicenters of thrilldom. No review.
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ReflectiveRunner.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala index 77c9291a4b..2063d51b71 100644 --- a/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala +++ b/src/partest/scala/tools/partest/nest/ReflectiveRunner.scala @@ -63,7 +63,7 @@ class ReflectiveRunner extends RunnerUtils { case Some(cp) => Nil case _ => files.toList map (_.path) } - val newClasspath = ClassPath join paths + val newClasspath = ClassPath.join(paths: _*) syspropset("java.class.path", newClasspath) syspropset("scala.home", "") diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index b21f2c603b..9d990ef1ac 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -175,7 +175,7 @@ class Worker(val fileManager: FileManager) extends Actor { val cmd = javacCmd+ " -d "+outDir.getAbsolutePath+ - " -classpath "+ join(Seq(outDir.toString, CLASSPATH)) + + " -classpath "+ join(outDir.toString, CLASSPATH) + " "+files.mkString(" ") val (success, msg) = try { @@ -263,7 +263,7 @@ class Worker(val fileManager: FileManager) extends Actor { JAVACMD, JAVA_OPTS, argString, - "-classpath " + join(Seq(outDir.toString, CLASSPATH)) + "-classpath " + join(outDir.toString, CLASSPATH) ) ::: propertyOptions ::: List( "scala.tools.nsc.MainGenericRunner", "Test", |