diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-10-31 15:25:27 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-10-31 15:25:27 +0000 |
| commit | fa88dfe5cdc88779ed0734893cae538db833ccc4 (patch) | |
| tree | 437418b34d80947e3067b197aff70d6cf226d639 | |
| parent | 448110ac1153d504795ed3b48cf5b8aa30d20410 (diff) | |
| download | scala-fa88dfe5cdc88779ed0734893cae538db833ccc4.tar.gz scala-fa88dfe5cdc88779ed0734893cae538db833ccc4.tar.bz2 scala-fa88dfe5cdc88779ed0734893cae538db833ccc4.zip | |
Fixed multi-file jvm5 tests.
| -rw-r--r-- | build.xml | 17 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 14 |
2 files changed, 30 insertions, 1 deletions
@@ -1261,6 +1261,21 @@ BOOTRAPING TEST AND TEST SUITE </same> </target> + <target name="test.run" depends="pack.done"> + <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" + timeout="1200000" javaccmd="${javac.cmd}"> + <classpath> + <path refid="pack.classpath"/> + <fileset dir="${test.dir}/files/lib" includes="*.jar"/> + </classpath> + <runtests dir="${test.dir}/files"> + <include name="run/**/*.scala"/> + <include name="jvm/**/*.scala"/> + </runtests> + <jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/> + </partest> + </target> + <target name="test.suite" depends="pack.done"> <partest showlog="yes" erroronfailed="yes" javacmd="${java.home}/bin/java" timeout="1200000" javaccmd="${javac.cmd}"> @@ -1274,8 +1289,8 @@ BOOTRAPING TEST AND TEST SUITE <runtests dir="${test.dir}/files"> <include name="run/**/*.scala"/> <include name="jvm/**/*.scala"/> - <include name="jvm5/**/*.scala"/> </runtests> + <jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/> <residenttests dir="${test.dir}/files/res" includes="*.res"/> <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> --> </partest> diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 39eb91da0a..73099f7cb1 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -32,6 +32,9 @@ class PartestTask extends Task { def addConfiguredRunTests(input: FileSet): Unit = runFiles = Some(input) + def addConfiguredJvm5Tests(input: FileSet): Unit = + jvm5Files = Some(input) + def addConfiguredResidentTests(input: FileSet): Unit = residentFiles = Some(input) @@ -86,6 +89,7 @@ class PartestTask extends Task { private var pos5Files: Option[FileSet] = None private var negFiles: Option[FileSet] = None private var runFiles: Option[FileSet] = None + private var jvm5Files: Option[FileSet] = None private var residentFiles: Option[FileSet] = None private var scriptFiles: Option[FileSet] = None private var shootoutFiles: Option[FileSet] = None @@ -132,6 +136,9 @@ class PartestTask extends Task { else Array() + private def getJvm5Files: Array[File] = + getFilesAndDirs(jvm5Files) + private def getResidentFiles: Array[File] = if (!residentFiles.isEmpty) { val files = residentFiles.get @@ -245,6 +252,13 @@ class PartestTask extends Task { allFailures += failures } + if (getJvm5Files.size > 0) { + log("Compiling and running files") + val (successes, failures) = runTestsForFiles(getJvm5Files, "jvm5") + allSucesses += successes + allFailures += failures + } + if (getResidentFiles.size > 0) { log("Running resident compiler scenarii") val (successes, failures) = runTestsForFiles(getResidentFiles, "res") |