From 1c63fba0bc2cdb7f0f6ffab606e9a43fe077a713 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Fri, 16 Mar 2012 05:13:08 +0000
Subject: [PATCH] make AntUnit tests use a temp-dir inside the build tree
 rather than

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@1301337 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                          |  4 ++++
 src/tests/antunit/antunit-base.xml | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index b78545aa8..58588cf60 100644
--- a/build.xml
+++ b/build.xml
@@ -85,6 +85,7 @@
   <property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
   <property name="build.junit.xml" location="${build.tests}/xml"/>
   <property name="antunit.xml" location="${build.dir}/antunit/xml"/>
+  <property name="antunit.tmpdir" location="${build.dir}/antunit/tmp"/>
   <property name="antunit.reports" location="${build.dir}/antunit/reports"/>
   <property name="antunit.loglevel" value="none"/>
   <property name="build.junit.reports" location="${build.tests}/reports"/>
@@ -1948,6 +1949,9 @@ see ${build.junit.reports} / ${antunit.reports}
                excludes="${antunit.excludes}" />
       <au:plainlistener logLevel="${antunit.loglevel}"/>
       <au:xmllistener todir="${antunit.xml}" />
+      <propertyset>
+        <propertyref name="antunit.tmpdir"/>
+      </propertyset>
     </au:antunit>
   </target>
 
diff --git a/src/tests/antunit/antunit-base.xml b/src/tests/antunit/antunit-base.xml
index ca4e23a72..7d05913aa 100644
--- a/src/tests/antunit/antunit-base.xml
+++ b/src/tests/antunit/antunit-base.xml
@@ -17,15 +17,16 @@
 -->
 <project name="antunit-base">
 
-  <property name="input" location="${java.io.tmpdir}/testinput"/>
-  <property name="output" location="${java.io.tmpdir}/testoutput"/>
-  <property name="resources" location="${java.io.tmpdir}/resources"/>
-  <property name="test.jar" location="${java.io.tmpdir}/test.jar"/>
-  <property name="test1.jar" location="${java.io.tmpdir}/test1.jar"/>
-  <property name="test2.jar" location="${java.io.tmpdir}/test2.jar"/>
-  <property name="test3.jar" location="${java.io.tmpdir}/test3.jar"/>
-  <property name="test4.jar" location="${java.io.tmpdir}/test4.jar"/>
-  <property name="test5.jar" location="${java.io.tmpdir}/test5.jar"/>
+  <property name="antunit.tmpdir" location="${java.io.tmpdir}"/>
+  <property name="input" location="${antunit.tmpdir}/testinput"/>
+  <property name="output" location="${antunit.tmpdir}/testoutput"/>
+  <property name="resources" location="${antunit.tmpdir}/resources"/>
+  <property name="test.jar" location="${antunit.tmpdir}/test.jar"/>
+  <property name="test1.jar" location="${antunit.tmpdir}/test1.jar"/>
+  <property name="test2.jar" location="${antunit.tmpdir}/test2.jar"/>
+  <property name="test3.jar" location="${antunit.tmpdir}/test3.jar"/>
+  <property name="test4.jar" location="${antunit.tmpdir}/test4.jar"/>
+  <property name="test5.jar" location="${antunit.tmpdir}/test5.jar"/>
   <available property="jdk1.8+" classname="java.lang.reflect.Executable"/>
   <available property="jdk1.7+" classname="java.nio.file.FileSystem"/>
   <available property="jdk1.6+" classname="java.net.CookieStore"/>