svn commit: r643076 - in /ant/core/trunk: WHATSNEW src/etc/testcases/taskdefs/ant.xml src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java

[jg...@apache.org]

Author: jglick
Date: Mon Mar 31 10:34:31 2008
New Revision: 643076

URL: http://svn.apache.org/viewvc?rev=643076&view=rev
Log:
Adding test case and further note for #42263 w.r.t. ${ant.core.lib} propagation.

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/etc/testcases/taskdefs/ant.xml
    ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=643076&r1=643075&r2=643076&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Mon Mar 31 10:34:31 2008
@@ -173,8 +173,10 @@
 * Regression: concat fixlastline="true" should not have applied to
   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.
   Bugzilla bug 41596.

Modified: ant/core/trunk/src/etc/testcases/taskdefs/ant.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/etc/testcases/taskdefs/ant.xml?rev=643076&r1=643075&r2=643076&view=diff
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/ant.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/ant.xml Mon Mar 31 10:34:31 2008
@@ -251,4 +251,11 @@
   <target name="db"><echo>db</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>

Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java?rev=643076&r1=643075&r2=643076&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java (original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java Mon Mar 31 10:34:31 2008
@@ -311,6 +311,11 @@
         expectLog("multiple-targets-2", "dadctb");
     }
 
+    public void testAntCoreLib() {
+        // Cf. #42263
+        expectLogContaining("sub-show-ant.core.lib", "ant.jar");
+    }
+
     private class BasedirChecker implements BuildListener {
         private String[] expectedBasedirs;
         private int calls = 0;