Browse Source

Make Jenkins builds work again

master
Gintas Grigelionis 6 years ago
parent
commit
f3837f017b
2 changed files with 6 additions and 5 deletions
  1. +4
    -4
      src/etc/poms/ant/pom.xml
  2. +2
    -1
      src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java

+ 4
- 4
src/etc/poms/ant/pom.xml View File

@@ -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>

+ 2
- 1
src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java View File

@@ -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 {


Loading…
Cancel
Save