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 /libmudflap | |
| 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 'libmudflap')
| -rw-r--r-- | libmudflap/ChangeLog | 4 | ||||
| -rw-r--r-- | libmudflap/testsuite/lib/libmudflap.exp | 31 |
2 files changed, 21 insertions, 14 deletions
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog index 880064a..969f929 100644 --- a/libmudflap/ChangeLog +++ b/libmudflap/ChangeLog @@ -1,3 +1,7 @@ +2004-11-23 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * testsuite/lib/libmudflap.exp: Use new procs in target-libpath.exp. + 2004-11-23 Kelley Cook <kcook@gcc.gnu.org> * Makefile.in, configure, aclocal.m4: Regenerate with automake 1.9.3. diff --git a/libmudflap/testsuite/lib/libmudflap.exp b/libmudflap/testsuite/lib/libmudflap.exp index 83544bb..8c604e1 100644 --- a/libmudflap/testsuite/lib/libmudflap.exp +++ b/libmudflap/testsuite/lib/libmudflap.exp @@ -17,22 +17,27 @@ # Define libmudflap callbacks for dg.exp. # This file is a copy of libstdc++-v3's dejagnu driver, with minor changes. +# Useful hook: if ${hostname}_init exists, it will be called, almost +# the last thing before testing begins. This can be defined in, e.g., +# ~/.dejagnurc or $DEJAGNU. + +proc load_gcc_lib { filename } { + global srcdir + load_file $srcdir/../../gcc/testsuite/lib/$filename +} + load_lib mfdg.exp load_lib libgloss.exp - +load_gcc_lib target-libpath.exp proc libmudflap-init { language } { - global srcdir - global outdir - global blddir - global cxx + global env + global srcdir outdir blddir objdir tool_root_dir + global cxx cxxflags global includes global libs - global cxxflags - global objdir global gluefile wrap_flags global ld_library_path - global tool_root_dir switch $language { "c" { set cxx [find_gcc] } @@ -96,12 +101,10 @@ proc libmudflap-init { language } { global add_flags append add_flags " $mfconfig_libs" - verbose -log "ld_library_path=$ld_library_path" - setenv LD_LIBRARY_PATH $ld_library_path - setenv SHLIB_PATH $ld_library_path - setenv LD_RUN_PATH $ld_library_path - setenv LD_LIBRARYN32_PATH $ld_library_path - setenv LD_LIBRARY64_PATH $ld_library_path + set_ld_library_path_env_vars + if [info exists env(LD_LIBRARY_PATH)] { + verbose -log "LD_LIBRARY_PATH = $env(LD_LIBRARY_PATH)" + } if { [target_info needs_status_wrapper]!=""} { file delete ${objdir}/testglue.o; |