Author: markt
Date: Thu Jul 30 07:01:13 2009
New Revision: 799187
URL: http://svn.apache.org/viewvc?rev=799187&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47568
Create the tmp dir where intended
Remove it when we are done
Modified:
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=799187&r1=799186&r2=799187&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Thu Jul 30
07:01:13 2009
@@ -54,12 +54,12 @@
public void setUp() throws Exception {
t0 = System.currentTimeMillis();
- tempDir = new File("output/tmp");
+ tempDir = new File(base + "output/tmp");
tempDir.mkdir();
tomcat = new Tomcat();
- tomcat.getHost().setAppBase(tempDir.getAbsolutePath());
tomcat.setBaseDir(tempDir.getAbsolutePath());
+ tomcat.getHost().setAppBase(tempDir.getAbsolutePath() + "/webapps");
// If each test is running on same port - they
// may interfere with each other (on unix at least)
@@ -71,6 +71,7 @@
tomcat.stop();
System.err.println("Test time: " +
(System.currentTimeMillis() - t0));
+ ExpandWar.delete(tempDir);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
