diff options
| author | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-04 14:05:35 +0000 |
|---|---|---|
| committer | Aleksandar Pokopec <aleksandar.prokopec@epfl.ch> | 2010-10-04 14:05:35 +0000 |
| commit | e0372eddc160678010c2b45be84a04af81ff63e5 (patch) | |
| tree | 31e038214ab23033d44f9202ae3525552be6541e /src | |
| parent | 9e21fe6c690e31f2e3fe079e386f4d440935c09e (diff) | |
| download | scala-e0372eddc160678010c2b45be84a04af81ff63e5.tar.gz scala-e0372eddc160678010c2b45be84a04af81ff63e5.tar.bz2 scala-e0372eddc160678010c2b45be84a04af81ff63e5.zip | |
Fixed a scalacheck test group "test entire subd...
Fixed a scalacheck test group "test entire subdirectory" problem. It's
now possible to add scalacheck tests consisting of multiple files. No
review.
Diffstat (limited to 'src')
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 5 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 55b4a2a637..7c7863f118 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -162,10 +162,13 @@ class PartestTask extends Task with CompilationPathProperty { case None => Array() case Some(fs) => def shouldExclude(name: String) = (name endsWith ".obj") || (name startsWith ".") + // println("----> " + fileSet) val fileTests = getFiles(Some(fs)) filterNot (x => shouldExclude(x.getName)) val dirTests: Iterator[SPath] = fileSetToDir(fs).dirs filterNot (x => shouldExclude(x.name)) val dirResult = dirTests.toList.toArray map (_.jfile) + // println("dirs: " + dirResult.toList) + // println("files: " + fileTests.toList) dirResult ++ fileTests } @@ -176,7 +179,7 @@ class PartestTask extends Task with CompilationPathProperty { private def getJvmFiles = getFilesAndDirs(jvmFiles) private def getResidentFiles = getFiles(residentFiles) private def getBuildManagerFiles = getFilesAndDirs(buildManagerFiles) - private def getScalacheckFiles = getFiles(scalacheckFiles) + private def getScalacheckFiles = getFilesAndDirs(scalacheckFiles) private def getScriptFiles = getFiles(scriptFiles) private def getShootoutFiles = getFiles(shootoutFiles) private def getScalapFiles = getFiles(scalapFiles) diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 51012de66c..57ab056cd6 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -69,7 +69,7 @@ class Worker(val fileManager: FileManager) extends Actor { def act() { react { case RunTests(kind, files) => - // NestUI.verbose("received "+files.length+" to test") + //NestUI.normal("received "+files.length+" to test") val master = sender runTests(kind, files) { results => master ! Results(results, createdLogFiles, createdOutputDirs) |