diff options
author | Paul Phillips <paulp@improving.org> | 2010-04-06 02:05:20 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-04-06 02:05:20 +0000 |
commit | 4aa006cecdea7efc79e7aee92c56ad21ee58d154 (patch) | |
tree | 75de9bb24d2d46254afc498bc1f804f292cc2b13 /src | |
parent | f578ff88d2514bf94c46cfb8c0e33236c2b2fcf1 (diff) | |
download | scala-4aa006cecdea7efc79e7aee92c56ad21ee58d154.tar.gz scala-4aa006cecdea7efc79e7aee92c56ad21ee58d154.tar.bz2 scala-4aa006cecdea7efc79e7aee92c56ad21ee58d154.zip |
Noticed a bug with test obj dirs not getting de...
Noticed a bug with test obj dirs not getting deleted. No review.
Diffstat (limited to 'src')
-rw-r--r-- | src/partest/scala/tools/partest/Housekeeping.scala | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/partest/scala/tools/partest/Housekeeping.scala b/src/partest/scala/tools/partest/Housekeeping.scala index fdc04de7e3..3a092a4782 100644 --- a/src/partest/scala/tools/partest/Housekeeping.scala +++ b/src/partest/scala/tools/partest/Housekeeping.scala @@ -133,25 +133,18 @@ trait Housekeeping { // recreate object dir outDir createDirectory true } - def deleteOutDir() = - if (isNoCleanup && outDir.isDirectory) debug("Not deleting " + outDir) - else outDir.deleteRecursively() - - def cleanup() { - // otherwise, delete obj dir and logs on success - deleteOutDir() - if (isSuccess) - deleteLog() - } + def deleteOutDir() = outDir.deleteRecursively() protected def runWrappers[T](body: => T): Option[T] = { prepareForTestRun() withShutdownHook({ debug("Shutdown hook deleting " + outDir) ; deleteOutDir }) { loggingOutAndErr { - possiblyTimed { - body - } + val result = possiblyTimed { body } + if (!isNoCleanup) + deleteOutDir() + + result } } } |