This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch/obvious/testsuite] remove references to ${binfile}.ci


Several gdb.*/*.exp files explicitly refer to ${binfile}.ci.
get_compiler_info already sources the file; source'ing it again is
redundant.

I tested this on:

  native i686-pc-linux-gnu, gcc 2.95.3 3.3.2 HEAD, dwarf-2 stabs+
  native hppa2.0w-hp-hpux11.11, hp-ux ansi c compiler
  native hppa2.0w-hp-hpux11.11, hp-ux aCC compiler

I am committing this as an obvious fix.

This is a prelude to "rewrite get_compiler_info", which might get
ride of ${binfile}.ci entirely.

Michael C

2004-01-06  Michael Chastain  <mec.gnu@mindspring.com>

	* gdb.base/call-ar-st.exp: Delete explicit reference to ${binfile}.ci.
	* gdb.base/call-rt-st.exp: Likewise.
	* gdb.base/nodebug.exp: Likewise.
	* gdb.base/volatile.exp: Likewise.
	* gdb.cp/ref-types.exp: Likewise.
	* gdb.cp/templates.exp: Likewise.

Index: gdb.base/call-ar-st.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/call-ar-st.exp,v
retrieving revision 1.12
diff -c -3 -p -r1.12 call-ar-st.exp
*** gdb.base/call-ar-st.exp	29 May 2002 02:23:20 -0000	1.12
--- gdb.base/call-ar-st.exp	6 Jan 2004 09:46:49 -0000
***************
*** 1,4 ****
! #   Copyright 1998, 1999, 2000, 2001
  #   Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
--- 1,4 ----
! #   Copyright 1998, 1999, 2000, 2001, 2004
  #   Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
*************** proc set_lang_c {} {
*** 88,95 ****
  	}
      }
  }
- 
- source ${binfile}.ci
  
  # Start with a fresh gdb.
  
--- 88,93 ----
Index: gdb.base/call-rt-st.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/call-rt-st.exp,v
retrieving revision 1.14
diff -c -3 -p -r1.14 call-rt-st.exp
*** gdb.base/call-rt-st.exp	13 Oct 2003 09:13:43 -0000	1.14
--- gdb.base/call-rt-st.exp	6 Jan 2004 09:46:49 -0000
***************
*** 1,4 ****
! # Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,5 ----
! # Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004
! # Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
*************** proc set_lang_c {} {
*** 90,100 ****
  	}
      }
  }
- 
- 
- 
- source ${binfile}.ci
- 
  
  # Start with a fresh gdb.
  
--- 82,87 ----
Index: gdb.base/nodebug.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/nodebug.exp,v
retrieving revision 1.2
diff -c -3 -p -r1.2 nodebug.exp
*** gdb.base/nodebug.exp	6 Mar 2001 08:21:50 -0000	1.2
--- gdb.base/nodebug.exp	6 Jan 2004 09:46:50 -0000
***************
*** 1,4 ****
! #   Copyright 1997, 1999 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,4 ----
! # Copyright 1997, 1999, 2004 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
*************** if  { [gdb_compile "${srcdir}/${subdir}/
*** 38,45 ****
  if [get_compiler_info ${binfile}] {
      return -1;
  }
- 
- source ${binfile}.ci
  
  gdb_exit
  gdb_start
--- 38,43 ----
Index: gdb.base/volatile.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/volatile.exp,v
retrieving revision 1.7
diff -c -3 -p -r1.7 volatile.exp
*** gdb.base/volatile.exp	28 Nov 2003 03:31:24 -0000	1.7
--- gdb.base/volatile.exp	6 Jan 2004 09:46:51 -0000
***************
*** 1,4 ****
! #   Copyright 1997, 1998, 1999, 2003 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,4 ----
! # Copyright 1997, 1998, 1999, 2003, 2004 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
*************** if  { [gdb_compile "${srcdir}/${subdir}/
*** 65,71 ****
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
  }
  
- remote_exec build "rm -f ${binfile}.ci"
  if  [get_compiler_info ${binfile}] {
      return -1
  }
--- 65,70 ----
*************** gdb_exit
*** 74,81 ****
  gdb_start
  gdb_reinitialize_dir $srcdir/$subdir
  gdb_load ${binfile}
- 
- source ${binfile}.ci
  
  #
  # set it up at a breakpoint so we can play with the variable values
--- 73,78 ----
Index: gdb.cp/ref-types.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/ref-types.exp,v
retrieving revision 1.1
diff -c -3 -p -r1.1 ref-types.exp
*** gdb.cp/ref-types.exp	23 Aug 2003 03:55:59 -0000	1.1
--- gdb.cp/ref-types.exp	6 Jan 2004 09:46:51 -0000
***************
*** 1,5 ****
  # Tests for reference types with short type variables in GDB.
! # Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
--- 1,5 ----
  # Tests for reference types with short type variables in GDB.
! # Copyright 1998, 1999, 2000, 2004 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
*************** proc gdb_start_again {} {
*** 71,78 ****
      gdb_start
      gdb_reinitialize_dir $srcdir/$subdir
      gdb_load ${binfile}
- 
-     source ${binfile}.ci
  
      #
      # set it up at a breakpoint so we can play with the variable values
--- 71,76 ----
Index: gdb.cp/templates.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/templates.exp,v
retrieving revision 1.4
diff -c -3 -p -r1.4 templates.exp
*** gdb.cp/templates.exp	3 Jan 2004 00:03:11 -0000	1.4
--- gdb.cp/templates.exp	6 Jan 2004 09:46:51 -0000
*************** set binfile ${objdir}/${subdir}/${testfi
*** 37,43 ****
  if [get_compiler_info ${binfile} "c++"] {
      return -1
  }
- source ${binfile}.ci
  
  if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
--- 37,42 ----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]