* gdb.base/ending-run.exp: Use the first line of code inside
function body to test breakpoints.
* gdb.mi/mi-break.exp, gdb.mi/mi2-break.exp: Adjust the actual
location where the breakpoint is inserted when using the line
where a function is declared. Fix typo in the description of
one of the tests.
* gdb.mi/mi-simplerun.exp, gdb.mi/mi2-simplerun.exp: Likewise.
This commit is contained in:
Joel Brobecker
parent
6a048695b3
commit
b40e7bf371
|
|
@ -1,3 +1,13 @@
|
|||
2008-02-27 Joel Brobecker <brobecker@adacore.com>
|
||||
|
||||
* gdb.base/ending-run.exp: Use the first line of code inside
|
||||
function body to test breakpoints.
|
||||
* gdb.mi/mi-break.exp, gdb.mi/mi2-break.exp: Adjust the actual
|
||||
location where the breakpoint is inserted when using the line
|
||||
where a function is declared. Fix typo in the description of
|
||||
one of the tests.
|
||||
* gdb.mi/mi-simplerun.exp, gdb.mi/mi2-simplerun.exp: Likewise.
|
||||
|
||||
2008-02-27 Pierre Muller <muller@ics.u-strasbg.fr>
|
||||
|
||||
* gdb.arch/i386-sse.exp: avoid same output for two breakpoint setting
|
||||
|
|
|
|||
|
|
@ -55,9 +55,9 @@ gdb_load ${binfile}
|
|||
gdb_test "b ending-run.c:1" ".*Breakpoint.*ending-run.c, line 1.*" \
|
||||
"bpt at line before routine"
|
||||
|
||||
gdb_test "b ending-run.c:13" \
|
||||
".*Note.*also.*Breakpoint 2.*ending-run.c, line 13.*" \
|
||||
"b ending-run.c:13, one"
|
||||
gdb_test "b ending-run.c:14" \
|
||||
".*Note.*also.*Breakpoint 2.*ending-run.c, line 14.*" \
|
||||
"b ending-run.c:14, one"
|
||||
|
||||
# Set up to go to the next-to-last line of the program
|
||||
#
|
||||
|
|
@ -67,7 +67,7 @@ gdb_test "b ending-run.c:31" ".*Breakpoint 3.*ending-run.c, line 31.*"
|
|||
# as line "13". Then try to clear it--this should work.
|
||||
#
|
||||
gdb_run_cmd
|
||||
gdb_test "" ".*Breakpoint.*1.*callee.*13.*" "run"
|
||||
gdb_test "" ".*Breakpoint.*1.*callee.*14.*" "run"
|
||||
|
||||
gdb_test "cle" ".*Deleted breakpoints 1 2.*" "clear worked"
|
||||
send_gdb "i b\n"
|
||||
|
|
@ -86,30 +86,17 @@ gdb_expect {
|
|||
# Test some other "clear" combinations
|
||||
#
|
||||
gdb_test "b ending-run.c:1" ".*Breakpoint.*4.*"
|
||||
gdb_test "b ending-run.c:13" ".*Note.*also.*Breakpoint.*5.*" "b ending-run.c:13, two"
|
||||
gdb_test "cle ending-run.c:13" \
|
||||
".*Deleted breakpoint 5.*" "Only cleared 1 by line"
|
||||
|
||||
send_gdb "inf line ending-run.c:13\n"
|
||||
gdb_expect {
|
||||
-re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
|
||||
set line_eight $expect_out(1,string)
|
||||
gdb_test "b 13" ".*Breakpoint.*6.*"
|
||||
gdb_test "cle *$line_eight" ".*Deleted breakpoints 4 6.*" "Clear 2 by address"
|
||||
}
|
||||
-re ".*$gdb_prompt $" {
|
||||
fail "need to fix test for new compile outcome"
|
||||
}
|
||||
}
|
||||
gdb_test "b ending-run.c:14" ".*Note.*also.*Breakpoint.*5.*" "b ending-run.c:14, two"
|
||||
gdb_test "cle ending-run.c:14" \
|
||||
".*Deleted breakpoints 4 5.*" "Cleared 2 by line"
|
||||
|
||||
send_gdb "inf line ending-run.c:14\n"
|
||||
gdb_expect {
|
||||
-re ".*address (0x\[0-9a-fA-F]*).*$gdb_prompt $" {
|
||||
set line_nine $expect_out(1,string)
|
||||
gdb_test "b ending-run.c:14" ".*Breakpoint 7.*ending-run.c, line 14.*"
|
||||
gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 8.*" "Breakpoint 7 at *ending-run.c:14"
|
||||
gdb_test "c" ".*Breakpoint.*7.*callee.*14.*"
|
||||
gdb_test "cle" ".*Deleted breakpoints 7 8.*" "Clear 2 by default"
|
||||
gdb_test "b ending-run.c:14" ".*Breakpoint 6.*ending-run.c, line 14.*"
|
||||
gdb_test "b *$line_nine" ".*Note.*also.*Breakpoint 7.*" "Breakpoint 7 at *ending-run.c:14"
|
||||
gdb_test "cle" ".*Deleted breakpoints 6 7.*" "Clear 2 by default"
|
||||
}
|
||||
-re ".*$gdb_prompt $" {
|
||||
fail "need to fix test for new compile outcome"
|
||||
|
|
|
|||
|
|
@ -87,12 +87,12 @@ proc test_tbreak_creation_and_listing {} {
|
|||
"insert temp breakpoint at basics.c:callee2"
|
||||
|
||||
mi_gdb_test "444-break-insert -t basics.c:$line_callee3_head" \
|
||||
"444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",${fullname},line=\"$line_callee3_head\",times=\"0\"\}" \
|
||||
"insert temp breakpoint at basics.c:\$line_callee3_body"
|
||||
"444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",${fullname},line=\"$line_callee3_body\",times=\"0\"\}" \
|
||||
"insert temp breakpoint at basics.c:\$line_callee3_head"
|
||||
|
||||
# Getting the quoting right is tricky. That is "\"<file>\":$line_callee4_head"
|
||||
mi_gdb_test "555-break-insert -t \"\\\"${srcfile}\\\":$line_callee4_head\"" \
|
||||
"555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",${fullname},line=\"$line_callee4_head\",times=\"0\"\}" \
|
||||
"555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",${fullname},line=\"$line_callee4_body\",times=\"0\"\}" \
|
||||
"insert temp breakpoint at \"<fullfilename>\":\$line_callee4_head"
|
||||
|
||||
mi_gdb_test "666-break-list" \
|
||||
|
|
|
|||
|
|
@ -52,7 +52,9 @@ proc test_breakpoints_creation_and_listing {} {
|
|||
global hex
|
||||
|
||||
set line_callee4_head [gdb_get_line_number "callee4 ("]
|
||||
set line_callee4_body [expr $line_callee4_head + 2]
|
||||
set line_callee3_head [gdb_get_line_number "callee3 ("]
|
||||
set line_callee3_body [expr $line_callee3_head + 2]
|
||||
set line_callee2_head [gdb_get_line_number "callee2 ("]
|
||||
set line_callee2_body [expr $line_callee2_head + 2]
|
||||
set line_main_head [gdb_get_line_number "main ("]
|
||||
|
|
@ -75,11 +77,11 @@ proc test_breakpoints_creation_and_listing {} {
|
|||
"insert breakpoint at basics.c:callee2"
|
||||
|
||||
mi_gdb_test "202-break-insert basics.c:$line_callee3_head" \
|
||||
"202\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_head\",times=\"0\"\}" \
|
||||
"202\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_body\",times=\"0\"\}" \
|
||||
"insert breakpoint at basics.c:\$line_callee3_head"
|
||||
|
||||
mi_gdb_test "203-break-insert \"\\\"${srcfile}\\\":$line_callee4_head\"" \
|
||||
"203\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_head\",times=\"0\"\}" \
|
||||
"203\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_body\",times=\"0\"\}" \
|
||||
"insert breakpoint at \"<fullfilename>\":\$line_callee4_head"
|
||||
|
||||
mi_gdb_test "204-break-list" \
|
||||
|
|
|
|||
|
|
@ -88,12 +88,12 @@ proc test_tbreak_creation_and_listing {} {
|
|||
"insert temp breakpoint at basics.c:callee2"
|
||||
|
||||
mi_gdb_test "444-break-insert -t basics.c:$line_callee3_head" \
|
||||
"444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",${fullname},line=\"$line_callee3_head\",times=\"0\"\}" \
|
||||
"insert temp breakpoint at basics.c:\$line_callee3_body"
|
||||
"444\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",${fullname},line=\"$line_callee3_body\",times=\"0\"\}" \
|
||||
"insert temp breakpoint at basics.c:\$line_callee3_head"
|
||||
|
||||
# Getting the quoting right is tricky. That is "\"<file>\":$line_callee4_head"
|
||||
mi_gdb_test "555-break-insert -t \"\\\"${srcfile}\\\":$line_callee4_head\"" \
|
||||
"555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",${fullname},line=\"$line_callee4_head\",times=\"0\"\}" \
|
||||
"555\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"del\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",${fullname},line=\"$line_callee4_body\",times=\"0\"\}" \
|
||||
"insert temp breakpoint at \"<fullfilename>\":\$line_callee4_head"
|
||||
|
||||
mi_gdb_test "666-break-list" \
|
||||
|
|
|
|||
|
|
@ -52,7 +52,9 @@ proc test_breakpoints_creation_and_listing {} {
|
|||
global hex
|
||||
|
||||
set line_callee4_head [gdb_get_line_number "callee4 ("]
|
||||
set line_callee4_body [expr $line_callee4_head + 2]
|
||||
set line_callee3_head [gdb_get_line_number "callee3 ("]
|
||||
set line_callee3_body [expr $line_callee3_head + 2]
|
||||
set line_callee2_head [gdb_get_line_number "callee2 ("]
|
||||
set line_callee2_body [expr $line_callee2_head + 2]
|
||||
set line_main_head [gdb_get_line_number "main ("]
|
||||
|
|
@ -75,11 +77,11 @@ proc test_breakpoints_creation_and_listing {} {
|
|||
"insert breakpoint at basics.c:callee2"
|
||||
|
||||
mi_gdb_test "202-break-insert basics.c:$line_callee3_head" \
|
||||
"202\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_head\",times=\"0\"\}" \
|
||||
"202\\^done,bkpt=\{number=\"3\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee3\",file=\".*basics.c\",line=\"$line_callee3_body\",times=\"0\"\}" \
|
||||
"insert breakpoint at basics.c:\$line_callee3_head"
|
||||
|
||||
mi_gdb_test "203-break-insert \"\\\"${srcfile}\\\":$line_callee4_head\"" \
|
||||
"203\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_head\",times=\"0\"\}" \
|
||||
"203\\^done,bkpt=\{number=\"4\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_body\",times=\"0\"\}" \
|
||||
"insert breakpoint at \"<fullfilename>\":\$line_callee4_head"
|
||||
|
||||
mi_gdb_test "204-break-list" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue