From 143ecef34b96f3e7ab5797b31bea15f3a9f74feb Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Mon, 13 Oct 2008 16:30:28 +0000 Subject: Fixed build. --- src/partest/scala/tools/partest/PartestTask.scala | 28 ++++++++--------------- 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/partest/scala/tools/partest/PartestTask.scala b/src/partest/scala/tools/partest/PartestTask.scala index 56e9c29f4a..f62cd732bf 100644 --- a/src/partest/scala/tools/partest/PartestTask.scala +++ b/src/partest/scala/tools/partest/PartestTask.scala @@ -85,27 +85,14 @@ class PartestTask extends Task { private var scalacOpts: Option[String] = None private var timeout: Option[String] = None - private def getFilesAndDirs(fileSet: Option[FileSet]): Array[File] = - if (!fileSet.isEmpty) { - val files = fileSet.get - val dir = files.getDir(getProject) - val singleFileTests = (files.getDirectoryScanner(getProject).getIncludedFiles map { fs => - new File(dir, fs) }) - // add directories - val dirTests = dir.listFiles(new java.io.FileFilter { - def accept(file: File) = - file.isDirectory && (!file.getName().equals(".svn")) && - (!file.getName().endsWith(".obj")) - }) - (dirTests ++ singleFileTests).toArray + private def getPosFiles: Array[File] = + if (!posFiles.isEmpty) { + val files = posFiles.get + (files.getDirectoryScanner(getProject).getIncludedFiles map { fs => new File(files.getDir(getProject), fs) }) } else Array() - - private def getPosFiles: Array[File] = - getFilesAndDirs(posFiles) - private def getNegFiles: Array[File] = if (!negFiles.isEmpty) { val files = negFiles.get @@ -115,7 +102,12 @@ class PartestTask extends Task { Array() private def getRunFiles: Array[File] = - getFilesAndDirs(runFiles) + if (!runFiles.isEmpty) { + val files = runFiles.get + (files.getDirectoryScanner(getProject).getIncludedFiles map { fs => new File(files.getDir(getProject), fs) }) + } + else + Array() private def getResidentFiles: Array[File] = if (!residentFiles.isEmpty) { -- cgit v1.2.3