Author: bodewig
Date: Thu Dec 4 01:54:52 2008
New Revision: 723272
URL: http://svn.apache.org/viewvc?rev=723272&view=rev
Log:
re-factor depend test a little.
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
Modified:
ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml?rev=723272&r1=723271&r2=723272&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
(original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/optional/depend/depend-test.xml
Thu Dec 4 01:54:52 2008
@@ -18,13 +18,10 @@
<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
<import file="../../../antunit-base.xml" />
- <property name="src1" location="${java.io.tmpdir}/src1"/>
+ <property name="src1" location="${input}/src1"/>
+ <property name="src2" location="${input}/src2"/>
- <target name="tearDown" depends="antunit-base.tearDown">
- <delete dir="${src1}"/>
- </target>
-
- <target name="testBug45916">
+ <target name="setUp">
<mkdir dir="${src1}"/>
<mkdir dir="${output}"/>
<mkdir dir="${src1}/a"/>
@@ -33,8 +30,8 @@
public class B {
}
]]></echo>
- <mkdir dir="${input}/b"/>
- <echo file="${input}/b/Main.java"><![CDATA[
+ <mkdir dir="${src2}/b"/>
+ <echo file="${src2}/b/Main.java"><![CDATA[
package b;
import a.B;
@@ -51,8 +48,10 @@
}
]]></echo>
+ </target>
- <javac srcdir="${src1}:${input}"
+ <target name="testBug45916" depends="setUp">
+ <javac srcdir="${src1}:${src2}"
destdir="${output}"/>
<!--to ensure that the classfiles generated in the previous step
@@ -68,4 +67,5 @@
classpath="${output}/A.jar"/>
<au:assertFileExists file="${output}/b/Main$1.class"/>
</target>
+
</project>
