diff options
Diffstat (limited to 'src/partest')
-rw-r--r-- | src/partest/scala/tools/partest/nest/DirectRunner.scala | 11 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 8 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala index 160fee3d5a..3cc84b8d89 100644 --- a/src/partest/scala/tools/partest/nest/DirectRunner.scala +++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala @@ -11,7 +11,6 @@ package nest import java.io.{File, PrintStream, FileOutputStream, BufferedReader, InputStreamReader, StringWriter, PrintWriter} import java.util.StringTokenizer -import scala.io.Directory import scala.actors.Actor._ import scala.actors.TIMEOUT @@ -67,9 +66,13 @@ trait DirectRunner { fails += 1 } } - for (x <- logsToDelete ::: outdirsToDelete) { - NestUI.verbose("deleting "+x) - Directory(x).deleteRecursively() + logsToDelete.foreach { log => + NestUI.verbose("deleting "+log) + fileManager.deleteRecursive(log) + } + outdirsToDelete.foreach { outdir => + NestUI.verbose("deleting "+outdir) + fileManager.deleteRecursive(outdir) } (succs, fails) diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index f5cc52c555..bdce6c8439 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -10,7 +10,6 @@ package nest import java.io.{File, FilenameFilter, IOException, StringWriter} import java.net.URI -import scala.io.Directory trait FileManager { @@ -19,7 +18,12 @@ trait FileManager { if (inx < 0) name else name.substring(0, inx) } - def deleteRecursive(dir: File) { Directory(dir).deleteRecursively() } + def deleteRecursive(dir: File) { + if (dir.isDirectory) { + for (file <- dir.list) deleteRecursive(new File(dir, file)) + } + dir.delete + } /** * Compares two files using a Java implementation of the GNU diff |