Re: [patch] update gdb.base/gdb1555.exp to use new shared library infrastructure

[Paul Gilliam <pgilliam@us.ibm.com>]

On Thursday 14 April 2005 12:20, Daniel Jacobowitz wrote:
> On Wed, Apr 13, 2005 at 09:11:18AM -0800, Paul Gilliam wrote:
> > This patch updates gdb.base/gdb1555.exp to use the new shared library infrastructure in
> > lib/gdb.exp.  All the stuff that has been cut from shlib-call.exp is now part of 'gdb-compile'
> > or 'gdb-compile-shlib' (new) in lib/gdb.exp.
> > 
> > This patch depends on the shared infrastructure patch:
> >         http://sources.redhat.com/ml/gdb-patches/2005-04/msg00096.html
> > 
> > -=# Paul #=-
> > 
> > 2005-04-13  Paul Gilliam  <pgilliam@us.ibm.com>
> > 
> >         * gdb.base/gdb1555.exp: Change to use new shared library infrastructure and update
> >         copyright date.
> 
> OK.  Same comment about the indentation of your '||' operators.  Also,
> be sure to line wrap the ChangeLog for 80 columns.
> 
> 
Here is the revised patch:

2005-04-19  Paul Gilliam  <pgilliam@us.ibm.com>

        * gdb.base/gdb1555.exp: Change to use new shared library infrastructure
        and update copyright date.

Index: gdb.base/gdb1555.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/gdb1555.exp,v
retrieving revision 1.1
diff -c -3 -p -r1.1 gdb1555.exp
*** gdb.base/gdb1555.exp	18 Feb 2004 03:35:08 -0000	1.1
--- gdb.base/gdb1555.exp	19 Apr 2005 23:57:52 -0000
*************** if $tracelevel then {
*** 27,87 ****
  
  set testfile gdb1555-main
  set libfile gdb1555
! set srcfile ${testfile}.c
! set binfile ${objdir}/${subdir}/${testfile}
  
! remote_exec build "rm -f ${binfile}"
  
- # get the value of gcc_compiled
  if [get_compiler_info ${binfile}] {
      return -1
  }
  
! if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}.o" object {debug}] != "" } {
!     return -1
! }
! 
! # Build the shared libraries this test case needs.
! #
! 
! if {$gcc_compiled == 0} {
!     if [istarget "hppa*-hp-hpux*"] then {
!         set additional_flags "additional_flags=+z"
!     } elseif { [istarget "mips-sgi-irix*"] } {
!         # Disable SGI compiler's implicit -Dsgi
!         set additional_flags "additional_flags=-Usgi"
!     } else {
!         # don't know what the compiler is...
!         set additional_flags ""
!     }
! } else {
!     if { ([istarget "powerpc*-*-aix*"]
!     || [istarget "rs6000*-*-aix*"]) } {
!         set additional_flags ""
!     } else {
!         set additional_flags "additional_flags=-fpic"
!     }
! }
! 
! set additional_flags "$additional_flags -shared"
! if {[gdb_compile "${srcdir}/${subdir}/${libfile}.c" "${objdir}/${subdir}/${libfile}.so" executable [list debug $additional_flags "incdir=${objdir}"]] != ""} {
!     return -1
! }
! 
! if { ($gcc_compiled 
! &&  ([istarget "powerpc*-*-aix*"]
! || [istarget "rs6000*-*-aix*"] )) } {
!     set additional_flags "additional_flags=-L${objdir}/${subdir}"
! } elseif { [istarget "mips-sgi-irix*"] } {
!     set additional_flags "additional_flags=-rpath ${objdir}/${subdir}"
! } else {
!     set additional_flags ""
! }
! 
! if {[gdb_compile "${objdir}/${subdir}/${testfile}.o ${objdir}/${subdir}/${libfile}.so" "${binfile}" executable [list debug $additional_flags]] != ""} {
      return -1
  }
  
  
  gdb_exit
  gdb_start
--- 27,51 ----
  
  set testfile gdb1555-main
  set libfile gdb1555
! set srcfile $srcdir/$subdir/$testfile.c
! set libsrc  $srcdir/$subdir/$libfile.c
! set binfile $objdir/$subdir/$testfile
! set lib_sl  $objdir/$subdir/$libfile.sl
  
! set lib_opts  debug
! set exec_opts [list debug shlib=$lib_sl]
  
  if [get_compiler_info ${binfile}] {
      return -1
  }
  
! if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
!      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
!     untested "Could not compile $srcfile."
      return -1
  }
  
+ # Start with a fresh gdb.
  
  gdb_exit
  gdb_start