Author: kkolinko
Date: Sat Sep 24 13:39:44 2011
New Revision: 1175167
URL: http://svn.apache.org/viewvc?rev=1175167&view=rev
Log:
Do not try to delete the whole output/test-tmp subdirectory when running tests,
because that wouldn't succeed (at least on Windows).
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=1175167&r1=1175166&r2=1175167&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Sat Sep
24 13:39:44 2011
@@ -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"));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
