diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-05-09 14:20:26 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-05-09 14:20:26 +0000 |
| commit | 075630213f8eaefdb0784c4df5977b3195a2526d (patch) | |
| tree | e4402c9646edfcb570eacef63c76f35186da0b7d | |
| parent | cec6829c1a3b5623b3a482e397d1ccbd01e63230 (diff) | |
| download | scala-075630213f8eaefdb0784c4df5977b3195a2526d.tar.gz scala-075630213f8eaefdb0784c4df5977b3195a2526d.tar.bz2 scala-075630213f8eaefdb0784c4df5977b3195a2526d.zip | |
Added config options to partest Ant task
| -rw-r--r-- | src/build/four.xml | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/build/four.xml b/src/build/four.xml index ba8e28baeb..6e31124203 100644 --- a/src/build/four.xml +++ b/src/build/four.xml @@ -274,7 +274,7 @@ BOOTRAPING TEST AND TEST SUITE ============================================================================ --> <target name="four-test.suite" depends="four-pack.done"> - <partest showlog="yes" erroronfailed="no"> + <partest showlog="yes" erroronfailed="no" scalacopts="-target:jvm-1.4"> <classpath> <pathelement location="${build-four-pack.dir}/lib/scala-library.jar"/> <pathelement location="${build-four-pack.dir}/lib/scala-compiler.jar"/> 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 |