This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[PATCH] Fix testsuite vs so_extension on win32.
- From: Dave Korn <dave dot korn dot cygwin at googlemail dot com>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 28 Apr 2009 05:54:51 +0100
- Subject: [PATCH] Fix testsuite vs so_extension on win32.
Next up: the in-tree libltdl looks for files with a '.dll' extension on
windows, but the testsuite framework builds files called '.so'. This is
easily fixed like so.
libjava/ChangeLog
* 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.
Verified that DLLs get built, and the testcases can successfully load them
and pass run tests that were previously failing. Ok?
cheers,
DaveK
Index: libjava/testsuite/libjava.jvmti/jvmti-interp.exp
===================================================================
--- libjava/testsuite/libjava.jvmti/jvmti-interp.exp (revision 146867)
+++ libjava/testsuite/libjava.jvmti/jvmti-interp.exp (working copy)
@@ -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"
Index: libjava/testsuite/lib/libjava.exp
===================================================================
--- libjava/testsuite/lib/libjava.exp (revision 146867)
+++ libjava/testsuite/lib/libjava.exp (working copy)
@@ -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"
}
Index: libjava/testsuite/libjava.jni/jni.exp
===================================================================
--- libjava/testsuite/libjava.jni/jni.exp (revision 146867)
+++ libjava/testsuite/libjava.jni/jni.exp (working copy)
@@ -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"
}