You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2009/10/28 14:24:45 UTC
svn commit: r830526 - /harmony/enhanced/classlib/trunk/make/properties.xml
Author: hindessm
Date: Wed Oct 28 13:24:45 2009
New Revision: 830526
URL: http://svn.apache.org/viewvc?rev=830526&view=rev
Log:
Attempt to work-around the fact that tests leave lots of junk around in
/tmp and ~, etc. By creating specific temporary tree and removing it
afterwards.
We really need to fix the tests but I wanted to apply a workaround to try
to avoid upsetting people sharing machines with our tests - i.e. Apache
Hudson server, etc.
Modified:
harmony/enhanced/classlib/trunk/make/properties.xml
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?rev=830526&r1=830525&r2=830526&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Wed Oct 28 13:24:45 2009
@@ -702,9 +702,22 @@
<property name="test.module.dir" value="${target.dir}/@{module}" />
<property name="test.excludes.dir" value="${test.module.dir}/excludes" />
<property name="test.resources.dir" value="${test.module.dir}/resources" />
- <property name="test.exclude.file" value="${work.dir}/@{module}/test.exclude" />
+ <property name="module.work.dir" location="${work.dir}/@{module}" />
+ <property name="test.exclude.file" value="${module.work.dir}/test.exclude" />
+
+ <property name="module.temp.dir"
+ location="${work.dir}/@{module}/temp" />
+ <property name="junit.tempdir"
+ location="${module.temp.dir}/ant" />
+ <property name="junit.java.io.tmpdir"
+ location="${module.temp.dir}/tmpdir" />
+ <property name="junit.user.dir"
+ location="${module.temp.dir}/user" />
<mkdir dir="${tests.output}" />
+ <mkdir dir="${junit.tempdir}" />
+ <mkdir dir="${junit.java.io.tmpdir}" />
+ <mkdir dir="${junit.user.dir}" />
<prepare-exclude-list moduleName="@{module}" dir="${test.excludes.dir}" result="${test.exclude.file}" />
<junit fork="yes"
@@ -715,9 +728,14 @@
failureproperty="test.failures"
showoutput="on"
dir="${work.dir}/@{module}"
- tempdir="${work.dir}"
+ tempdir="${junit.tempdir}"
jvm="${test.jre.home}/bin/java">
+ <jvmarg line="-Djava.io.tmpdir=${junit.java.io.tmpdir}" />
+ <!-- TOFIX: I'd like to do this but it breaks a few tests
+ <jvmarg line="-Duser.dir=${junit.user.dir}" />
+ -->
+
<classpath>
<fileset dir="${target.dir}">
<include name="*.jar" />
@@ -754,6 +772,9 @@
<formatter type="xml" />
</junit>
+ <delete dir="${module.temp.dir}"
+ includeemptydirs="true" failonerror="false" />
+
<antcall target="touch-failures-file">
<param name="module" value="@{module}" />
</antcall>