jni.exp (gcj_jni_test_one): Don't link the main binary against the JNI shared library.

2004-05-07  Ranjit Mathew  <rmathew@gmail.com>

	* testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Don't link the
	main binary against the JNI shared library.

From-SVN: r81622

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ceaaa7b49c811a785f8bd548120824d726619a8f..022c6ee6f703597a937638a0b4cb741164090847 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-07  Ranjit Mathew  <rmathew@gmail.com>
+
+       * testsuite/libjava.jni/jni.exp (gcj_jni_test_one): Don't link the
+       main binary against the JNI shared library.
+
 2004-05-07  Jerry Quinn  <jlquinn@optonline.net>
 
        * java/util/SimpleTimeZone.java (startTimeMode, endTimeMode,

diff --git a/libjava/testsuite/libjava.jni/jni.exp b/libjava/testsuite/libjava.jni/jni.exp
index 3c9f3e48a6add14f968b255695248ffac056d854..5ca07abb07d38aae807fbcf3ac1fc7e0594e71b8 100644 (file)
--- a/libjava/testsuite/libjava.jni/jni.exp
+++ b/libjava/testsuite/libjava.jni/jni.exp
@@ -137,9 +137,7 @@ proc gcj_jni_test_one {file} {
     return 0
   }
 
-  # We use -l$main because the .so is named the same as the main
-  # program.
-  set args [list "additional_flags=-fjni -L. -l$main"]
+  set args [list "additional_flags=-fjni"]
   if {! [gcj_link $main $main $file $args]} {
     # FIXME
     return 0