From 7546276d2f2a339b24fbdacc84887c4f65edde27 Mon Sep 17 00:00:00 2001
From: "Jesse N. Glick" <jglick@apache.org>
Date: Mon, 31 Mar 2008 17:34:31 +0000
Subject: [PATCH] Adding test case and further note for #42263 w.r.t.
 ${ant.core.lib} propagation.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@643076 13f79535-47bb-0310-9956-ffa450edef68
---
 WHATSNEW                                                   | 6 ++++--
 src/etc/testcases/taskdefs/ant.xml                         | 7 +++++++
 src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java | 5 +++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/WHATSNEW b/WHATSNEW
index e8843a292..b275bfff9 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -173,8 +173,10 @@ Fixed bugs:
 * 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.
diff --git a/src/etc/testcases/taskdefs/ant.xml b/src/etc/testcases/taskdefs/ant.xml
index 0d2dc4cbf..33ef1dab2 100644
--- a/src/etc/testcases/taskdefs/ant.xml
+++ b/src/etc/testcases/taskdefs/ant.xml
@@ -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>
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 32a55b57d..8d418aca0 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/AntTest.java
@@ -311,6 +311,11 @@ public class AntTest extends BuildFileTest {
         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;