make tests use a real temp directory
diff --git a/src/etc/testcases/abstractsvntask.xml b/src/etc/testcases/abstractsvntask.xml
index 61d9d39..2876fe2 100644
--- a/src/etc/testcases/abstractsvntask.xml
+++ b/src/etc/testcases/abstractsvntask.xml
@@ -20,7 +20,7 @@
<project name="abstractsvntask-test" basedir="../../../"
default="all" xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property name="trunkdir" value="${tmpdir}/trunk"/>
<property name="file" value="build.xml"/>
diff --git a/src/etc/testcases/changelog.xml b/src/etc/testcases/changelog.xml
index 7c624b0..b186000 100644
--- a/src/etc/testcases/changelog.xml
+++ b/src/etc/testcases/changelog.xml
@@ -20,7 +20,7 @@
<project name="changelog-test" basedir="../../../"
default="log" xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property name="trunkdir" value="${tmpdir}/trunk"/>
<target name="setup">
diff --git a/src/etc/testcases/revisiondiff.xml b/src/etc/testcases/revisiondiff.xml
index d7cdbcd..2db3fb8 100644
--- a/src/etc/testcases/revisiondiff.xml
+++ b/src/etc/testcases/revisiondiff.xml
@@ -20,7 +20,7 @@
<project name="revisiondiff-test" basedir="../../../"
default="diff" xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property name="trunkdir" value="${tmpdir}/trunk"/>
<target name="dir-prep">
diff --git a/src/etc/testcases/tagdiff.xml b/src/etc/testcases/tagdiff.xml
index 3c2b850..26a8bad 100644
--- a/src/etc/testcases/tagdiff.xml
+++ b/src/etc/testcases/tagdiff.xml
@@ -21,7 +21,7 @@
default="diff-with-implicit-trunk"
xmlns:svn="antlib:org.apache.ant.svn">
- <property name="tmpdir" value="tmpdir"/>
+ <property name="tmpdir" value="${java.io.tmpdir}/svnantlib"/>
<property
name="baseURL"
value="http://svn.apache.org/repos/asf/ant/antlibs/antunit/"/>
diff --git a/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java b/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java
index 5716ee1..e6a1627 100644
--- a/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java
+++ b/src/tests/junit/org/apache/ant/svn/AbstractSvnTaskTest.java
@@ -46,7 +46,8 @@
}
public void testRevisionAttribute() {
- File f = getProject().resolveFile("tmpdir/trunk/build.xml");
+ String tmpDir = getProject().getProperty("tmpdir");
+ File f = getProject().resolveFile(tmpDir + "/trunk/build.xml");
assertTrue("starting empty", !f.exists());
// used to be
diff --git a/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java b/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java
index d385190..67408da 100644
--- a/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java
+++ b/src/tests/junit/org/apache/ant/svn/SvnChangeLogTaskTest.java
@@ -75,8 +75,9 @@
private String executeTargetAndReadLogFully(String target)
throws IOException {
executeTarget(target);
+ String tmpDir = getProject().getProperty("tmpdir");
FileReader r = new FileReader(getProject()
- .resolveFile("tmpdir/log.xml"));
+ .resolveFile(tmpDir + "/log.xml"));
try {
return FileUtils.readFully(r);
} finally {
diff --git a/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java b/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java
index b08f373..a82409e 100644
--- a/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java
+++ b/src/tests/junit/org/apache/ant/svn/SvnRevisionDiffTest.java
@@ -60,8 +60,9 @@
private String executeTargetAndReadLogFully(String target)
throws IOException {
executeTarget(target);
+ String tmpDir = getProject().getProperty("tmpdir");
FileReader r = new FileReader(getProject()
- .resolveFile("tmpdir/diff.xml"));
+ .resolveFile(tmpDir + "/diff.xml"));
try {
return FileUtils.readFully(r);
} finally {
diff --git a/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java b/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java
index aa47066..c3002a0 100644
--- a/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java
+++ b/src/tests/junit/org/apache/ant/svn/SvnTagDiffTest.java
@@ -67,8 +67,9 @@
private String executeTargetAndReadLogFully(String target)
throws IOException {
executeTarget(target);
+ String tmpDir = getProject().getProperty("tmpdir");
FileReader r = new FileReader(getProject()
- .resolveFile("tmpdir/diff.xml"));
+ .resolveFile(tmpDir + "/diff.xml"));
try {
return FileUtils.readFully(r);
} finally {
