diff options
author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-17 15:18:08 +0000 |
---|---|---|
committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2011-01-17 15:18:08 +0000 |
commit | ac0fc0fecb03b8b1af87845881491cba53ebbaaa (patch) | |
tree | 5d4a1fb7404b563e40e1f105b4e2ec68d57e996f /src/partest | |
parent | 16e7ad360d1a902d6bd5c845642dbe14bcecdb9d (diff) | |
download | scala-ac0fc0fecb03b8b1af87845881491cba53ebbaaa.tar.gz scala-ac0fc0fecb03b8b1af87845881491cba53ebbaaa.tar.bz2 scala-ac0fc0fecb03b8b1af87845881491cba53ebbaaa.zip |
Added specialized test to ant build, and ported...
Added specialized test to ant build, and ported old specialized 'run'
tests to check the number of boxings.
No review.
Diffstat (limited to 'src/partest')
-rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 9 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 3 |
2 files changed, 10 insertions, 2 deletions
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") ) } |