From f2a9a0d8966ec3d0e765cb9eae5f55909084f5c3 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Sat, 28 Jan 2006 15:05:11 +0000
Subject: [PATCH] test for Bug 37237

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@373154 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/jar.xml                | 15 +++++++++++++++
 .../org/apache/tools/ant/taskdefs/JarTest.java    |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index f03d12596..5001f29a3 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -166,6 +166,7 @@
 
   <target name="cleanup">
     <delete file="${tmp.jar}" />
+    <delete file="${tmp.jar}2" />
     <delete dir="${tmp.dir}"/>
     <delete file="${tmp.zip}" />
     <delete dir="${tmp1.dir}"/>
@@ -222,4 +223,18 @@
     <unzip src="${tmp.jar}" dest="${tmp.dir}"/>
 
   </target>
+
+  <!-- bug 37237 -->
+  <target name="testIndexJarsPlusJarMarker">
+    <mkdir dir="${tmp.dir}/a/b/c"/>
+    <jar destfile="${tmp.jar}" basedir="${tmp.dir}"/>
+    <delete dir="${tmp.dir}/a" quiet="true"/>
+    <mkdir dir="${tmp.dir}/d/e/f"/>
+    <jar destfile="${tmp.jar}2" basedir="${tmp.dir}" index="true">
+      <indexjars>
+        <fileset file="${tmp.jar}"/>
+      </indexjars>
+    </jar>
+  </target>
+
 </project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
index 1a89321a7..40e69f1c4 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2005 The Apache Software Foundation
+ * Copyright  2000-2006 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -262,4 +262,8 @@ public class JarTest extends BuildFileTest {
         File manifestFile = getProject().resolveFile(tempDir + "META-INF" + File.separator + "MANIFEST.MF");
         assertTrue(manifestFile.exists());
     }
+
+    public void testIndexJarsPlusJarMarker() {
+        executeTarget("testIndexJarsPlusJarMarker");
+    }
 }