diff options
| author | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-03 16:20:30 +0000 |
|---|---|---|
| committer | uweigand <uweigand@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-03 16:20:30 +0000 |
| commit | 8da93d2a1abbf502295bea1d3ae64ffa9454b01f (patch) | |
| tree | 6d53469f37a50a9fa5589c2c71cf1540f3ea73a7 /libjava/testsuite/libjava.jacks/jacks.exp | |
| parent | 02fff0c972e317635c44138ca1735654728c5b44 (diff) | |
| download | ppe42-gcc-8da93d2a1abbf502295bea1d3ae64ffa9454b01f.tar.gz ppe42-gcc-8da93d2a1abbf502295bea1d3ae64ffa9454b01f.zip | |
* libjava.jacks/jacks.exp (gcj_jacks_write): Set LD_LIBRARY_PATH
to find libgcc_s. Set JAVA_CLASSPATH to find libgcj.jar.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@62318 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/testsuite/libjava.jacks/jacks.exp')
| -rw-r--r-- | libjava/testsuite/libjava.jacks/jacks.exp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libjava/testsuite/libjava.jacks/jacks.exp b/libjava/testsuite/libjava.jacks/jacks.exp index b7f87eb6316..d8611f5e438 100644 --- 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} { |
