diff options
author | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2003-01-20 15:40:07 +0000 |
---|---|---|
committer | Elena Zannoni <ezannoni@kwikemart.cygnus.com> | 2003-01-20 15:40:07 +0000 |
commit | f2dd3617b5abbdbf929f7b07cb3da97f518aef85 (patch) | |
tree | 96f2f44b72b0bb83689a745cb6b0a9ebf59d0eec /gdb | |
parent | d2823f55fd5735344f6181f5ec1bd3b51108db17 (diff) | |
download | gdb-f2dd3617b5abbdbf929f7b07cb3da97f518aef85.zip gdb-f2dd3617b5abbdbf929f7b07cb3da97f518aef85.tar.gz gdb-f2dd3617b5abbdbf929f7b07cb3da97f518aef85.tar.bz2 |
2003-01-20 Elena Zannoni <ezannoni@redhat.com>
* gdb.arch/altivec-abi.exp: Set variable 'srcfile' differently, to
allow for different test tree configurations. Update some
tescases accordingly.
* gdb.arch/altivec-regs.exp: Ditto.
* gdb.asm/asm-source.exp: Ditto.
* gdb.base/advance.exp: Ditto.
* gdb.base/display.exp: Ditto.
* gdb.base/long_long.exp: Ditto.
* gdb.base/mips_pro.exp: Ditto.
* gdb.base/overlays.exp: Ditto.
* gdb.base/relocate.exp: Ditto.
* gdb.base/setshow.exp: Ditto.
* gdb.base/step-line.exp: Ditto.
* gdb.base/step-test.exp: Ditto.
* gdb.base/until.exp: Ditto.
* gdb.c++/virtfunc.exp: Get rid of variable 'src'.
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/testsuite/ChangeLog | 19 | ||||
-rw-r--r-- | gdb/testsuite/gdb.arch/altivec-abi.exp | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.arch/altivec-regs.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.asm/asm-source.exp | 10 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/advance.exp | 4 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/display.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/long_long.exp | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/mips_pro.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/overlays.exp | 18 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/relocate.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/setshow.exp | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/step-line.exp | 6 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/step-test.exp | 7 | ||||
-rw-r--r-- | gdb/testsuite/gdb.base/until.exp | 8 | ||||
-rw-r--r-- | gdb/testsuite/gdb.c++/virtfunc.exp | 3 |
15 files changed, 69 insertions, 53 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7629586..676beb0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,22 @@ +2003-01-20 Elena Zannoni <ezannoni@redhat.com> + + * gdb.arch/altivec-abi.exp: Set variable 'srcfile' differently, to + allow for different test tree configurations. Update some + tescases accordingly. + * gdb.arch/altivec-regs.exp: Ditto. + * gdb.asm/asm-source.exp: Ditto. + * gdb.base/advance.exp: Ditto. + * gdb.base/display.exp: Ditto. + * gdb.base/long_long.exp: Ditto. + * gdb.base/mips_pro.exp: Ditto. + * gdb.base/overlays.exp: Ditto. + * gdb.base/relocate.exp: Ditto. + * gdb.base/setshow.exp: Ditto. + * gdb.base/step-line.exp: Ditto. + * gdb.base/step-test.exp: Ditto. + * gdb.base/until.exp: Ditto. + * gdb.c++/virtfunc.exp: Get rid of variable 'src'. + 2003-01-17 David Carlton <carlton@math.stanford.edu> * gdb.c++/demangle.exp (test_lucid_style_demangling): KFAIL test diff --git a/gdb/testsuite/gdb.arch/altivec-abi.exp b/gdb/testsuite/gdb.arch/altivec-abi.exp index 2e4504a..70fc3e0 100644 --- a/gdb/testsuite/gdb.arch/altivec-abi.exp +++ b/gdb/testsuite/gdb.arch/altivec-abi.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 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 @@ -39,10 +39,9 @@ if ![istarget "powerpc-*altivec"] then { set testfile "altivec-abi" set binfile ${objdir}/${subdir}/${testfile} +set srcfile ${testfile}.c -set src1 ${srcdir}/${subdir}/${testfile}.c - -if { [gdb_compile ${src1} ${binfile} executable {debug additional_flags=-w}] != "" } { +if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug additional_flags=-w}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.arch/altivec-regs.exp b/gdb/testsuite/gdb.arch/altivec-regs.exp index 80433bf..fe8ec21 100644 --- a/gdb/testsuite/gdb.arch/altivec-regs.exp +++ b/gdb/testsuite/gdb.arch/altivec-regs.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 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 @@ -39,9 +39,9 @@ if ![istarget "powerpc-*altivec"] then { set testfile "altivec-regs" set binfile ${objdir}/${subdir}/${testfile} -set src1 ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c -if { [gdb_compile ${src1} ${binfile} executable {debug additional_flags=-w}] != "" } { +if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug additional_flags=-w}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp index 641a7c1..a42c61a 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -1,4 +1,4 @@ -# Copyright 1998, 2000, 2002 Free Software Foundation, Inc. +# Copyright 1998, 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 @@ -99,8 +99,8 @@ if [board_info $dest exists multilib_flags] { set testfile "asm-source" set binfile ${objdir}/${subdir}/${testfile} -set src1 ${srcdir}/${subdir}/asmsrc1.s -set src2 ${srcdir}/${subdir}/asmsrc2.s +set srcfile1 asmsrc1.s +set srcfile2 asmsrc2.s remote_exec build "rm -f ${subdir}/arch.inc" remote_download host ${srcdir}/${subdir}/${asm-arch}.inc ${subdir}/arch.inc @@ -110,10 +110,10 @@ if { "${asm-flags}" == "" } { set asm-flags "-gstabs -I${srcdir}/${subdir} -I${objdir}/${subdir}" } -if {[target_assemble ${src1} asmsrc1.o "${asm-flags}"] != ""} then { +if {[target_assemble ${srcdir}/${subdir}/${srcfile1} asmsrc1.o "${asm-flags}"] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -if {[target_assemble ${src2} asmsrc2.o "${asm-flags}"] != ""} then { +if {[target_assemble ${srcdir}/${subdir}/${srcfile2} asmsrc2.o "${asm-flags}"] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp index ae79d18..aea5a6d 100644 --- a/gdb/testsuite/gdb.base/advance.exp +++ b/gdb/testsuite/gdb.base/advance.exp @@ -24,11 +24,11 @@ if $tracelevel then { } set testfile advance -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} remote_exec build "rm -f ${binfile}" -if { [gdb_compile "${srcfile}" "${binfile}" executable {debug}] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp index e285729..c39ee36 100644 --- a/gdb/testsuite/gdb.base/display.exp +++ b/gdb/testsuite/gdb.base/display.exp @@ -1,4 +1,4 @@ -# Copyright 1997, 1998, 1999, 2000 +# Copyright 1997, 1998, 1999, 2000, 2001, 2003 # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify @@ -26,12 +26,12 @@ if $tracelevel then { } set testfile display -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} -if { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if [target_info exists gdb_stub] { diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp index 55086d7..11308db 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -1,4 +1,5 @@ -# Copyright 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +# Copyright 1997, 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 @@ -30,7 +31,7 @@ if [target_info exists no_long_long] { } set testfile long_long -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} # What compiler are we using? @@ -45,7 +46,7 @@ if {$hp_cc_compiler} { set flag "" } -if { [gdb_compile "${srcfile}" "${binfile}" executable [concat debug "additional_flags=$flag -w"]] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug "additional_flags=$flag -w"]] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.base/mips_pro.exp b/gdb/testsuite/gdb.base/mips_pro.exp index 1697eee..a860e63 100644 --- a/gdb/testsuite/gdb.base/mips_pro.exp +++ b/gdb/testsuite/gdb.base/mips_pro.exp @@ -1,4 +1,4 @@ -# Copyright 1997, 1999 Free Software Foundation, Inc. +# Copyright 1997, 1999, 2000, 2001, 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 @@ -25,7 +25,7 @@ set prms_id 0 set bug_id 0 set testfile mips_pro -set srcfile ${srcdir}/$subdir/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} # Create and source the file that provides information about the compiler @@ -38,11 +38,11 @@ if [get_compiler_info ${binfile}] { # This test must be compiled with -O2 if using gcc. if {$gcc_compiled} then { - if { [gdb_compile "${srcfile}" "${binfile}" executable {debug additional_flags=-O2}] != "" } { + if { [gdb_compile "${srcdir}/$subdir/${srcfile}" "${binfile}" executable {debug additional_flags=-O2}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } } else { - if { [gdb_compile "${srcfile}" "${binfile}" executable {debug}] != "" } { + if { [gdb_compile "${srcdir}/$subdir/${srcfile}" "${binfile}" executable {debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } } diff --git a/gdb/testsuite/gdb.base/overlays.exp b/gdb/testsuite/gdb.base/overlays.exp index c31da4e..37bfbaa 100644 --- a/gdb/testsuite/gdb.base/overlays.exp +++ b/gdb/testsuite/gdb.base/overlays.exp @@ -1,4 +1,4 @@ -# Copyright 1997, 1998, 2002 Free Software Foundation, Inc. +# Copyright 1997, 1998, 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 @@ -41,29 +41,25 @@ if [istarget "d10v-*-*"] then { set testfile "overlays" set binfile ${objdir}/${subdir}/${testfile} -set srcfile ${srcdir}/${subdir}/${testfile}.c -set foo ${srcdir}/${subdir}/foo.c -set bar ${srcdir}/${subdir}/bar.c -set baz ${srcdir}/${subdir}/baz.c -set grbx ${srcdir}/${subdir}/grbx.c +set srcfile ${testfile}.c -if {[gdb_compile "${srcfile}" "${testfile}.o" object {debug}] != ""} then { +if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${testfile}.o" object {debug}] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if {[gdb_compile "${srcdir}/${subdir}/ovlymgr.c" ovlymgr.o object {debug}] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -if {[gdb_compile "${foo}" foo.o object {debug} ] != ""} then { +if {[gdb_compile "${srcdir}/${subdir}/foo.c" foo.o object {debug} ] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -if {[gdb_compile "${bar}" bar.o object {debug}] != ""} then { +if {[gdb_compile "${srcdir}/${subdir}/bar.c" bar.o object {debug}] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -if {[gdb_compile "${baz}" baz.o object {debug}] != ""} then { +if {[gdb_compile "${srcdir}/${subdir}/baz.c" baz.o object {debug}] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } -if {[gdb_compile "${grbx}" grbx.o object {debug}] != ""} then { +if {[gdb_compile "${srcdir}/${subdir}/grbx.c" grbx.o object {debug}] != ""} then { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } if {[gdb_compile "${testfile}.o ovlymgr.o foo.o bar.o baz.o grbx.o" ${binfile} executable "ldscript=-Wl,-T$linker_script"] != "" } { diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp index c4e25de..bcaa48a 100644 --- a/gdb/testsuite/gdb.base/relocate.exp +++ b/gdb/testsuite/gdb.base/relocate.exp @@ -1,4 +1,4 @@ -# Copyright 2002 Free Software Foundation, Inc. +# Copyright 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 @@ -25,11 +25,11 @@ if $tracelevel then { } set testfile relocate -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile}.o remote_exec build "rm -f ${binfile}" -if { [gdb_compile "${srcfile}" "${binfile}" object {debug}] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" object {debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.base/setshow.exp b/gdb/testsuite/gdb.base/setshow.exp index a1070fd..a406824 100644 --- a/gdb/testsuite/gdb.base/setshow.exp +++ b/gdb/testsuite/gdb.base/setshow.exp @@ -1,4 +1,5 @@ -# Copyright 1992, 1994, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright 1992, 1994, 1996, 1997, 1998, 2001, 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 @@ -27,9 +28,9 @@ set prms_id 0 set bug_id 0 set testfile "setshow" -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} -if { [gdb_compile ${srcfile} ${binfile} executable {debug}] != "" } { +if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable {debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.base/step-line.exp b/gdb/testsuite/gdb.base/step-line.exp index cac3128..9754fdd 100644 --- a/gdb/testsuite/gdb.base/step-line.exp +++ b/gdb/testsuite/gdb.base/step-line.exp @@ -1,4 +1,4 @@ -# Copyright 2001 Free Software Foundation, Inc. +# Copyright 2001, 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 @@ -28,11 +28,11 @@ if $tracelevel then { } set testfile step-line -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} remote_exec build "rm -f ${binfile}" -if { [gdb_compile "${srcfile}" "${binfile}" executable {debug}] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.base/step-test.exp b/gdb/testsuite/gdb.base/step-test.exp index 32af949..7a6bd19 100644 --- a/gdb/testsuite/gdb.base/step-test.exp +++ b/gdb/testsuite/gdb.base/step-test.exp @@ -1,4 +1,5 @@ -# Copyright 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. +# Copyright 1997, 1998, 1999, 2000, 2002, 2001, 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 @@ -28,11 +29,11 @@ if $tracelevel then { } set testfile step-test -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} remote_exec build "rm -f ${binfile}" -if { [gdb_compile "${srcfile}" "${binfile}" executable {debug}] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp index b9b8b2d..8159332 100644 --- a/gdb/testsuite/gdb.base/until.exp +++ b/gdb/testsuite/gdb.base/until.exp @@ -24,11 +24,11 @@ if $tracelevel then { } set testfile break -set srcfile ${srcdir}/${subdir}/${testfile}.c +set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} remote_exec build "rm -f ${binfile}" -if { [gdb_compile "${srcfile}" "${binfile}" executable {debug}] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } @@ -63,7 +63,7 @@ delete_breakpoints # frame. # gdb_test "until 99" \ - "factorial.*value=720.*at ${srcfile}:99.*return \\(value\\)." \ + "factorial.*value=720.*at.*${srcfile}:99.*return \\(value\\)." \ "until factorial, recursive function" # Run to a function called by main @@ -76,6 +76,6 @@ delete_breakpoints # stop at main, the caller, where we put the 'guard' breakpoint. # gdb_test "until marker3" \ - "$hex in main.*argc.*argv.*envp.*at ${srcfile}:82.*marker2 \\(43\\)." \ + "$hex in main.*argc.*argv.*envp.*at.*${srcfile}:82.*marker2 \\(43\\)." \ "until func, not called by current frame" diff --git a/gdb/testsuite/gdb.c++/virtfunc.exp b/gdb/testsuite/gdb.c++/virtfunc.exp index 5bc50a2..2741cf6 100644 --- a/gdb/testsuite/gdb.c++/virtfunc.exp +++ b/gdb/testsuite/gdb.c++/virtfunc.exp @@ -39,8 +39,7 @@ if [get_compiler_info ${binfile} "c++"] { source ${binfile}.ci -set src "${srcdir}/${subdir}/${srcfile}" -if { [gdb_compile "${src}" "${binfile}" executable {c++ debug}] != "" } { +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {c++ debug}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } |