* testsuite/libjava.jvmti/jvmti-interp.exp

	(gcj_jni_compile_c_to_so):  Fix so extension to '.dll' on win32.
	* testsuite/lib/libjava.exp (libjava_init):  Likewise.
	* testsuite/libjava.jni/jni.exp
	(gcj_jni_compile_c_to_so):  Likewise.
	(gcj_jni_test_one):  Likewise.

From-SVN: r146896

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 294a440748cc4e6e36b2d1c1df0b37fda54eb3c9..cb57e6f71ebc667c5d6cb5140184b8e1c4c7db95 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2009-04-28  Dave Korn  <dave.korn.cygwin@gmail.com>
+
+       * testsuite/libjava.jvmti/jvmti-interp.exp
+       (gcj_jni_compile_c_to_so):  Fix so extension to '.dll' on win32.
+       * testsuite/lib/libjava.exp (libjava_init):  Likewise.
+       * testsuite/libjava.jni/jni.exp
+       (gcj_jni_compile_c_to_so):  Likewise.
+       (gcj_jni_test_one):  Likewise.
+
 2009-04-28  Andrew Haley  <aph@redhat.com>
 
        PR libgcj/39899

diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index a31c2bc63d3d176ede46d023fd60ffd431ed34d1..510e4ac80d8b8d671ea83344977ddf9cb653bf80 100644 (file)
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -202,6 +202,8 @@ proc libjava_init { args } {
 
     if { [istarget "*-*-darwin*"] } {
        set so_extension "dylib"
+    } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
+       set so_extension "dll"
     } else {
        set so_extension "so"
     }

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 4ed27cdf0d1192e0ac121d4b46b00f15747a8f0c..65051287b5a19618d5895ce7fc1e36a9b5a7a00f 100644 (file)
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -21,6 +21,9 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
   } elseif { [istarget "hppa*-hp-hpux*"] } {
       set so_extension "sl"
       set so_flag "-shared"
+  } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
+      set so_extension "dll"
+      set so_flag "-shared"
   } else {
       set so_extension "so"
       set so_flag "-shared"
@@ -99,6 +102,8 @@ proc gcj_jni_test_one {file} {
       set so_extension "dylib"
   } elseif { [istarget "hppa*-hp-hpux*"] } {
       set so_extension "sl"
+  } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
+      set so_extension "dll"
   } else {
       set so_extension "so"
   }

diff --git a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
index 68b1fc8c17788debf0149ac5abab2d2c0eb54372..e81eda520250e713495a4561012752ee693a2a61 100644 (file)
--- a/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
+++ b/libjava/testsuite/libjava.jvmti/jvmti-interp.exp
@@ -25,6 +25,9 @@ proc gcj_jni_compile_c_to_so {file {options {}}} {
   } elseif { [istarget "hppa*-hp-hpux*"] } {
       set so_extension "sl"
       set so_flag "-shared"
+  } elseif { [istarget "*-*-cygwin*"] || [istarget "*-*-mingw*"] } {
+      set so_extension "dll"
+      set so_flag "-shared"
   } else {
       set so_extension "so"
       set so_flag "-shared"