From dd8c8ee780bcbb801536f2e0ba91e0f90ac821c2 Mon Sep 17 00:00:00 2001 From: Michael Chastain Date: Sun, 15 Aug 2004 09:17:30 +0000 Subject: 2004-08-15 Michael Chastain * gdb.cp/ctti.exp: Tweak srcfile and objfile to have no slashes. * gdb.cp/m-static.exp: Likewise. * gdb.cp/rtti.exp: Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.cp/ctti.exp | 26 +++++++++++++------------- gdb/testsuite/gdb.cp/m-static.exp | 14 +++++++------- gdb/testsuite/gdb.cp/rtti.exp | 26 +++++++++++--------------- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e0e203f..a6e92d4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2004-08-15 Michael Chastain + + * 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 * gdb.base/bigcore.c: Include and . diff --git a/gdb/testsuite/gdb.cp/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp index a2a2e0a..de1ee34 100644 --- a/gdb/testsuite/gdb.cp/ctti.exp +++ b/gdb/testsuite/gdb.cp/ctti.exp @@ -29,33 +29,33 @@ if $tracelevel then { if { [skip_cplus_tests] } { continue } set testfile "cttiadd" -set srcfile "${srcdir}/${subdir}/${testfile}.cc" -set srcfile1 "${srcdir}/${subdir}/${testfile}1.cc" -set srcfile2 "${srcdir}/${subdir}/${testfile}2.cc" -set srcfile3 "${srcdir}/${subdir}/${testfile}3.cc" -set objfile "${objdir}/${subdir}/${testfile}.o" -set objfile1 "${objdir}/${subdir}/${testfile}1.o" -set objfile2 "${objdir}/${subdir}/${testfile}2.o" -set objfile3 "${objdir}/${subdir}/${testfile}3.o" +set srcfile "${testfile}.cc" +set srcfile1 "${testfile}1.cc" +set srcfile2 "${testfile}2.cc" +set srcfile3 "${testfile}3.cc" +set objfile "${testfile}.o" +set objfile1 "${testfile}1.o" +set objfile2 "${testfile}2.o" +set objfile3 "${testfile}3.o" 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." } -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." } -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." } -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." } -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." } diff --git a/gdb/testsuite/gdb.cp/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp index 56cd7bc..7963a10 100644 --- a/gdb/testsuite/gdb.cp/m-static.exp +++ b/gdb/testsuite/gdb.cp/m-static.exp @@ -33,21 +33,21 @@ set prms_id 0 set bug_id 0 set testfile "m-static" -set srcfile "${srcdir}/${subdir}/${testfile}.cc" -set srcfile1 "${srcdir}/${subdir}/${testfile}1.cc" -set objfile "${objdir}/${subdir}/${testfile}.o" -set objfile1 "${objdir}/${subdir}/${testfile}1.o" +set srcfile "${testfile}.cc" +set srcfile1 "${testfile}1.cc" +set objfile "${testfile}.o" +set objfile1 "${testfile}1.o" 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." } -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." } -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." } diff --git a/gdb/testsuite/gdb.cp/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp index 18f3cc2..991836d 100644 --- a/gdb/testsuite/gdb.cp/rtti.exp +++ b/gdb/testsuite/gdb.cp/rtti.exp @@ -40,25 +40,21 @@ set prms_id 0 set bug_id 0 set testfile "rtti" -set srcfile1 "${srcdir}/${subdir}/${testfile}1.cc" -set objfile1 "${objdir}/${subdir}/${testfile}1.o" -set srcfile2 "${srcdir}/${subdir}/${testfile}2.cc" -set objfile2 "${objdir}/${subdir}/${testfile}2.o" -set binfile ${objdir}/${subdir}/${testfile} +set srcfile1 "${testfile}1.cc" +set objfile1 "${testfile}1.o" +set srcfile2 "${testfile}2.cc" +set objfile2 "${testfile}2.o" +set binfile "${objdir}/${subdir}/${testfile}" -# gdb_get_line_number needs this to be called srcfile. Except that it -# gets confused if the directories are included. :-( -set srcfile "${testfile}1.cc" - -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." } -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." } -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." } @@ -79,7 +75,7 @@ if ![runto_main] then { # 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_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 # 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_test "print *obj" "\\$\[0-9\]* = { = .*}" -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_test "print *obj3" "\\$\[0-9\]* = { = .*}" -- cgit v1.1