Repository: ant Updated Branches: refs/heads/master 0d3d13731 -> f3837f017
Make Jenkins builds work again Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/f3837f01 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/f3837f01 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/f3837f01 Branch: refs/heads/master Commit: f3837f017b5cae73832a47fb1f8b1708216acc00 Parents: 0d3d137 Author: Gintas Grigelionis <gin...@apache.org> Authored: Thu Oct 25 17:06:24 2018 +0200 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Thu Oct 25 17:06:24 2018 +0200 ---------------------------------------------------------------------- src/etc/poms/ant/pom.xml | 8 ++++---- src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/f3837f01/src/etc/poms/ant/pom.xml ---------------------------------------------------------------------- diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml index 4c21e3b..d2286b1 100644 --- a/src/etc/poms/ant/pom.xml +++ b/src/etc/poms/ant/pom.xml @@ -296,9 +296,9 @@ </testResources> <sourceDirectory>../../../../src/main</sourceDirectory> <testSourceDirectory>../../../../src/tests/junit</testSourceDirectory> - <!-- directory name hardcoded in AntTest --> - <outputDirectory>../../../../target/build/classes</outputDirectory> - <testOutputDirectory>../../../../target/build/testcases</testOutputDirectory> - <directory>../../../../target/build</directory> + <!-- directory name is hardcoded in AntTest --> + <outputDirectory>../../../../target/${project.artifactId}/classes</outputDirectory> + <testOutputDirectory>../../../../target/${project.artifactId}/testcases</testOutputDirectory> + <directory>../../../../target/${project.artifactId}</directory> </build> </project> http://git-wip-us.apache.org/repos/asf/ant/blob/f3837f01/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java index 3bd5b0c..a029781 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java @@ -374,7 +374,8 @@ public class AntTest { // Cf. #42263 buildRule.executeTarget("sub-show-ant.core.lib"); String realLog = buildRule.getLog(); - assertTrue("found ant.core.lib in: " + realLog, realLog.matches(".*(ant[.]jar|build.classes).*")); + assertTrue("found ant.core.lib in: " + realLog, + realLog.matches(".*(ant[.]jar|ant.classes|build.classes).*")); } private class BasedirChecker implements BuildListener {
