[PATCH] Fix Jacks testsuite invocation
Ulrich Weigand
weigand@immd1.informatik.uni-erlangen.de
Sat Feb 1 01:25:00 GMT 2003
Hello,
running the Jacks testsuite failed because it wouldn't find the
newly built libgcj classes or the libgcc_s library.
This patch sets up the LD_LIBRARY_PATH variable before starting
Jacks (to find libgcc_s), and writes an explicit JAVA_CLASSPATH
to the gcj_setup file (so that libgcj.jar is found).
Tested on s390-ibm-linux and s390x-ibm-linux on mainline
and 3.3 branch. OK to install?
Bye,
Ulrich
ChangeLog:
* libjava.jacks/jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH
to find libgcc_s. Set JAVA_CLASSPATH to find libgcj.jar.
Index: libjava/testsuite/libjava.jacks/jacks.exp
===================================================================
RCS file: /cvs/gcc/gcc/libjava/testsuite/libjava.jacks/jacks.exp,v
retrieving revision 1.2
diff -c -p -r1.2 jacks.exp
*** libjava/testsuite/libjava.jacks/jacks.exp 1 Dec 2002 23:50:03 -0000 1.2
--- libjava/testsuite/libjava.jacks/jacks.exp 31 Jan 2003 18:53:20 -0000
*************** proc gcj_jacks_setup_xfail {ary} {
*** 14,19 ****
--- 14,22 ----
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]
*************** proc gcj_jacks_write {filename} {
*** 22,28 ****
set fd [open $filename w]
puts $fd "set JAVAC $gcj_cmd"
! puts $fd "set JAVA_CLASSPATH \"\""
puts $fd "set JAVAC_FLAGS [list $rest]"
puts $fd "set JAVA [list [libjava_find_gij]]"
puts $fd "set JAVA_FLAGS \"\""
--- 25,31 ----
set fd [open $filename w]
puts $fd "set JAVAC $gcj_cmd"
! 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 \"\""
*************** proc gcj_jacks_write {filename} {
*** 32,37 ****
--- 35,42 ----
# "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} {
--
Dr. Ulrich Weigand
weigand@informatik.uni-erlangen.de
More information about the Java-patches
mailing list