Re: PATCH: Make ld testsuite usable outside build directory

[Mark Mitchell <mark at codesourcery dot com>]

Daniel Jacobowitz wrote:

> > Thanks for the speedy review!
> >
> > In that case, we can go with this simpler patch, which I tested by 
> > running both in and out of the build directory for an arm-linux 
> > toolchain, with extra debugging output that verified that CC was getting 
> > the value provided by "make check" when in the build directory.
> >
> > If this is approved, I'll not check in the other patch, as this one 
> > makes it unnecessary.
> >
> > OK?
>
>
> > 2005-03-23  Mark Mitchell  <mark@codesourcery.com>
> >
> > 	* testsuite/libstdc++-dg/normal.exp: Read testsuite_files, if it
> > 	exists.
>
>
> Wrong patch.

Gah!  Corrected form attached.

--
Mark Mitchell
CodeSourcery, LLC
mark@codesourcery.com
(916) 791-8304

2005-02-23  Mark Mitchell <mark@codesourcery.com>

	* config/default.exp: Do not load libpath.exp if it does not
	exist.
	(CC): Provide fallback definition.
	(CFLAGS): Likewise.
	(CXX): Likewise.
	(CXXFLAGS): Likewise.
	
Index: config/default.exp
===================================================================
RCS file: /home/cvs/Repository/binutils/ld/testsuite/config/default.exp,v
retrieving revision 1.1.5.1.2.2
diff -c -5 -p -r1.1.5.1.2.2 default.exp
*** config/default.exp	24 Mar 2005 05:36:30 -0000	1.1.5.1.2.2
--- config/default.exp	24 Mar 2005 06:35:18 -0000
*************** if {![file isdirectory tmpdir/ld]} then 
*** 68,81 ****
      catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
  }
  set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
  
  # load the linker path
! load_lib tmpdir/libpath.exp
  
! foreach dir $libpath {
!     set gcc_ld_flag "$gcc_ld_flag -L$dir"
  }
  
  # The mips64-*-linux-gnu compiler defaults to the N32 ABI after
  # installed, but to the O32 ABI in the build tree, because of some
  # specs-file hacks.  Make sure we use an ABI that is compatible with
--- 68,99 ----
      catch "exec ln -s ../../ld-new tmpdir/ld/ld" status
  }
  set gcc_ld_flag "-B[pwd]/tmpdir/ld/"
  
  # load the linker path
! if {[file exists tmpdir/libpath.exp]} {
!     load_lib tmpdir/libpath.exp
  
!     foreach dir $libpath {
! 	set gcc_ld_flag "$gcc_ld_flag -L$dir"
!     }
! }
! 
! # "CC=$(CC_FOR_TARGET)", and other similar parameters.  But, if the
! # user invokes runtest directly (as when testing an installed linker),
! # these flags may not b set.
! if {![info exists CC]} {
!     set CC [transform gcc]
! }
! if {![info exists CFLAGS]} {
!     set CFLAGS "-g -O2"
! }
! if {![info exists CXX]} {
!     set CXX [transform g++]
! }
! if {![info exists CXXFLAGS]} {
!     set CXXFLAGS ""
  }
  
  # The mips64-*-linux-gnu compiler defaults to the N32 ABI after
  # installed, but to the O32 ABI in the build tree, because of some
  # specs-file hacks.  Make sure we use an ABI that is compatible with