@@ -73,6 +73,10 @@ | |||||
<basedir>../../../..</basedir> | <basedir>../../../..</basedir> | ||||
<workingDirectory>../../../..</workingDirectory> | <workingDirectory>../../../..</workingDirectory> | ||||
<systemProperties> | <systemProperties> | ||||
<property> | |||||
<name>build.tests.value</name> | |||||
<value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value> | |||||
</property> | |||||
<property> | <property> | ||||
<name>ant.test.basedir.ignore</name> | <name>ant.test.basedir.ignore</name> | ||||
<value>true</value> | <value>true</value> | ||||
@@ -162,8 +162,6 @@ | |||||
<exclude>org/apache/tools/ant/listener/Log4jListener*</exclude> | <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude> | ||||
<!-- obsolete --> | <!-- obsolete --> | ||||
<exclude>org/apache/tools/ant/taskdefs/AbstractCvs*</exclude> | <exclude>org/apache/tools/ant/taskdefs/AbstractCvs*</exclude> | ||||
<!-- ERROR: failed to create task2 --> | |||||
<exclude>org/apache/tools/ant/taskdefs/Antlib*</exclude> | |||||
<!-- ERROR: "default value" when javac cannot cross-compile to Java 5 --> | <!-- ERROR: "default value" when javac cannot cross-compile to Java 5 --> | ||||
<exclude>org/apache/tools/ant/taskdefs/Javac*</exclude> | <exclude>org/apache/tools/ant/taskdefs/Javac*</exclude> | ||||
<!-- see XsltTest --> | <!-- see XsltTest --> | ||||
@@ -22,10 +22,9 @@ | |||||
<target name="forked"> | <target name="forked"> | ||||
<java fork="true" output="forkedout" failonerror="true" | <java fork="true" output="forkedout" failonerror="true" | ||||
className="org.apache.tools.ant.taskdefs.dir1.B"> | className="org.apache.tools.ant.taskdefs.dir1.B"> | ||||
<classpath> | <classpath> | ||||
<pathelement path="../../../../build/testcases"/> | |||||
<pathelement location="${java.home}/lib/classes.zip" /> | |||||
<pathelement path="${build.tests.value}"/> | |||||
<pathelement location="${java.home}/lib/classes.zip"/> | |||||
</classpath> | </classpath> | ||||
</java> | </java> | ||||
</target> | </target> | ||||
@@ -33,8 +32,8 @@ | |||||
<target name="unforked"> | <target name="unforked"> | ||||
<java className="org.apache.tools.ant.taskdefs.dir1.B"> | <java className="org.apache.tools.ant.taskdefs.dir1.B"> | ||||
<classpath> | <classpath> | ||||
<pathelement path="../../../../build/testcases"/> | |||||
<pathelement location="${java.home}/lib/classes.zip" /> | |||||
<pathelement path="${build.tests.value}"/> | |||||
<pathelement location="${java.home}/lib/classes.zip"/> | |||||
</classpath> | </classpath> | ||||
</java> | </java> | ||||
</target> | </target> | ||||
@@ -16,19 +16,17 @@ | |||||
limitations under the License. | limitations under the License. | ||||
--> | --> | ||||
<project> | <project> | ||||
<property name="testclasses" location="../../../../../../build/testcases"/> | |||||
<path id="all-test-classes.id"> | <path id="all-test-classes.id"> | ||||
<pathelement location="../../../../build/testcases" /> | |||||
<pathelement path="${java.class.path}" /> | |||||
<pathelement location="${build.tests.value}"/> | |||||
<pathelement path="${java.class.path}"/> | |||||
</path> | </path> | ||||
<path id="example-classes.id"> | <path id="example-classes.id"> | ||||
<pathelement location="${testclasses}/org/apache/tools/ant/util/facade" /> | |||||
<pathelement location="${build.tests.value}/org/apache/tools/ant/util/facade"/> | |||||
</path> | </path> | ||||
<path id="test-classes.id"> | <path id="test-classes.id"> | ||||
<pathelement location="${testclasses}" /> | |||||
<pathelement location="${build.tests.value}"/> | |||||
</path> | </path> | ||||
<target name="simple"> | <target name="simple"> | ||||
@@ -66,5 +64,4 @@ | |||||
<classespath refid="example-classes.id"/> | <classespath refid="example-classes.id"/> | ||||
</jdepend> | </jdepend> | ||||
</target> | </target> | ||||
</project> | |||||
</project> |
@@ -17,19 +17,18 @@ | |||||
--> | --> | ||||
<project name="test" xmlns:other="this is the other uri" | <project name="test" xmlns:other="this is the other uri" | ||||
other:attr="this should be ignored by ant"> | other:attr="this should be ignored by ant"> | ||||
<property name="testcases.dir" location="../../../../build/testcases"/> | |||||
<property name="testcases.dir" location="${build.tests.value}"/> | |||||
<path id="testclasses"> | <path id="testclasses"> | ||||
<pathelement location="${testcases.dir}" /> | |||||
<pathelement path="${java.class.path}" /> | |||||
<pathelement location="${testcases.dir}"/> | |||||
<pathelement path="${java.class.path}"/> | |||||
</path> | </path> | ||||
<target name="xmlns" xmlns:test="this.is.another.test.uri"> | <target name="xmlns" xmlns:test="this.is.another.test.uri"> | ||||
<typedef classname="org.apache.tools.ant.taskdefs.XmlnsTest$MyTask" | <typedef classname="org.apache.tools.ant.taskdefs.XmlnsTest$MyTask" | ||||
classpathref="testclasses" | classpathref="testclasses" | ||||
name="mytask" | name="mytask" | ||||
uri="this.is.another.test.uri" /> | |||||
uri="this.is.another.test.uri"/> | |||||
<test:mytask/> | <test:mytask/> | ||||
</target> | </target> | ||||
@@ -46,22 +45,20 @@ | |||||
<target name="xmlns.file" xmlns:test="this.is.a.test.uri"> | <target name="xmlns.file" xmlns:test="this.is.a.test.uri"> | ||||
<typedef file="test.antlib.xml" | <typedef file="test.antlib.xml" | ||||
classpathref="testclasses" | classpathref="testclasses" | ||||
uri="this.is.a.test.uri" /> | |||||
uri="this.is.a.test.uri"/> | |||||
<test:mytask/> | <test:mytask/> | ||||
</target> | </target> | ||||
<target name="core"> | <target name="core"> | ||||
<typedef file="test.antlib.xml" | <typedef file="test.antlib.xml" | ||||
classpathref="testclasses" | classpathref="testclasses" | ||||
uri="antlib:org.apache.tools.ant" /> | |||||
uri="antlib:org.apache.tools.ant"/> | |||||
<mytask/> | <mytask/> | ||||
</target> | </target> | ||||
<target name="excluded"> | <target name="excluded"> | ||||
<typedef file="test.antlib.xml" | <typedef file="test.antlib.xml" | ||||
classpathref="testclasses" | classpathref="testclasses" | ||||
uri="ant:notallowed" /> | |||||
uri="ant:notallowed"/> | |||||
</target> | </target> | ||||
</project> | |||||
</project> |