git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@643076 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -173,8 +173,10 @@ Fixed bugs: | |||||
| * Regression: concat fixlastline="true" should not have applied to | * Regression: concat fixlastline="true" should not have applied to | ||||
| nested text, but did in Ant 1.7.0. Bugzilla 42369. | nested text, but did in Ant 1.7.0. Bugzilla 42369. | ||||
| * Regression: ant.version was not passed down in <subant>. | |||||
| This worked in Ant1.6.5, but not in 1.7.0. Bugzilla bug 42263 | |||||
| * Regression: ant.version was not passed down in <ant>, <subant>. | |||||
| This worked in Ant 1.6.5, but not in 1.7.0. | |||||
| ant.core.lib (added in 1.7.0) was also not being propagated. | |||||
| Bugzilla bug 42263 | |||||
| * Regression: bzip2 task created corrupted output files for some inputs. | * Regression: bzip2 task created corrupted output files for some inputs. | ||||
| Bugzilla bug 41596. | Bugzilla bug 41596. | ||||
| @@ -251,4 +251,11 @@ | |||||
| <target name="db"><echo>db</echo></target> | <target name="db"><echo>db</echo></target> | ||||
| <target name="dc"><echo>dc</echo></target> | <target name="dc"><echo>dc</echo></target> | ||||
| <target name="show-ant.core.lib"> | |||||
| <echo>${ant.core.lib}</echo> | |||||
| </target> | |||||
| <target name="sub-show-ant.core.lib"> | |||||
| <ant antfile="${ant.file}" target="show-ant.core.lib" inheritall="false" inheritrefs="false"/> | |||||
| </target> | |||||
| </project> | </project> | ||||
| @@ -311,6 +311,11 @@ public class AntTest extends BuildFileTest { | |||||
| expectLog("multiple-targets-2", "dadctb"); | expectLog("multiple-targets-2", "dadctb"); | ||||
| } | } | ||||
| public void testAntCoreLib() { | |||||
| // Cf. #42263 | |||||
| expectLogContaining("sub-show-ant.core.lib", "ant.jar"); | |||||
| } | |||||
| private class BasedirChecker implements BuildListener { | private class BasedirChecker implements BuildListener { | ||||
| private String[] expectedBasedirs; | private String[] expectedBasedirs; | ||||
| private int calls = 0; | private int calls = 0; | ||||