Browse Source

allow AntUnit tests to pass on Windows even if the created jar cannot be deleted. This will likely leave test.jar lying around in $TEMP on Windows.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@917956 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 15 years ago
parent
commit
de0fc904c5
1 changed files with 6 additions and 7 deletions
  1. +6
    -7
      src/tests/antunit/taskdefs/import-url-test.xml

+ 6
- 7
src/tests/antunit/taskdefs/import-url-test.xml View File

@@ -40,15 +40,15 @@
<echo file="${input}/a/c/test.properties"><![CDATA[ <echo file="${input}/a/c/test.properties"><![CDATA[
foo=bar foo=bar
]]></echo> ]]></echo>
<mkdir dir="${output}"/>
<jar destfile="${output}/test.jar">
<property name="test.jar" location="${java.io.tmpdir}/test.jar"/>
<jar destfile="${test.jar}">
<fileset dir="${input}"/> <fileset dir="${input}"/>
</jar> </jar>
<delete dir="${input}"/> <delete dir="${input}"/>


<import> <import>
<javaresource name="a/b/outer.xml"> <javaresource name="a/b/outer.xml">
<classpath location="${output}/test.jar"/>
<classpath location="${test.jar}"/>
</javaresource> </javaresource>
</import> </import>


@@ -58,15 +58,14 @@ foo=bar
<au:assertLogContains text="foo is bar"/> <au:assertLogContains text="foo is bar"/>
</target> </target>


<target name="tearDown" depends="close, antunit-base.tearDown"/>

<target name="close">
<target name="tearDown" depends="antunit-base.tearDown">
<taskdef name="close" <taskdef name="close"
classname="org.apache.tools.ant.taskdefs.CloseResources"/> classname="org.apache.tools.ant.taskdefs.CloseResources"/>
<close> <close>
<javaresource name="a/b/outer.xml"> <javaresource name="a/b/outer.xml">
<classpath location="${output}/test.jar"/>
<classpath location="${test.jar}"/>
</javaresource> </javaresource>
</close> </close>
<delete file="${test.jar}" quiet="true" deleteonexit="true"/>
</target> </target>
</project> </project>

Loading…
Cancel
Save