From 66b5bf250d9bcfe36dbf3665d1f516df973a9e6f Mon Sep 17 00:00:00 2001 From: kkolinko Date: Sat, 24 Sep 2011 13:39:44 +0000 Subject: [PATCH] Do not try to delete the whole output/test-tmp subdirectory when running tests, because that wouldn't succeed (at least on Windows). git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1175167 13f79535-47bb-0310-9956-ffa450edef68 --- test/org/apache/catalina/startup/TomcatBaseTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/org/apache/catalina/startup/TomcatBaseTest.java b/test/org/apache/catalina/startup/TomcatBaseTest.java index 32d4d48b7..6f2552ed0 100644 --- a/test/org/apache/catalina/startup/TomcatBaseTest.java +++ b/test/org/apache/catalina/startup/TomcatBaseTest.java @@ -184,7 +184,11 @@ public abstract class TomcatBaseTest { } tomcat.destroy(); } - ExpandWar.delete(tempDir); + // Cannot delete the whole tempDir, because logs are there, + // and they might be open for writing. + // Delete known subdirectories of it. + ExpandWar.delete(new File(tempDir, "webapps")); + ExpandWar.delete(new File(tempDir, "work")); } /** -- 2.11.0