From 075630213f8eaefdb0784c4df5977b3195a2526d Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Fri, 9 May 2008 14:20:26 +0000 Subject: Added config options to partest Ant task --- src/partest/scala/tools/partest/PartestTask.scala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/partest') diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 9c17d200fc..39e66f5b0c 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -58,6 +58,9 @@ class PartestTask extends Task { def setJavaCmd(input: File): Unit = javacmd = Some(input) + def setScalacOpts(opts: String): Unit = + scalacOpts = Some(opts) + private var classpath: Option[Path] = None private var javacmd: Option[File] = None private var showDiff: Boolean = false @@ -68,6 +71,7 @@ class PartestTask extends Task { private var runFiles: Option[FileSet] = None private var residentFiles: Option[FileSet] = None private var errorOnFailed: Boolean = false + private var scalacOpts: Option[String] = None private def getPosFiles: Array[File] = if (!posFiles.isEmpty) { @@ -111,7 +115,7 @@ class PartestTask extends Task { (classpath.get.list map { fs => new File(fs) }) find { f => f.getName match { case "scala-library.jar" => true - case "lib" if (f.getParentFile.getName == "library") => true + case "classes" if (f.getParentFile.getName == "library") => true case _ => false } } @@ -153,6 +157,8 @@ class PartestTask extends Task { setFileManagerStringProperty("JAVACMD", javacmd.get.getAbsolutePath) setFileManagerStringProperty("CLASSPATH", classpath.get.list.mkString(File.pathSeparator)) setFileManagerStringProperty("LATEST_LIB", scalaLibrary.get.getAbsolutePath) + if (!scalacOpts.isEmpty) + setFileManagerStringProperty("SCALAC_OPTS", scalacOpts.get) var allSucesses: int = 0 var allFailures: int = 0 -- cgit v1.2.3