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

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

On Wednesday 27 April 2005 08:58, Daniel Jacobowitz wrote:
> On Tue, Apr 19, 2005 at 04:31:08PM -0800, Paul Gilliam wrote:
> > On Thursday 14 April 2005 12:28, Daniel Jacobowitz wrote:
> > > On Thu, Apr 14, 2005 at 08:43:44AM -0800, Paul Gilliam wrote:
> > > > 2005-04-14  Paul Gilliam  <pgilliam@us.ibm.com>
> > > > 
> > > > 	* gdb.base/unload.exp:  Use new shared library infrastructure and update copyright.
> > > 
> > > OK, with the same caveats - ChangeLog wrapping and indentation.
> > > Thanks for doing this.  Also, please fix the spelling of "fresh":
> > > 
> > > > + # Start with a freash gdb.
> > > > + 
> > > 
> > OK, here is the revised patch:
> > 
> > 2005-04-19  Paul Gilliam  <pgilliam@us.ibm.com>
> > 
> > 	* gdb.base/unload.exp:  Use new shared library infrastructure
> >         and update copyright.
> 
> OK.
> 
> 

Here is the patch I just commited.

-=# Paul #=-

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

        * gdb.base/unload.exp:  Use new shared library
        infrastructure.

Index: gdb.base/unload.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/unload.exp,v
retrieving revision 1.5
diff -c -3 -p -r1.5 unload.exp
*** gdb.base/unload.exp	23 Nov 2004 19:51:35 -0000	1.5
--- gdb.base/unload.exp	29 Apr 2005 21:01:50 -0000
***************
*** 1,4 ****
! #   Copyright 2003, 2004
  #   Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
--- 1,4 ----
! #   Copyright 2003, 2004, 2005
  #   Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
***************
*** 16,23 ****
  # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
  
  # This file was created by Jeff Johnston. (jjohnstn@redhat.com)
- # The shared library compilation portion was copied from shlib-call.exp which was
- # written by Elena Zannoni (ezannoni@redhat.com).
  
  if $tracelevel then {
      strace $tracelevel
--- 16,21 ----
*************** if ![isnative] then {
*** 37,49 ****
  set testfile "unload"
  set libfile "unloadshr"
  set libsrcfile ${libfile}.c
! set srcfile ${testfile}.c
! set binfile ${objdir}/${subdir}/${testfile}
  set shlibdir ${objdir}/${subdir}
! 
! if [get_compiler_info ${binfile}] {
!     return -1
! }
  
  set dl_lib_flag ""
  switch -glob [istarget] {
--- 35,45 ----
  set testfile "unload"
  set libfile "unloadshr"
  set libsrcfile ${libfile}.c
! set srcfile $srcdir/$subdir/$testfile.c
! set binfile $objdir/$subdir/$testfile
  set shlibdir ${objdir}/${subdir}
! set libsrc  $srcdir/$subdir/$libfile.c
! set lib_sl  $objdir/$subdir/$libfile.sl
  
  set dl_lib_flag ""
  switch -glob [istarget] {
*************** switch -glob [istarget] {
*** 53,97 ****
      default          { }
  }
  
! if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DSHLIB_DIR\=\"${shlibdir}\"" $dl_lib_flag]] != "" } {
!      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
! }
  
! # 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"
!     }
! }
! 
! if {[gdb_compile "${srcdir}/${subdir}/${libsrcfile}" "${objdir}/${subdir}/${libfile}.o" object [list debug $additional_flags]] != ""} {
!      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
! }
! 
! if [istarget "hppa*-*-hpux*"] {
!     remote_exec build "ld -b ${objdir}/${subdir}/${libfile}.o -o ${objdir}/${subdir}/${libfile}.sl"
! } else {
!     set additional_flags "additional_flags=-shared"
!     if {[gdb_compile "${objdir}/${subdir}/${libfile}.o" "${objdir}/${subdir}/${libfile}.sl" executable [list debug $additional_flags]] != ""} {
! 	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
!     }
  }
  
  gdb_exit
  gdb_start
  gdb_reinitialize_dir $srcdir/$subdir
--- 49,69 ----
      default          { }
  }
  
! set lib_opts debug
! set exec_opts [list debug $dl_lib_flag additional_flags=-DSHLIB_DIR\=\"${shlibdir}\"]
  
! if [get_compiler_info ${binfile}] {
!     return -1
! }
  
! if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
!      || [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
!     untested "Couldn't compile $libsrc or $srcfile."
!     return -1
  }
  
+ # Start with a fresh gdb.
+ 
  gdb_exit
  gdb_start
  gdb_reinitialize_dir $srcdir/$subdir