diff options
| -rw-r--r-- | build.xml | 4 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 9 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 3 | ||||
| -rw-r--r-- | test/files/specialized/spec-matrix.check | 2 |
4 files changed, 14 insertions, 4 deletions
@@ -1568,7 +1568,9 @@ BOOTRAPING TEST AND TEST SUITE <scalachecktests dir="${partest.dir}/${partest.srcdir}/scalacheck"> <include name="*.scala"/> </scalachecktests> - <specializedtests dir="${partest.dir}/${partest.srcdir}/specialized"/> + <specializedtests dir="${partest.dir}/${partest.srcdir}/specialized"> + <include name="*.scala"/> + </specializedtests> <!-- <scripttests dir="${partest.dir}/${partest.srcdir}/script" includes="*.scala"/> --> </partest> </target> diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 7b9f5ff457..280c9e6cb2 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -68,6 +68,10 @@ class PartestTask extends Task with CompilationPathProperty { scalapFiles = Some(input) } + def addConfiguredSpecializedTests(input: FileSet) { + specializedFiles = Some(input) + } + def setSrcDir(input: String) { srcDir = Some(input) } @@ -141,6 +145,7 @@ class PartestTask extends Task with CompilationPathProperty { private var scriptFiles: Option[FileSet] = None private var shootoutFiles: Option[FileSet] = None private var scalapFiles: Option[FileSet] = None + private var specializedFiles: Option[FileSet] = None private var errorOnFailed: Boolean = false private var scalacOpts: Option[String] = None private var timeout: Option[String] = None @@ -183,6 +188,7 @@ class PartestTask extends Task with CompilationPathProperty { private def getScriptFiles = getFiles(scriptFiles) private def getShootoutFiles = getFiles(shootoutFiles) private def getScalapFiles = getFiles(scalapFiles) + private def getSpecializedFiles = getFiles(specializedFiles) override def execute() { if (isPartestDebug || debug) { @@ -229,7 +235,8 @@ class PartestTask extends Task with CompilationPathProperty { (getScalacheckFiles, "scalacheck", "Running scalacheck tests"), (getScriptFiles, "script", "Running script files"), (getShootoutFiles, "shootout", "Running shootout tests"), - (getScalapFiles, "scalap", "Running scalap tests") + (getScalapFiles, "scalap", "Running scalap tests"), + (getSpecializedFiles, "specialized", "Running specialized files") ) def runSet(set: TFSet): (Int, Int, Iterable[String]) = { diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala index 41ecca7d06..3013249080 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala @@ -35,7 +35,8 @@ class ConsoleRunner extends DirectRunner { TestSet("shootout", pathFilter, "Testing shootout tests"), TestSet("script", pathFilter, "Testing script tests"), TestSet("scalacheck", x => pathFilter(x) || x.isDirectory, "Testing ScalaCheck tests"), - TestSet("scalap", _.isDirectory, "Run scalap decompiler tests") + TestSet("scalap", _.isDirectory, "Run scalap decompiler tests"), + TestSet("specialized", pathFilter, "Testing specialized tests") ) } diff --git a/test/files/specialized/spec-matrix.check b/test/files/specialized/spec-matrix.check index 77b8d536fb..c861e79622 100644 --- a/test/files/specialized/spec-matrix.check +++ b/test/files/specialized/spec-matrix.check @@ -1,2 +1,2 @@ * -4080500
\ No newline at end of file +4081500
\ No newline at end of file |