compat.exp: Add LD_LIBRARY_PATH_32/64 for Solaris.

2004-01-23  Andreas Tobler  <a.tobler@schweiz.ch>

	* g++.dg/compat/compat.exp: Add LD_LIBRARY_PATH_32/64 for Solaris.
	* lib/g77.exp: Likewise.
	* lib/objc.exp: Likewise.
	* lib/g++.exp: Likewise.

From-SVN: r76397

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9d8d1fb01bca8380bfe81eb64474e25cfca8a6ca..20b71833ae3907b3e4680eda8c943c68a32b59be 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-23  Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * g++.dg/compat/compat.exp: Add LD_LIBRARY_PATH_32/64 for Solaris.
+       * lib/g77.exp: Likewise.
+       * lib/objc.exp: Likewise.
+       * lib/g++.exp: Likewise.
+
 2004-01-22  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * gcc.dg/struct-by-value-2.c: New test.

diff --git a/gcc/testsuite/g++.dg/compat/compat.exp b/gcc/testsuite/g++.dg/compat/compat.exp
index 94da38c77de764b3741025b455919b51427e0423..df8dac96992cb58c448e3e81f0945b05e724d1da 100644 (file)
--- a/gcc/testsuite/g++.dg/compat/compat.exp
+++ b/gcc/testsuite/g++.dg/compat/compat.exp
@@ -49,6 +49,9 @@ proc compat-fix-library-path { } {
        setenv  SHLIB_PATH          $ld_library_path
        setenv  LD_LIBRARYN32_PATH  $ld_library_path
        setenv  LD_LIBRARY64_PATH   $ld_library_path
+       setenv  LD_LIBRARY_PATH_32  $ld_library_path
+       setenv  LD_LIBRARY_PATH_64  $ld_library_path
+       setenv  DYLD_LIBRARY_PATH   $ld_library_path
     }
 }
 

diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 8b30b60af14d1cc263eb0770dacca5fd13368726..a9f99fa26d85f35b78a173336c9fff6ee6ee05a9 100644 (file)
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -170,14 +170,18 @@ proc g++_link_flags { paths } {
     # 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.  We really only need to do 
-    # this on IRIX, but it shouldn't hurt to do it anywhere else.
+    # proper, so we do it here.
+    # The same applies to Darwin (DYLD_LIBRARY_PATH), Solaris 32 bit
+    # (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX
+    # (SHLIB_PATH).
     # Doing this does cause trouble when testing cross-compilers.
     if {![is_remote target]} {
        setenv  LD_LIBRARY_PATH     $ld_library_path
        setenv  SHLIB_PATH          $ld_library_path
        setenv  LD_LIBRARYN32_PATH  $ld_library_path
        setenv  LD_LIBRARY64_PATH   $ld_library_path
+       setenv  LD_LIBRARY_PATH_32  $ld_library_path
+       setenv  LD_LIBRARY_PATH_64  $ld_library_path
        setenv  DYLD_LIBRARY_PATH   $ld_library_path
     }
 

diff --git a/gcc/testsuite/lib/g77.exp b/gcc/testsuite/lib/g77.exp
index f8c517163bf523efa80365e3670dfd51b81a9cdf..c722c20c31a4b7c986c74c2093550b454cb7c9b5 100644 (file)
--- a/gcc/testsuite/lib/g77.exp
+++ b/gcc/testsuite/lib/g77.exp
@@ -114,12 +114,16 @@ proc g77_link_flags { paths } {
     # 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.  We really only need to do 
-    # this on IRIX, but it shouldn't hurt to do it anywhere else.
+    # proper, so we do it here.
+    # The same applies to Darwin (DYLD_LIBRARY_PATH), Solaris 32 bit
+    # (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX
+    # (SHLIB_PATH).
     setenv  LD_LIBRARY_PATH     $ld_library_path
     setenv  SHLIB_PATH          $ld_library_path
     setenv  LD_LIBRARYN32_PATH  $ld_library_path
     setenv  LD_LIBRARY64_PATH   $ld_library_path
+    setenv  LD_LIBRARY_PATH_32  $ld_library_path
+    setenv  LD_LIBRARY_PATH_64  $ld_library_path
     setenv  DYLD_LIBRARY_PATH   $ld_library_path
 
     return "$flags"

diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp
index 14bdf133168e4693f6c4fa1610be9c36dd3d71cc..1b6c10d60fec80f29023d99167ddd78d22fb1dfb 100644 (file)
--- a/gcc/testsuite/lib/objc.exp
+++ b/gcc/testsuite/lib/objc.exp
@@ -188,13 +188,17 @@ proc objc_target_compile { source dest type options } {
     # 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.  We really only need to do 
-    # this on IRIX, but it shouldn't hurt to do it anywhere else.
+    # proper, so we do it here.
+    # The same applies to Darwin (DYLD_LIBRARY_PATH), Solaris 32 bit
+    # (LD_LIBRARY_PATH_32), Solaris 64 bit (LD_LIBRARY_PATH_64), and HP-UX
+    # (SHLIB_PATH).
     setenv  LD_LIBRARY_PATH     $ld_library_path
     setenv  SHLIB_PATH          $ld_library_path
     setenv  LD_LIBRARYN32_PATH  $ld_library_path
     setenv  LD_LIBRARY64_PATH   $ld_library_path
-    setenv  DYLD_LIBRARY_PATH   $ld_library_path 
+    setenv  LD_LIBRARY_PATH_32  $ld_library_path
+    setenv  LD_LIBRARY_PATH_64  $ld_library_path
+    setenv  DYLD_LIBRARY_PATH   $ld_library_path
 
     return [target_compile $source $dest $type $options]
 }