summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
Diffstat (limited to 'src/partest')
-rw-r--r--src/partest/scala/tools/partest/PartestTask.scala14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala
index 118e50ffd0..b619eaa9ca 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 addConfiguredJvmTests(input: FileSet): Unit =
+ jvmFiles = Some(input)
+
def addConfiguredJvm5Tests(input: FileSet): Unit =
jvm5Files = Some(input)
@@ -92,6 +95,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 jvmFiles: Option[FileSet] = None
private var jvm5Files: Option[FileSet] = None
private var residentFiles: Option[FileSet] = None
private var scriptFiles: Option[FileSet] = None
@@ -140,6 +144,9 @@ class PartestTask extends Task {
else
Array()
+ private def getJvmFiles: Array[File] =
+ getFilesAndDirs(jvmFiles)
+
private def getJvm5Files: Array[File] =
getFilesAndDirs(jvm5Files)
@@ -258,6 +265,13 @@ class PartestTask extends Task {
allFailures += failures
}
+ if (getJvmFiles.size > 0) {
+ log("Compiling and running files")
+ val (successes, failures) = runTestsForFiles(getJvmFiles, "jvm")
+ allSucesses += successes
+ allFailures += failures
+ }
+
if (getJvm5Files.size > 0) {
log("Compiling and running files")
val (successes, failures) = runTestsForFiles(getJvm5Files, "jvm5")