@testcase PR#42574 ZIP and JAR extensions in classpath and extdirs

8 files changed, 97 insertions, 1 deletions

diff --git a/tests/ajcTestsFailing.xml b/tests/ajcTestsFailing.xml
index 933125dbe..adbb91c54 100644
--- a/tests/ajcTestsFailing.xml
+++ b/tests/ajcTestsFailing.xml
@@ -4,7 +4,25 @@
 <!-- contains valid tests that the compiler has never passed -->
 
 <suite>
-	
+
+	<ajc-test dir="bugs/extdirs"
+		pr="42574"
+		title="ZIP and JAR suffixes for classpath entries">
+		<compile 
+			argfiles="extdirs-src/main/main.lst"
+			classpath="dir-1/util-1.JAR,dir-2/util-2.ZIP"/>
+		<run class="Main"/>
+		</ajc-test>
+
+	<ajc-test dir="bugs/extdirs" 
+		pr="42574"
+		title="ZIP and JAR suffixes for extdirs entries">
+		<compile 
+			argfiles="extdirs-src/main/main.lst"
+			extdirs="dir-1,dir-2"/>
+		<run class="Main"/>
+		</ajc-test>
+
 	<ajc-test dir="bugs/privilege"
 		title="omnibus privileged access"
 		comment="from mail ~Problem with interfaces...~; add pr when bug submitted"
diff --git a/tests/bugs/extdirs/build.xml b/tests/bugs/extdirs/build.xml
new file mode 100644
index 000000000..7798f7189
--- /dev/null
+++ b/tests/bugs/extdirs/build.xml
@@ -0,0 +1,55 @@
+<project name="extdirs-setup" basedir="." default="all">
+
+	<target name="all">
+		<property 
+			name="classes.dir" 
+			location="${basedir}/classes"/>
+
+		<mkdir dir="${classes.dir}"/>
+		<delete	dir="${classes.dir}"/>
+		<mkdir dir="${classes.dir}"/>
+		<javac destdir="${classes.dir}"
+			target="1.1"
+			includes="**/*.java"
+			srcdir="${basedir}/extdirs-src/dir-1"/>		
+		<zip destfile="${basedir}/dir-1/util-1.JAR">
+			<fileset dir="${classes.dir}"/>	
+		</zip>
+		
+		<mkdir dir="${classes.dir}"/>
+		<delete	dir="${classes.dir}"/>
+		<mkdir dir="${classes.dir}"/>
+		<javac destdir="${classes.dir}"
+			target="1.1"
+			includes="**/*.java"
+			srcdir="${basedir}/extdirs-src/dir-2"/>		
+		<zip destfile="${basedir}/dir-2/util-2.ZIP">
+			<fileset dir="${classes.dir}"/>	
+		</zip>
+		
+
+		<mkdir dir="${classes.dir}"/>
+		<delete	dir="${classes.dir}"/>
+		<mkdir dir="${classes.dir}"/>
+		<javac 
+			destdir="${classes.dir}"
+			srcdir="${basedir}/extdirs-src/main"
+			includes="Main.java">
+			<classpath>
+				<pathelement path="${basedir}/dir-2/util-2.ZIP"/>
+				<pathelement path="${basedir}/dir-1/util-1.JAR"/>
+			</classpath>		
+		</javac>
+		<java classname="Main">
+			<classpath>
+				<pathelement path="${classes.dir}"/>
+				<pathelement path="${basedir}/dir-2/util-2.ZIP"/>
+				<pathelement path="${basedir}/dir-1/util-1.JAR"/>
+			</classpath>		
+		</java>
+		<mkdir dir="${classes.dir}"/>
+		<delete dir="${classes.dir}"/>
+
+	</target>
+
+</project>
\ No newline at end of file
diff --git a/tests/bugs/extdirs/dir-1/util-1.JAR b/tests/bugs/extdirs/dir-1/util-1.JAR
new file mode 100644
index 000000000..0342041aa
--- /dev/null
+++ b/tests/bugs/extdirs/dir-1/util-1.JAR
diff --git a/tests/bugs/extdirs/dir-2/util-2.ZIP b/tests/bugs/extdirs/dir-2/util-2.ZIP
new file mode 100644
index 000000000..276240568
--- /dev/null
+++ b/tests/bugs/extdirs/dir-2/util-2.ZIP
diff --git a/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java b/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java
new file mode 100644
index 000000000..fc17f5cb1
--- /dev/null
+++ b/tests/bugs/extdirs/extdirs-src/dir-1/pack/Util.java
@@ -0,0 +1,7 @@
+
+package pack;
+
+public class Util {
+    public static void main(String[] args) {
+    }
+}
\ No newline at end of file
diff --git a/tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java b/tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java
new file mode 100644
index 000000000..9678b8226
--- /dev/null
+++ b/tests/bugs/extdirs/extdirs-src/dir-2/pack2/Util2.java
@@ -0,0 +1,7 @@
+
+package pack2;
+
+public class Util2 {
+    public static void main(String[] args) {
+    }
+}
\ No newline at end of file
diff --git a/tests/bugs/extdirs/extdirs-src/main/Main.java b/tests/bugs/extdirs/extdirs-src/main/Main.java
new file mode 100644
index 000000000..987cbf32b
--- /dev/null
+++ b/tests/bugs/extdirs/extdirs-src/main/Main.java
@@ -0,0 +1,8 @@
+
+/** @testcase PR#42574 ZIP and JAR extensions in classpath and extdirs */
+public class Main {
+    public static void main(String[] args) {
+        pack.Util.main(args);
+        pack2.Util2.main(args);
+    }
+}
\ No newline at end of file
diff --git a/tests/bugs/extdirs/extdirs-src/main/main.lst b/tests/bugs/extdirs/extdirs-src/main/main.lst
new file mode 100644
index 000000000..53d33fb7e
--- /dev/null
+++ b/tests/bugs/extdirs/extdirs-src/main/main.lst
@@ -0,0 +1 @@
+Main.java