Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

2004-08-15 Michael Chastain <mec.gnu@mindspring.com>

Browse Source 
* gdb.cp/ctti.exp: Tweak srcfile and objfile to have no slashes.
	* gdb.cp/m-static.exp: Likewise.
	* gdb.cp/rtti.exp: Likewise.
This commit is contained in:
Michael Chastain
2004-08-15 09:17:30 +00:00
parent b6eb28d454
commit dd8c8ee780
4 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/testsuite/ChangeLog
View File

@@ -1,3 +1,9 @@
2004-08-15 Michael Chastain <mec.gnu@mindspring.com>
* gdb.cp/ctti.exp: Tweak srcfile and objfile to have no slashes.
* gdb.cp/m-static.exp: Likewise.
* gdb.cp/rtti.exp: Likewise.
2004-08-14 Mark Kettenis <kettenis@gnu.org> 2004-08-14 Mark Kettenis <kettenis@gnu.org>
* gdb.base/bigcore.c: Include <sys/types.h> and <sys/time.h>. * gdb.base/bigcore.c: Include <sys/types.h> and <sys/time.h>.

26
gdb/testsuite/gdb.cp/ctti.exp
View File

@@ -29,33 +29,33 @@ if $tracelevel then {
if { [skip_cplus_tests] } { continue } if { [skip_cplus_tests] } { continue }
set testfile "cttiadd" set testfile "cttiadd"
set srcfile "${srcdir}/${subdir}/${testfile}.cc" set srcfile "${testfile}.cc"
set srcfile1 "${srcdir}/${subdir}/${testfile}1.cc" set srcfile1 "${testfile}1.cc"
set srcfile2 "${srcdir}/${subdir}/${testfile}2.cc" set srcfile2 "${testfile}2.cc"
set srcfile3 "${srcdir}/${subdir}/${testfile}3.cc" set srcfile3 "${testfile}3.cc"
set objfile "${objdir}/${subdir}/${testfile}.o" set objfile "${testfile}.o"
set objfile1 "${objdir}/${subdir}/${testfile}1.o" set objfile1 "${testfile}1.o"
set objfile2 "${objdir}/${subdir}/${testfile}2.o" set objfile2 "${testfile}2.o"
set objfile3 "${objdir}/${subdir}/${testfile}3.o" set objfile3 "${testfile}3.o"
set binfile "${objdir}/${subdir}/${testfile}" set binfile "${objdir}/${subdir}/${testfile}"
if { [gdb_compile "${srcfile}" "${objfile}" object {debug c++}] != "" } { if { [gdb_compile "$srcdir/$subdir/$srcfile" "$objdir/$subdir/$objfile" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${srcfile1}" "${objfile1}" object {debug c++}] != "" } { if { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${srcfile2}" "${objfile2}" object {debug c++}] != "" } { if { [gdb_compile "$srcdir/$subdir/$srcfile2" "$objdir/$subdir/$objfile2" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${srcfile3}" "${objfile3}" object {debug c++}] != "" } { if { [gdb_compile "$srcdir/$subdir/$srcfile3" "$objdir/$subdir/$objfile3" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${objfile} ${objfile1} ${objfile2} ${objfile3}" "${binfile}" executable {debug c++}] != "" } { if { [gdb_compile "$objdir/$subdir/$objfile $objdir/$subdir/$objfile1 $objdir/$subdir/$objfile2 $objdir/$subdir/$objfile3" "${binfile}" executable {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }

14
gdb/testsuite/gdb.cp/m-static.exp
View File

@@ -33,21 +33,21 @@ set prms_id 0
set bug_id 0 set bug_id 0
set testfile "m-static" set testfile "m-static"
set srcfile "${srcdir}/${subdir}/${testfile}.cc" set srcfile "${testfile}.cc"
set srcfile1 "${srcdir}/${subdir}/${testfile}1.cc" set srcfile1 "${testfile}1.cc"
set objfile "${objdir}/${subdir}/${testfile}.o" set objfile "${testfile}.o"
set objfile1 "${objdir}/${subdir}/${testfile}1.o" set objfile1 "${testfile}1.o"
set binfile "${objdir}/${subdir}/${testfile}" set binfile "${objdir}/${subdir}/${testfile}"
if { [gdb_compile "${srcfile}" "${objfile}" object {debug c++}] != "" } { if { [gdb_compile "$srcdir/$subdir/$srcfile" "$objdir/$subdir/$objfile" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${srcfile1}" "${objfile1}" object {debug c++}] != "" } { if { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${objfile} ${objfile1}" "${binfile}" executable {debug c++}] != "" } { if { [gdb_compile "$objdir/$subdir/$objfile $objdir/$subdir/$objfile1" "${binfile}" executable {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }

26
gdb/testsuite/gdb.cp/rtti.exp
View File

@@ -40,25 +40,21 @@ set prms_id 0
set bug_id 0 set bug_id 0
set testfile "rtti" set testfile "rtti"
set srcfile1 "${srcdir}/${subdir}/${testfile}1.cc" set srcfile1 "${testfile}1.cc"
set objfile1 "${objdir}/${subdir}/${testfile}1.o" set objfile1 "${testfile}1.o"
set srcfile2 "${srcdir}/${subdir}/${testfile}2.cc" set srcfile2 "${testfile}2.cc"
set objfile2 "${objdir}/${subdir}/${testfile}2.o" set objfile2 "${testfile}2.o"
set binfile ${objdir}/${subdir}/${testfile} set binfile "${objdir}/${subdir}/${testfile}"
# gdb_get_line_number needs this to be called srcfile. Except that it if { [gdb_compile "$srcdir/$subdir/$srcfile1" "$objdir/$subdir/$objfile1" object {debug c++}] != "" } {
# gets confused if the directories are included. :-(
set srcfile "${testfile}1.cc"
if { [gdb_compile "${srcfile1}" "${objfile1}" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${srcfile2}" "${objfile2}" object {debug c++}] != "" } { if { [gdb_compile "$srcdir/$subdir/$srcfile2" "$objdir/$subdir/$objfile2" object {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
if { [gdb_compile "${objfile1} ${objfile2}" "${binfile}" executable {debug c++}] != "" } { if { [gdb_compile "$objdir/$subdir/$objfile1 $objdir/$subdir/$objfile2" "${binfile}" executable {debug c++}] != "" } {
gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
} }
@@ -79,7 +75,7 @@ if ![runto_main] then {
# First, run to after we've constructed the object: # First, run to after we've constructed the object:
gdb_breakpoint [gdb_get_line_number "main-constructs-done"] gdb_breakpoint [gdb_get_line_number "main-constructs-done" "$srcfile1"]
gdb_continue_to_breakpoint "end of constructors in main" gdb_continue_to_breakpoint "end of constructors in main"
gdb_test_multiple "print *e1" "print *e1" { gdb_test_multiple "print *e1" "print *e1" {
@@ -135,12 +131,12 @@ gdb_test_multiple "print *e2" "print *e2" {
# Now we test the hack that's been implemented to get around some # Now we test the hack that's been implemented to get around some
# instances of PR gdb/1511. # instances of PR gdb/1511.
gdb_breakpoint [gdb_get_line_number "func-constructs-done"] gdb_breakpoint [gdb_get_line_number "func-constructs-done" "$srcfile1"]
gdb_continue_to_breakpoint "end of constructors in func" gdb_continue_to_breakpoint "end of constructors in func"
gdb_test "print *obj" "\\$\[0-9\]* = {<n2::Base2> = .*}" gdb_test "print *obj" "\\$\[0-9\]* = {<n2::Base2> = .*}"
gdb_breakpoint [gdb_get_line_number "func3-constructs-done"] gdb_breakpoint [gdb_get_line_number "func3-constructs-done" "$srcfile1"]
gdb_continue_to_breakpoint "end of constructors in func3" gdb_continue_to_breakpoint "end of constructors in func3"
gdb_test "print *obj3" "\\$\[0-9\]* = {<n2::C2> = .*}" gdb_test "print *obj3" "\\$\[0-9\]* = {<n2::C2> = .*}"