summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2008-10-28 22:38:52 +0000
committerPhilipp Haller <hallerp@gmail.com>2008-10-28 22:38:52 +0000
commitc59f026df158ffc56277822265edfc8ff247348b (patch)
tree0e9b16a5055c3a639896c8f20c4280e4e65b373c
parentf0d060eee5e38d89f9778bda21512d16e44b6700 (diff)
downloadscala-c59f026df158ffc56277822265edfc8ff247348b.tar.gz
scala-c59f026df158ffc56277822265edfc8ff247348b.tar.bz2
scala-c59f026df158ffc56277822265edfc8ff247348b.zip
Added handling of pos5 tests.
-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 abd1ef1969..39eb91da0a 100644
--- a/src/partest/scala/tools/partest/PartestTask.scala
+++ b/src/partest/scala/tools/partest/PartestTask.scala
@@ -23,6 +23,9 @@ class PartestTask extends Task {
def addConfiguredPosTests(input: FileSet): Unit =
posFiles = Some(input)
+ def addConfiguredPos5Tests(input: FileSet): Unit =
+ pos5Files = Some(input)
+
def addConfiguredNegTests(input: FileSet): Unit =
negFiles = Some(input)
@@ -80,6 +83,7 @@ class PartestTask extends Task {
private var showLog: Boolean = false
private var runFailed: Boolean = false
private var posFiles: Option[FileSet] = None
+ private var pos5Files: Option[FileSet] = None
private var negFiles: Option[FileSet] = None
private var runFiles: Option[FileSet] = None
private var residentFiles: Option[FileSet] = None
@@ -109,6 +113,9 @@ class PartestTask extends Task {
private def getPosFiles: Array[File] =
getFilesAndDirs(posFiles)
+ private def getPos5Files: Array[File] =
+ getFilesAndDirs(pos5Files)
+
private def getNegFiles: Array[File] =
if (!negFiles.isEmpty) {
val files = negFiles.get
@@ -217,6 +224,13 @@ class PartestTask extends Task {
allFailures += failures
}
+ if (getPos5Files.size > 0) {
+ log("Compiling files that are expected to build")
+ val (successes, failures) = runTestsForFiles(getPos5Files, "pos")
+ allSucesses += successes
+ allFailures += failures
+ }
+
if (getNegFiles.size > 0) {
log("Compiling files that are expected to fail")
val (successes, failures) = runTestsForFiles(getNegFiles, "neg")