You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2012/08/23 10:31:38 UTC
svn commit: r1376403 -
/ant/core/trunk/src/tests/antunit/core/extension-point-test.xml
Author: hibou
Date: Thu Aug 23 08:31:37 2012
New Revision: 1376403
URL: http://svn.apache.org/viewvc?rev=1376403&view=rev
Log:
Use the output dir which get cleaned up in the tearDown
Modified:
ant/core/trunk/src/tests/antunit/core/extension-point-test.xml
Modified: ant/core/trunk/src/tests/antunit/core/extension-point-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/core/extension-point-test.xml?rev=1376403&r1=1376402&r2=1376403&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/core/extension-point-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/core/extension-point-test.xml Thu Aug 23 08:31:37 2012
@@ -89,73 +89,73 @@
</target>
<target name="testExtensionPointInIncludedBuildfileWithNestedInclude">
- <mkdir dir="output"/>
- <echo file="output/abstract-compile.xml"><![CDATA[
+ <mkdir dir="${output}"/>
+ <echo file="${output}/abstract-compile.xml"><![CDATA[
<project name="abstract-compile">
<extension-point name="compile"/>
</project>]]></echo>
- <echo file="output/compile-java.xml"><![CDATA[
+ <echo file="${output}/compile-java.xml"><![CDATA[
<project name="compile-java">
<include file="abstract-compile.xml" as="abstract-compile"/>
<target name="compile-java" extensionOf="abstract-compile.compile">
<echo>in compile java</echo>
</target>
</project>]]></echo>
- <echo file="output/build.xml"><![CDATA[
+ <echo file="${output}/build.xml"><![CDATA[
<project name="master">
<include file="compile-java.xml" as="compile"/>
</project>]]></echo>
<!-- here prefix should be concatened from each include first
"compile" then "abstract-compile"-->
- <ant dir="output" target="compile.abstract-compile.compile"/>
+ <ant dir="${output}" target="compile.abstract-compile.compile"/>
<au:assertLogContains text="in compile java"/>
</target>
<target name="testExtensionPointInIncludedBuildfileWithNestedImport">
- <mkdir dir="output"/>
- <echo file="output/abstract-compile.xml"><![CDATA[
+ <mkdir dir="${output}"/>
+ <echo file="${output}/abstract-compile.xml"><![CDATA[
<project name="abstract-compile">
<extension-point name="compile"/>
</project>]]></echo>
- <echo file="output/compile-java.xml"><![CDATA[
+ <echo file="${output}/compile-java.xml"><![CDATA[
<project name="compile-java">
<import file="abstract-compile.xml"/>
<target name="compile-java" extensionOf="compile">
<echo>in compile java</echo>
</target>
</project>]]></echo>
- <echo file="output/build.xml"><![CDATA[
+ <echo file="${output}/build.xml"><![CDATA[
<project name="master">
<include file="compile-java.xml" as="compile"/>
</project>]]></echo>
<!-- here the prefix should be "compile" as the import containing
the extension point is done inside an include using "compile"
as prefix -->
- <ant dir="output" target="compile.compile"/>
+ <ant dir="${output}" target="compile.compile"/>
<au:assertLogContains text="in compile java"/>
</target>
<target name="testExtensionPointInImportedBuildfileWithNestedImport">
- <mkdir dir="output"/>
- <echo file="output/abstract-compile.xml"><![CDATA[
+ <mkdir dir="${output}"/>
+ <echo file="${output}/abstract-compile.xml"><![CDATA[
<project name="abstract-compile">
<extension-point name="compile"/>
</project>]]></echo>
- <echo file="output/compile-java.xml"><![CDATA[
+ <echo file="${output}/compile-java.xml"><![CDATA[
<project name="compile-java">
<import file="abstract-compile.xml"/>
<target name="compile-java" extensionOf="compile">
<echo>in compile java</echo>
</target>
</project>]]></echo>
- <echo file="output/build.xml"><![CDATA[
+ <echo file="${output}/build.xml"><![CDATA[
<project name="master">
<import file="compile-java.xml"/>
</project>]]></echo>
<!-- here extension point should not be prefixed at all -->
- <ant dir="output" target="compile"/>
+ <ant dir="${output}" target="compile"/>
<au:assertLogContains text="in compile java"/>
</target>