Author: bodewig
Date: Sat Jan 28 07:05:11 2006
New Revision: 373154
URL: http://svn.apache.org/viewcvs?rev=373154&view=rev
Log:
test for Bug 37237
Modified:
ant/core/trunk/src/etc/testcases/taskdefs/jar.xml
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Modified: ant/core/trunk/src/etc/testcases/taskdefs/jar.xml
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/etc/testcases/taskdefs/jar.xml?rev=373154&r1=373153&r2=373154&view=diff
==============================================================================
--- ant/core/trunk/src/etc/testcases/taskdefs/jar.xml (original)
+++ ant/core/trunk/src/etc/testcases/taskdefs/jar.xml Sat Jan 28 07:05:11 2006
@@ -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>
Modified:
ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
URL:
http://svn.apache.org/viewcvs/ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java?rev=373154&r1=373153&r2=373154&view=diff
==============================================================================
--- ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
(original)
+++ ant/core/trunk/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java Sat
Jan 28 07:05:11 2006
@@ -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.
@@ -261,5 +261,9 @@
expectLogContaining("testManifestOnlyJar", "Building MANIFEST-only
jar: ");
File manifestFile = getProject().resolveFile(tempDir + "META-INF" +
File.separator + "MANIFEST.MF");
assertTrue(manifestFile.exists());
+ }
+
+ public void testIndexJarsPlusJarMarker() {
+ executeTarget("testIndexJarsPlusJarMarker");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
