svn commit: r1301337 - in /ant/core/trunk: build.xml src/tests/antunit/antunit-base.xml

[bo...@apache.org]

Author: bodewig
Date: Fri Mar 16 05:13:08 2012
New Revision: 1301337

URL: http://svn.apache.org/viewvc?rev=1301337&view=rev
Log:
make AntUnit tests use a temp-dir inside the build tree rather than 

Modified:
    ant/core/trunk/build.xml
    ant/core/trunk/src/tests/antunit/antunit-base.xml

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=1301337&r1=1301336&r2=1301337&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Fri Mar 16 05:13:08 2012
@@ -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.r
                excludes="${antunit.excludes}" />
       <au:plainlistener logLevel="${antunit.loglevel}"/>
       <au:xmllistener todir="${antunit.xml}" />
+      <propertyset>
+        <propertyref name="antunit.tmpdir"/>
+      </propertyset>
     </au:antunit>
   </target>
 

Modified: ant/core/trunk/src/tests/antunit/antunit-base.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/antunit-base.xml?rev=1301337&r1=1301336&r2=1301337&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/antunit-base.xml (original)
+++ ant/core/trunk/src/tests/antunit/antunit-base.xml Fri Mar 16 05:13:08 2012
@@ -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"/>