diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-10-13 18:25:57 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-10-13 18:25:57 +0000 |
| commit | 364360e180b814c17ce2239210d0f458ae77859d (patch) | |
| tree | 5e7e14bf1b1c8e57c1902233ab058b015647fa9f | |
| parent | 4163ac5548d12e13a13adfee0bdd3c293f2621c2 (diff) | |
| download | scala-364360e180b814c17ce2239210d0f458ae77859d.tar.gz scala-364360e180b814c17ce2239210d0f458ae77859d.tar.bz2 scala-364360e180b814c17ce2239210d0f458ae77859d.zip | |
Re-enabled multi-file tests for ant pos tests.
| -rw-r--r-- | src/partest/scala/tools/partest/PartestTask.scala | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index f62cd732bf..5821a5c734 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -85,14 +85,26 @@ class PartestTask extends Task { private var scalacOpts: Option[String] = None private var timeout: Option[String] = None - private def getPosFiles: Array[File] = - if (!posFiles.isEmpty) { - val files = posFiles.get - (files.getDirectoryScanner(getProject).getIncludedFiles map { fs => new File(files.getDir(getProject), fs) }) + private def getFilesAndDirs(fileSet: Option[FileSet]): Array[File] = + if (!fileSet.isEmpty) { + val files = fileSet.get + val dir = files.getDir(getProject) + val fileTests = (files.getDirectoryScanner(getProject).getIncludedFiles map { fs => + new File(dir, fs) }) + val dirTests = dir.listFiles(new java.io.FileFilter { + def accept(file: File) = + file.isDirectory && + (!file.getName().equals(".svn")) && + (!file.getName().endsWith(".obj")) + }) + (dirTests ++ fileTests).toArray } else Array() + private def getPosFiles: Array[File] = + getFilesAndDirs(posFiles) + private def getNegFiles: Array[File] = if (!negFiles.isEmpty) { val files = negFiles.get |