jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH to find libgcc_s.

	* libjava.jacks/jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH
	to find libgcc_s.  Set JAVA_CLASSPATH to find libgcj.jar.

From-SVN: r62318

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index c1edda6..eda5882 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-03  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * libjava.jacks/jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH
+       to find libgcc_s.  Set JAVA_CLASSPATH to find libgcj.jar.
+
 2003-01-31  Mark Wielaard  <mark@klomp.org>
 
        * lib/libjava.exp (libjava_prune_warnings): Remove all unreachable

diff --git a/libjava/testsuite/libjava.jacks/jacks.exp b/libjava/testsuite/libjava.jacks/jacks.exp
index b7f87eb..d8611f5 100644 (file)
--- a/libjava/testsuite/libjava.jacks/jacks.exp
+++ b/libjava/testsuite/libjava.jacks/jacks.exp
@@ -14,6 +14,9 @@ proc gcj_jacks_setup_xfail {ary} {
 
 proc gcj_jacks_write {filename} {
   global GCJ_UNDER_TEST
+  global libgcj_jar
+  global libjava_libgcc_s_path
+  global original_ld_library_path
 
   set gcjl [split $GCJ_UNDER_TEST]
   set gcj_cmd [lindex $gcjl 0]
@@ -22,7 +25,7 @@ proc gcj_jacks_write {filename} {
 
   set fd [open $filename w]
   puts $fd "set JAVAC $gcj_cmd"
-  puts $fd "set JAVA_CLASSPATH \"\""
+  puts $fd "set JAVA_CLASSPATH \"$libgcj_jar\""
   puts $fd "set JAVAC_FLAGS [list $rest]"
   puts $fd "set JAVA [list [libjava_find_gij]]"
   puts $fd "set JAVA_FLAGS \"\""
@@ -32,6 +35,8 @@ proc gcj_jacks_write {filename} {
   # "Time-consuming JVM limitation tests".
   # puts $fd "set tcltest::testConstraints(jvm) 1"
   close $fd
+
+  setenv LD_LIBRARY_PATH $libjava_libgcc_s_path:$original_ld_library_path
 }
 
 proc gcj_jacks_parse {file} {