ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgl...@apache.org
Subject svn commit: r1297206 - /ant/core/trunk/src/etc/testcases/taskdefs/java.xml
Date Mon, 05 Mar 2012 19:58:22 GMT
Author: jglick
Date: Mon Mar  5 19:58:21 2012
New Revision: 1297206

URL: http://svn.apache.org/viewvc?rev=1297206&view=rev
Log:
Trying to make JavaTest more reliably on Windows.

Modified:
    ant/core/trunk/src/etc/testcases/taskdefs/java.xml

Modified: ant/core/trunk/src/etc/testcases/taskdefs/java.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/java.xml?rev=1297206&r1=1297205&r2=1297206&view=diff
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/java.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/java.xml Mon Mar  5 19:58:21 2012
@@ -186,7 +186,7 @@
 
     <!--redirection testcases don't want to run under junit unless forked-->
     <target name="redirect1">
-        <property name="outfile" location="${tmp}/redirect.out" />
+        <tempfile property="outfile" destdir="${tmp}" prefix="redirect" suffix=".out"
deleteonexit="true"/>
 
         <java classname="${pipeapp}"
               classpath="${tests-classpath.value}"
@@ -224,7 +224,7 @@ redirect.err=&quot;${redirect.err}&quot;
     </target>
 
     <target name="redirect2" depends="redirect1">
-        <property name="outfile" location="${tmp}/redirect.out" />
+        <tempfile property="outfile" destdir="${tmp}" prefix="redirect" suffix=".out"
deleteonexit="true"/>
 
         <java classname="${pipeapp}"
               classpath="${tests-classpath.value}"
@@ -265,8 +265,8 @@ redirect.err=&quot;${redirect.err}&quot;
     </target>
 
     <target name="redirect3">
-        <property name="outfile" location="${tmp}/redirect.out" />
-        <property name="errfile" location="${tmp}/redirect.err" />
+        <tempfile property="outfile" destdir="${tmp}" prefix="redirect" suffix=".out"
deleteonexit="true"/>
+        <tempfile property="errfile" destdir="${tmp}" prefix="redirect" suffix=".err"
deleteonexit="true"/>
 
         <java classname="${pipeapp}"
               classpath="${tests-classpath.value}"
@@ -303,8 +303,8 @@ redirect.err=&quot;${redirect.err}&quot;
     </target>
 
     <target name="redirector1">
-        <property name="outfile" location="${tmp}/redirector.out" />
-        <property name="errfile" location="${tmp}/redirector.err" />
+        <tempfile property="outfile" destdir="${tmp}" prefix="redirect" suffix=".out"
deleteonexit="true"/>
+        <tempfile property="errfile" destdir="${tmp}" prefix="redirect" suffix=".err"
deleteonexit="true"/>
 
         <java taskname="foo" classname="${pipeapp}" fork="true"
               classpath="${tests-classpath.value}">
@@ -338,8 +338,8 @@ redirect.err=&quot;${redirect.err}&quot;
     </target>
 
     <target name="redirector2" depends="redirector1">
-        <property name="outfile" location="${tmp}/redirector.out" />
-        <property name="errfile" location="${tmp}/redirector.err" />
+        <tempfile property="outfile" destdir="${tmp}" prefix="redirect" suffix=".out"
deleteonexit="true"/>
+        <tempfile property="errfile" destdir="${tmp}" prefix="redirect" suffix=".err"
deleteonexit="true"/>
 
         <!-- fork here; some VMs can be ill-behaved with files,
             such as W!nd0ws -->
@@ -393,7 +393,7 @@ redirect.err=&quot;${redirect.err}&quot;
     </target>
 
     <target name="cleanup">
-        <delete>
+        <delete failonerror="false">
             <fileset file="${logFile}" />
             <fileset dir="${tmp}" includes="redirect*" />
         </delete>



Mime
View raw message