From fa88dfe5cdc88779ed0734893cae538db833ccc4 Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Fri, 31 Oct 2008 15:25:27 +0000 Subject: Fixed multi-file jvm5 tests. --- src/partest/scala/tools/partest/PartestTask.scala | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/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") -- cgit v1.2.3