diff options
| author | John David Anglin <danglin@gcc.gnu.org> | 2004-11-24 04:39:41 +0000 |
|---|---|---|
| committer | John David Anglin <danglin@gcc.gnu.org> | 2004-11-24 04:39:41 +0000 |
| commit | 1df8e83465739411cbb95cbef1b79d520246ab1e (patch) | |
| tree | 01527763d9092da3909d80b1b0942d2439662fc2 /libjava/testsuite/libjava.jacks | |
| parent | be6601c384b7d9adbd0f1439ce004faa0c00f556 (diff) | |
| download | gcc-1df8e83465739411cbb95cbef1b79d520246ab1e.zip gcc-1df8e83465739411cbb95cbef1b79d520246ab1e.tar.gz gcc-1df8e83465739411cbb95cbef1b79d520246ab1e.tar.bz2 | |
target-libpath.exp: New file defining set_ld_library_path_env_vars and restore_ld_library_path_env_vars.
* lib/target-libpath.exp: New file defining set_ld_library_path_env_vars
and restore_ld_library_path_env_vars.
* g++.dg/compat/compat.exp, lib/g++.exp, lib/gcc-dg.exp,
lib/gfortran.exp, lib/objc.exp, lib/treelang.exp: Use new procs.
* ada/acats/run_acats (LD_LIBRARY_PATH): Add previous LD_LIBRARY_PATH
to LD_LIBRARY_PATH. Export LD_LIBRARY_PATH.
* testsuite/lib/libffi-dg.exp: Use new procs in target-libpath.exp.
* testsuite/lib/libjava.exp,
testsuite/libjava.jacks/jacks.exp: Use new procs in target-libpath.exp.
* testsuite/lib/libmudflap.exp: Use new procs in target-libpath.exp.
* testsuite/lib/libstdc++.exp: Use new procs in target-libpath.exp.
From-SVN: r91137
Diffstat (limited to 'libjava/testsuite/libjava.jacks')
| -rw-r--r-- | libjava/testsuite/libjava.jacks/jacks.exp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libjava/testsuite/libjava.jacks/jacks.exp b/libjava/testsuite/libjava.jacks/jacks.exp index 228e18f..32529e3 100644 --- a/libjava/testsuite/libjava.jacks/jacks.exp +++ b/libjava/testsuite/libjava.jacks/jacks.exp @@ -1,6 +1,13 @@ # Run the Jacks test suite. # See http://www-124.ibm.com/developerworks/oss/cvs/jikes/~checkout~/jacks/jacks.html +proc load_gcc_lib { filename } { + global srcdir + load_file $srcdir/../../gcc/testsuite/lib/$filename +} + +load_gcc_lib target-libpath.exp + proc gcj_jacks_setup_xfail {ary} { upvar $ary array global srcdir @@ -16,7 +23,7 @@ proc gcj_jacks_write {filename} { global GCJ_UNDER_TEST global libgcj_jar global libjava_libgcc_s_path - global original_ld_library_path + global ld_library_path set gcjl [split $GCJ_UNDER_TEST] set gcj_cmd [lindex $gcjl 0] @@ -43,7 +50,8 @@ proc gcj_jacks_write {filename} { # puts $fd "set tcltest::testConstraints(jvm) 1" close $fd - setenv LD_LIBRARY_PATH $libjava_libgcc_s_path:$original_ld_library_path + set ld_library_path $libjava_libgcc_s_path + set_ld_library_path_env_vars } proc gcj_jacks_parse {file} { |