Repository: ant Updated Branches: refs/heads/master f32cf7cfa -> 79b44c57c
Activate more tests in Surefire Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/79b44c57 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/79b44c57 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/79b44c57 Branch: refs/heads/master Commit: 79b44c57c0a0797cd8c2a40cd75e3f478f37b333 Parents: f32cf7c Author: Gintas Grigelionis <[email protected]> Authored: Thu Oct 25 23:56:19 2018 +0200 Committer: Gintas Grigelionis <[email protected]> Committed: Thu Oct 25 23:56:19 2018 +0200 ---------------------------------------------------------------------- src/etc/poms/ant-jdepend/pom.xml | 4 ++++ src/etc/poms/ant/pom.xml | 2 -- src/etc/testcases/taskdefs/initializeclass.xml | 9 ++++----- .../taskdefs/optional/jdepend/jdepend.xml | 13 +++++-------- src/etc/testcases/taskdefs/xmlns.xml | 19 ++++++++----------- 5 files changed, 21 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/79b44c57/src/etc/poms/ant-jdepend/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant-jdepend/pom.xml b/src/etc/poms/ant-jdepend/pom.xml index 2080158..1ed2535 100644 --- a/src/etc/poms/ant-jdepend/pom.xml +++ b/src/etc/poms/ant-jdepend/pom.xml @@ -74,6 +74,10 @@ <workingDirectory>../../../..</workingDirectory> <systemProperties> <property> + <name>build.tests.value</name> + <value>${project.basedir}/../../../../target/${project.artifactId}/testcases</value> + </property> + <property> <name>ant.test.basedir.ignore</name> <value>true</value> </property> http://git-wip-us.apache.org/repos/asf/ant/blob/79b44c57/src/etc/poms/ant/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml index 3acd17c..15ffeb7 100644 --- a/src/etc/poms/ant/pom.xml +++ b/src/etc/poms/ant/pom.xml @@ -162,8 +162,6 @@ <exclude>org/apache/tools/ant/listener/Log4jListener*</exclude> <!-- obsolete --> <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 --> <exclude>org/apache/tools/ant/taskdefs/Javac*</exclude> <!-- see XsltTest --> http://git-wip-us.apache.org/repos/asf/ant/blob/79b44c57/src/etc/testcases/taskdefs/initializeclass.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/initializeclass.xml b/src/etc/testcases/taskdefs/initializeclass.xml index 6e07991..b71abe2 100644 --- a/src/etc/testcases/taskdefs/initializeclass.xml +++ b/src/etc/testcases/taskdefs/initializeclass.xml @@ -22,10 +22,9 @@ <target name="forked"> <java fork="true" output="forkedout" failonerror="true" className="org.apache.tools.ant.taskdefs.dir1.B"> - <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> </java> </target> @@ -33,8 +32,8 @@ <target name="unforked"> <java className="org.apache.tools.ant.taskdefs.dir1.B"> <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> </java> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/79b44c57/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml b/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml index 8418226..3dbcadf 100644 --- a/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml +++ b/src/etc/testcases/taskdefs/optional/jdepend/jdepend.xml @@ -16,19 +16,17 @@ limitations under the License. --> <project> - <property name="testclasses" location="../../../../../../build/testcases"/> - <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 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 id="test-classes.id"> - <pathelement location="${testclasses}" /> + <pathelement location="${build.tests.value}"/> </path> <target name="simple"> @@ -66,5 +64,4 @@ <classespath refid="example-classes.id"/> </jdepend> </target> - -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/ant/blob/79b44c57/src/etc/testcases/taskdefs/xmlns.xml ---------------------------------------------------------------------- diff --git a/src/etc/testcases/taskdefs/xmlns.xml b/src/etc/testcases/taskdefs/xmlns.xml index e699166..c5703b8 100644 --- a/src/etc/testcases/taskdefs/xmlns.xml +++ b/src/etc/testcases/taskdefs/xmlns.xml @@ -17,19 +17,18 @@ --> <project name="test" xmlns:other="this is the other uri" 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"> - <pathelement location="${testcases.dir}" /> - <pathelement path="${java.class.path}" /> + <pathelement location="${testcases.dir}"/> + <pathelement path="${java.class.path}"/> </path> <target name="xmlns" xmlns:test="this.is.another.test.uri"> <typedef classname="org.apache.tools.ant.taskdefs.XmlnsTest$MyTask" classpathref="testclasses" name="mytask" - uri="this.is.another.test.uri" /> + uri="this.is.another.test.uri"/> <test:mytask/> </target> @@ -46,22 +45,20 @@ <target name="xmlns.file" xmlns:test="this.is.a.test.uri"> <typedef file="test.antlib.xml" classpathref="testclasses" - uri="this.is.a.test.uri" /> + uri="this.is.a.test.uri"/> <test:mytask/> </target> <target name="core"> <typedef file="test.antlib.xml" classpathref="testclasses" - uri="antlib:org.apache.tools.ant" /> + uri="antlib:org.apache.tools.ant"/> <mytask/> </target> <target name="excluded"> <typedef file="test.antlib.xml" classpathref="testclasses" - uri="ant:notallowed" /> + uri="ant:notallowed"/> </target> - - -</project> \ No newline at end of file +</project>
