From 8f92f0732e74ef17dfb722cf457682843afe61d7 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 7 Feb 2007 22:02:40 +0000
Subject: [PATCH] 	* testsuite/libjava.jni/init.c: New file. 	*
 testsuite/libjava.jni/init.java: New file. 	*
 testsuite/libjava.jni/init.out: New file. 	*
 testsuite/libjava.jni/init.jar: New file. 	*
 testsuite/libjava.jni/init.h: New file. 	*
 testsuite/libjava.jni/init$NativeClass.h: New file.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121698 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/ChangeLog                             |   9 ++++++
 .../testsuite/libjava.jni/init$NativeClass.h  |  19 +++++++++++++
 libjava/testsuite/libjava.jni/init.c          |   8 ++++++
 libjava/testsuite/libjava.jni/init.h          |  18 ++++++++++++
 libjava/testsuite/libjava.jni/init.jar        | Bin 0 -> 1294 bytes
 libjava/testsuite/libjava.jni/init.java       |  26 ++++++++++++++++++
 libjava/testsuite/libjava.jni/init.out        |   3 ++
 7 files changed, 83 insertions(+)
 create mode 100644 libjava/testsuite/libjava.jni/init$NativeClass.h
 create mode 100644 libjava/testsuite/libjava.jni/init.c
 create mode 100644 libjava/testsuite/libjava.jni/init.h
 create mode 100644 libjava/testsuite/libjava.jni/init.jar
 create mode 100644 libjava/testsuite/libjava.jni/init.java
 create mode 100644 libjava/testsuite/libjava.jni/init.out

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cc6a25fcd7d7..06c1a1f9e971 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2007-02-07  Tom Tromey  <tromey@redhat.com>
+
+	* testsuite/libjava.jni/init.c: New file.
+	* testsuite/libjava.jni/init.java: New file.
+	* testsuite/libjava.jni/init.out: New file.
+	* testsuite/libjava.jni/init.jar: New file.
+	* testsuite/libjava.jni/init.h: New file.
+	* testsuite/libjava.jni/init$NativeClass.h: New file.
+
 2007-02-07  Jakub Jelinek  <jakub@redhat.com>
 
 	PR libgomp/28468
