diff options
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | src/build/four.xml | 4 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 14 |
3 files changed, 18 insertions, 4 deletions
@@ -1298,8 +1298,8 @@ BOOTRAPING TEST AND TEST SUITE <negtests dir="${test.dir}/files/neg" includes="*.scala"/> <runtests dir="${test.dir}/files"> <include name="run/**/*.scala"/> - <include name="jvm/**/*.scala"/> </runtests> + <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/> <jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/> <residenttests dir="${test.dir}/files/res" includes="*.res"/> <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> --> @@ -1321,8 +1321,8 @@ BOOTRAPING TEST AND TEST SUITE <negtests dir="${test.dir}/files/neg" includes="*.scala"/> <runtests dir="${test.dir}/files"> <include name="run/**/*.scala"/> - <include name="jvm/**/*.scala"/> </runtests> + <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/> <jvm5tests dir="${test.dir}/files/jvm5" includes="*.scala"/> <residenttests dir="${test.dir}/files/res" includes="*.res"/> <!-- <scripttests dir="${test.dir}/files/script" includes="*.scala"/> --> diff --git a/src/build/four.xml b/src/build/four.xml index 64e7987aad..ab2dd1003f 100644 --- a/src/build/four.xml +++ b/src/build/four.xml @@ -308,8 +308,8 @@ work on a JVM 1.5. <negtests dir="${test.dir}/files/neg" includes="*.scala"/> <runtests dir="${test.dir}/files"> <include name="run/**/*.scala"/> - <include name="jvm/**/*.scala"/> </runtests> + <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/> <residenttests dir="${test.dir}/files/res" includes="*.res"/> </partest> </target> @@ -346,8 +346,8 @@ work on a JVM 1.4. <negtests dir="${test.dir}/files/neg" includes="*.scala"/> <runtests dir="${test.dir}/files"> <include name="run/**/*.scala"/> - <include name="jvm/**/*.scala"/> </runtests> + <jvmtests dir="${test.dir}/files/jvm" includes="*.scala"/> <residenttests dir="${test.dir}/files/res" includes="*.res"/> </partest> </target> 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") |