diff options
| author | Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> | 2001-07-27 12:21:56 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2001-07-27 12:21:56 +0000 |
| commit | 08ecdbebab368105c958935c47f6fde5d225e41a (patch) | |
| tree | bdb33f28f00529578649f74ce56672231922d6c3 /gcc | |
| parent | e69aa433648e76aed956a30679b38e57352d7e97 (diff) | |
| download | gcc-08ecdbebab368105c958935c47f6fde5d225e41a.zip gcc-08ecdbebab368105c958935c47f6fde5d225e41a.tar.gz gcc-08ecdbebab368105c958935c47f6fde5d225e41a.tar.bz2 | |
g++.exp (g++_set_ld_library_path): Renamed to ${tool}_set_ld_library_path.
gcc/testsuite:
* lib/g++.exp (g++_set_ld_library_path): Renamed to
${tool}_set_ld_library_path.
Changed caller.
* lib/objc.exp (${tool}_set_ld_library_path): New, copied from
g++.exp.
libjava/testsuite:
* lib/libjava.exp (${tool}_set_ld_library_path): New, copied from
g++.exp.
From-SVN: r44420
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/lib/g++.exp | 4 | ||||
| -rw-r--r-- | gcc/testsuite/lib/objc.exp | 14 |
3 files changed, 24 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 43c029a..70e87e0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2001-07-27 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * lib/g++.exp (g++_set_ld_library_path): Renamed to + ${tool}_set_ld_library_path. + Changed caller. + * lib/objc.exp (${tool}_set_ld_library_path): New, copied from + g++.exp. + 2001-07-26 Stan Cox <scox@redhat.com> * lib/g++.exp (g++_exit, g++_check_unsupported_p): Removed. diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp index c597b03..274a096 100644 --- a/gcc/testsuite/lib/g++.exp +++ b/gcc/testsuite/lib/g++.exp @@ -288,12 +288,12 @@ proc g++_target_compile { source dest type options } { # this on IRIX, but it shouldn't hurt to do it anywhere else. # -proc g++_set_ld_library_path { name element op } { +proc ${tool}_set_ld_library_path { name element op } { setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH] setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH] } -trace variable env(LD_LIBRARY_PATH) w g++_set_ld_library_path +trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path # # ${tool}_option_help diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp index c315b65..c3de61e 100644 --- a/gcc/testsuite/lib/objc.exp +++ b/gcc/testsuite/lib/objc.exp @@ -237,6 +237,20 @@ if { [info procs prune_warnings] == "" } then { } } +# On IRIX 6, we have to set variables akin to LD_LIBRARY_PATH, but +# called LD_LIBRARYN32_PATH (for the N32 ABI) and LD_LIBRARY64_PATH +# (for the 64-bit ABI). The right way to do this would be to modify +# unix.exp -- but that's not an option since it's part of DejaGNU +# proper, so we do it here, by trickery. We really only need to do +# this on IRIX, but it shouldn't hurt to do it anywhere else. + +proc ${tool}_set_ld_library_path { name element op } { + setenv LD_LIBRARYN32_PATH [getenv LD_LIBRARY_PATH] + setenv LD_LIBRARY64_PATH [getenv LD_LIBRARY_PATH] +} + +trace variable env(LD_LIBRARY_PATH) w ${tool}_set_ld_library_path + # Utility used by mike-gcc.exp and c-torture.exp. # Check the compiler(/assembler/linker) output for text indicating that # the testcase should be marked as "unsupported". |