From 2adccd409ba54c662b8d60d1b57092976812843d Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 10 Nov 2003 21:30:10 +0000
Subject: [PATCH] 	For PR java/12996: 	* libjava.jar/simple.jar: New
 file. 	* libjava.jar/simple.xfail: New file. 	* libjava.jar/simple.out: New
 file. 	* libjava.jar/simple.java: New file. 	* libjava.jar/jar.exp: New
 file.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73426 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/testsuite/ChangeLog                |   9 +++++
 libjava/testsuite/libjava.jar/jar.exp      |  59 +++++++++++++++++++++++++++++
 libjava/testsuite/libjava.jar/simple.jar   | Bin 0 -> 700 bytes
 libjava/testsuite/libjava.jar/simple.java  |   7 ++++
 libjava/testsuite/libjava.jar/simple.out   |   1 +
 libjava/testsuite/libjava.jar/simple.xfail |   1 +
 6 files changed, 77 insertions(+)
 create mode 100644 libjava/testsuite/libjava.jar/jar.exp
 create mode 100644 libjava/testsuite/libjava.jar/simple.jar
 create mode 100644 libjava/testsuite/libjava.jar/simple.java
 create mode 100644 libjava/testsuite/libjava.jar/simple.out
 create mode 100644 libjava/testsuite/libjava.jar/simple.xfail

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index b95f26b78ad..6ee2f060512 100644
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-10  Tom Tromey  <tromey@redhat.com>
+
+	For PR java/12996:
+	* libjava.jar/simple.jar: New file.
+	* libjava.jar/simple.xfail: New file.
+	* libjava.jar/simple.out: New file.
+	* libjava.jar/simple.java: New file.
+	* libjava.jar/jar.exp: New file.
+
 2003-11-08  Tom Tromey  <tromey@redhat.com>
 
 	* libjava.jacks/jacks.xfail: Updated.
diff --git a/libjava/testsuite/libjava.jar/jar.exp b/libjava/testsuite/libjava.jar/jar.exp
new file mode 100644
index 00000000000..70a176ee43c
--- /dev/null
+++ b/libjava/testsuite/libjava.jar/jar.exp
@@ -0,0 +1,59 @@
+# Tests for .jar files.
+
+# Compile a single .jar file to an executable.
+# Returns 0 on failure.
+proc gcj_jar_link {jarfile mainclass} {
+}
+
+proc gcj_jar_compile_one {jarfile mainclass} {
+  set base [file rootname [file tail $jarfile]]
+  set out [file rootname $jarfile].out
+
+  if {! [gcj_link $base $mainclass [list $jarfile]]} {
+    return
+  }
+
+  gcj_invoke $base $out {}
+}
+
+proc gcj_jar_interpret {jarfile} {
+  global INTERPRETER srcdir
+
+  set gij [libjava_find_gij] 
+  # libjava_find_gij will return `gij' if it couldn't find the
+  # program; in this case we want to skip the test.
+  if {$INTERPRETER != "yes" || $gij == "gij"} {
+    untested "$jarfile execution - gij test"
+    untested "$jarfile output - gij test"
+    return
+  }
+
+  set opts(_) {}
+  set out [file rootname $jarfile].out
+  libjava_invoke $jarfile "gij test" opts $gij {} $out \
+    -jar $jarfile
+}
+
+proc gcj_jar_run {} {
+  global srcdir subdir
+  foreach jar [lsort [glob -nocomplain ${srcdir}/${subdir}/*.jar]] {
+    set xff [file rootname $jar].xfail
+    set main {}
+    set interp 1
+    foreach item [libjava_read_xfail $xff] {
+      if {[string match main=* $item]} {
+	set main [string range $item 5 end]
+	break
+      } elseif {$item == "no-interpret"} {
+	set interp 0
+      }
+    }
+
+    gcj_jar_compile_one $jar $main
+    if {$interp} {
+      gcj_jar_interpret $jar
+    }
+  }
+}
+
+gcj_jar_run
diff --git a/libjava/testsuite/libjava.jar/simple.jar b/libjava/testsuite/libjava.jar/simple.jar
new file mode 100644
index 0000000000000000000000000000000000000000..e11666fc87513b2a20e7a1238e47cadecf332227
GIT binary patch
literal 700
zcmWIWW@h1H00F*&EPXHoN^k;cU)K;vT~9wZ{Q$T!{lYB$tq$(G4nS!T7GV%YDD!pn
z^K^3!4$<><3k~69VD9?2-X4TQD_9s_Fu!2-P0Y(oOD!(Z4NEO5&dkrVQZUpr;BqcX
zO)N=G(RHe{QZUf7G}28^PUhnBP0Y;Gb<RmFF1AuA&de>yN#$aIIfH|N3+USQe1CWI
zF)}c805K2HDG*h9$sj$s0jIqV2ME|s-r_mg?YGgs*d5-iXW2vUaIEX%5;R|z_iE|A
zN$#HcEcUDQL}Gq0)=jbSWEHFuH$F4xxb2zi-;b;N%z4z2pc`W4zl2w*B>hojOXrDY
z4}EPW3+EnIF$r2|bg1lu!N0@Gu`6<{r0yBl&9pyN|L8^P!qlwAt_Gijg#SzpdiqfJ
zv`P0;4|lnkEwUCLIF3!uN}OyE;k@Od>W$A?6AJ|FBc>mAmS+~X%@MRpo_g}NQEzIY
z`lFV^k<Yb)e>Ht(5iMokttWLuc}HNJm~iD%t+49S?#-v<jvLGfvTas2OKf!h5c0Nj
z_vfzOy63$ACb8S`hp%Rv74x$>zN)`^uWjY=f1AE3%UoI4ZXe*y$i&5fJD!1ohXjyf
zosmfdstq&VdBIwMVGjiAKn&N0k_uQMsUWn10T_EQS747nut{KI9gswh%>Zv!Hjo4}
M5FP;1&%m|<0QaWOTmS$7

literal 0
HcmV?d00001

diff --git a/libjava/testsuite/libjava.jar/simple.java b/libjava/testsuite/libjava.jar/simple.java
new file mode 100644
index 00000000000..848ebe12640
--- /dev/null
+++ b/libjava/testsuite/libjava.jar/simple.java
@@ -0,0 +1,7 @@
+public class simple
+{
+  public static void main(String[] args)
+  {
+    System.out.println("hi");
+  }
+}
diff --git a/libjava/testsuite/libjava.jar/simple.out b/libjava/testsuite/libjava.jar/simple.out
new file mode 100644
index 00000000000..45b983be36b
--- /dev/null
+++ b/libjava/testsuite/libjava.jar/simple.out
@@ -0,0 +1 @@
+hi
diff --git a/libjava/testsuite/libjava.jar/simple.xfail b/libjava/testsuite/libjava.jar/simple.xfail
new file mode 100644
index 00000000000..478dfc79460
--- /dev/null
+++ b/libjava/testsuite/libjava.jar/simple.xfail
@@ -0,0 +1 @@
+main=simple
-- 
2.11.0