diff --git a/libjava/testsuite/libjava.jni/init$NativeClass.h b/libjava/testsuite/libjava.jni/init$NativeClass.h
new file mode 100644
index 000000000000..0ae6d4cc4779
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/init$NativeClass.h
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#include <jni.h>
+
+#ifndef __init_00024NativeClass__
+#define __init_00024NativeClass__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+JNIEXPORT void JNICALL Java_init_00024NativeClass_printHello (JNIEnv *env, jclass);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __init_00024NativeClass__ */
diff --git a/libjava/testsuite/libjava.jni/init.c b/libjava/testsuite/libjava.jni/init.c
new file mode 100644
index 000000000000..458d6d789406
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/init.c
@@ -0,0 +1,8 @@
+#include <jni.h>
+#include <init$NativeClass.h>
+
+JNIEXPORT void JNICALL
+Java_init_00024NativeClass_printHello(JNIEnv *env, jclass cl)
+{
+	printf("hello\n");
+}
diff --git a/libjava/testsuite/libjava.jni/init.h b/libjava/testsuite/libjava.jni/init.h
new file mode 100644
index 000000000000..4ad329871e19
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/init.h
@@ -0,0 +1,18 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#include <jni.h>
+
+#ifndef __init__
+#define __init__
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __init__ */
diff --git a/libjava/testsuite/libjava.jni/init.jar b/libjava/testsuite/libjava.jni/init.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1bf20ac9827e0ba41ba1e4c3727cbf82d1dddc46
GIT binary patch
literal 1294
zc-jl_W@h1H00HY%cQXbgzzM{@t|5-Po_=on0Vv9L=;kKs0NEfcf~?Hf(a+P(H8@1i
z*UdLEFEcH*xI{NBwWv5VKhH|RP|twNxhOTUBsE3XsnSZpK+n=hH$6F-iwkBt2iWwA
z{~?jn7#SFrGchoLL^Ja;OZ1X+5{rv-15SG}8;aOwW-mAHTYt^H_IkPKmKWO|xe2s7
zwsuK}zm&*QnLBZ2$c6ovTD!RI5A+M=FUpvjHnHHmZGZLWe;<FbB}hy28Sz+3dcIXS
zZcuYJztZ>Picss!xb6UBkuvAhU)4M}U;VP&`2Df>!$Yq7ncw#>DV&~l@!P}Xh7*PD
zSCSiZPwyz3b;85EM5$tT+yQ~Z8LM_qOFTNmd)<@09$L5M+yaUMQZ&8_{E|2-(OjIY
zAUd(u^hMWomhG?7jxBU>d$i+nUe}Wz^Qj3MY=tMTTKX?px&Ppwb$8D=iv`=AI&rz|
zm)Ei@oIcC_N@sg>Nv)6j;`J%u;G$;MUu=it?UwcC9o_dR^HuW6AC+a-oEL`pq}gOn
ztX$bHZYW)-&Uv)aWb)2qd8ao>{8_9a)M+ZZ<lTF&gG?`$C;Ex8eo^$_>U>qrNUT&o
zP=n7d@ke79&#{-^a#nkM(NWXk5}I1S#I#CsZ>{wC8Goie)%~IRaX-h5V?8Gi=seqZ
z)cP9FiM<K`>QiQ3nH>8|X4=Li%hliFoUay1)@mKLy5o-;d!CyA*Y*HoF9H~QV$j%A
z@k=bpEK79;#UV5%C!F=W?I6;6UPa*l5yc4~ZVP!R>MrD7RCZ8p#cYoiQ`d-SYW(gr
z_G0(VF`4JWm48+5Ru?P(0q4-Y#;#MsDjvSBe)spB%=y3TZ(B3Gzwj*}A!6!EleKo{
zMS4|T&v&+~2Ce@wr(DEeeeU_i+7l(%{_6ymeP?#wSZk9K@hUZ0P{HA*^ACQbh$n77
z$}TG|6qzYkDVHVBEY;iMbM`>S!R4{?p>1F9TzKhuc@{8gdoP^*u6QlrdqDCEduF$Y
z<8004xvEnq)mqmT?NO|}WGnaU#-bV5%$Llt7L1EnwZ_P<@2N-e-h>s$j70z5EK&KQ
zDzAAkpnG%6YQ^i9zVRo$JoC4@L+P8cNq|!FXV+(CfB#FrF>2Af>Ao<;?X1G=mo9U>
zvqf&a6_%c+_-o2CCu_G0dxLL$5|-Y>bXV?8a7%ycloj7sSi2rvseS*!^{{=(Tetlb
zz8&wW`C#c)Sy2JuMNW6t&2D&cY_WU0*5X}%zOjG%w`i&TBIiZz@6}itxeFYEcbC7o
zr@LpFl+|o=3#Sj#0p5&ETnxAi0aSogB%o?TFBA|!9Y+y?FadkUM}St8VgOwqdXhr`
YXC_<;Fu<FY4Wxnv2)_bpW)=_+02Jcnr~m)}

literal 0
Hc-jL100001

diff --git a/libjava/testsuite/libjava.jni/init.java b/libjava/testsuite/libjava.jni/init.java
new file mode 100644
index 000000000000..3303d319e746
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/init.java
@@ -0,0 +1,26 @@
+// Regression test for JNI and static initializers.
+
+public class init
+{
+  public static class NativeClass
+  {
+    static
+    {
+      System.out.println("static initializer 2");
+      System.loadLibrary("init"); // if it's here, this app doesn't work
+    }
+
+    public static native void printHello();
+  }
+
+  static
+  {
+    System.out.println("static initializer 1");
+  }
+
+  public static void main(String[] args)
+  {
+    //System.loadLibrary("test"); // if it's here, this app works
+    NativeClass.printHello();
+  }
+}
diff --git a/libjava/testsuite/libjava.jni/init.out b/libjava/testsuite/libjava.jni/init.out
new file mode 100644
index 000000000000..4e62d1ffe6b3
--- /dev/null
+++ b/libjava/testsuite/libjava.jni/init.out
@@ -0,0 +1,3 @@
+static initializer 1
+static initializer 2
+hello
-- 
2.47.3