From 08ecdbebab368105c958935c47f6fde5d225e41a Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Fri, 27 Jul 2001 12:21:56 +0000 Subject: [PATCH] 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 --- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/lib/g++.exp | 4 ++-- gcc/testsuite/lib/objc.exp | 14 ++++++++++++++ libjava/testsuite/ChangeLog | 5 +++++ libjava/testsuite/lib/libjava.exp | 14 ++++++++++++++ 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 43c029a8206..70e87e0f93e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2001-07-27 Rainer Orth + + * 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 * 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 c597b03c540..274a0965201 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 c315b6503b6..c3de61e8149 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". diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 4db61674c51..8889313c124 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2001-07-27 Rainer Orth + + * lib/libjava.exp (${tool}_set_ld_library_path): New, copied from + g++.exp. + 2001-07-19 Jeff Sturm * libjava.lang/PR3731.java: New file. diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index ace5f6c2b2d..9b45f3c1666 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -787,6 +787,20 @@ proc default_libjava_version {} { proc default_libjava_start { } { } +# 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 + # Local Variables: # tcl-indent-level:4 # End: -- 2.30.2