svn commit: r1301870 - in /ant/core/trunk: build.xml src/tests/antunit/taskdefs/optional/unix/symlink-test.xml

[bo...@apache.org]

Author: bodewig
Date: Sat Mar 17 06:28:14 2012
New Revision: 1301870

URL: http://svn.apache.org/viewvc?rev=1301870&view=rev
Log:
Use a local temp directory for JUnit tests as well

Modified:
    ant/core/trunk/build.xml
    ant/core/trunk/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml

Modified: ant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/build.xml?rev=1301870&r1=1301869&r2=1301870&view=diff
==============================================================================
--- ant/core/trunk/build.xml (original)
+++ ant/core/trunk/build.xml Sat Mar 17 06:28:14 2012
@@ -84,6 +84,7 @@
   <property name="build.tests" value="${build.dir}/testcases"/>
   <property name="build.tests.javadocs" value="${build.dir}/javadocs.test/"/>
   <property name="build.junit.xml" location="${build.tests}/xml"/>
+  <property name="build.junit.tmpdir" location="${build.tests}/tmp"/>
   <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"/>
@@ -1664,6 +1665,7 @@ see ${build.junit.reports} / ${antunit.r
           <sysproperty key="build.compiler" value="${build.compiler}"/>
           <sysproperty key="tests.and.ant.share.classloader"
                        value="${tests.and.ant.share.classloader}"/>
+          <sysproperty key="java.io.tmpdir" file="${build.junit.tmpdir}"/>
           <classpath>
             <path refid="tests-runtime-classpath"/>
             <pathelement location="${junit.collector.dir}"/>

Modified: ant/core/trunk/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml?rev=1301870&r1=1301869&r2=1301870&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/optional/unix/symlink-test.xml Sat Mar 17 06:28:14 2012
@@ -84,7 +84,7 @@
   <target name="testDeleteWithNoPermissionToRenameTarget"
           depends="init" if="unix">
     <!-- must be outside of ${output} or "base" tearDown will fail -->
-    <property name="chmod.tmp" location="${java.io.tmpdir}/ant-symlink-test"/>
+    <property name="chmod.tmp" location="${output}/../ant-symlink-test"/>
     <mkdir dir="${chmod.tmp}/A"/>
     <chmod perm="555" dir="${chmod.tmp}"/>
     <symlink link="${output}/link" resource="${chmod.tmp}/A"/>