2003-04-02 Andrew Cagney <cagney@redhat.com>

* gdb.base/callfuncs.exp: Make "print add" messages unique.
	* gdb.base/ending-run.exp: Put spaces around "breakpoint" to stop
	matching directories by the name breakpoint.
	* gdb.base/pointers.exp: Make "ptype pppC" message consistent.
	Make "continue to marker1" consistent.
	* gdb.base/call-rt-st.exp: Make "finish out from loop_count"
	message consistent.
	* lib/gdb.exp: Put "the program is no longer running", and "the
	program exited" in parenthesis.
	* lib/mi-support.exp: Ditto.
This commit is contained in:
Andrew Cagney
2003-04-03 16:34:48 +00:00
parent 6be67e674a
commit ed4c619a67
7 changed files with 63 additions and 37 deletions

View File

@ -1,3 +1,16 @@
2003-04-02 Andrew Cagney <cagney@redhat.com>
* gdb.base/callfuncs.exp: Make "print add" messages unique.
* gdb.base/ending-run.exp: Put spaces around "breakpoint" to stop
matching directories by the name breakpoint.
* gdb.base/pointers.exp: Make "ptype pppC" message consistent.
Make "continue to marker1" consistent.
* gdb.base/call-rt-st.exp: Make "finish out from loop_count"
message consistent.
* lib/gdb.exp: Put "the program is no longer running", and "the
program exited" in parenthesis.
* lib/mi-support.exp: Ditto.
2003-04-02 Bob Rossi <bob_rossi@cox.net> 2003-04-02 Bob Rossi <bob_rossi@cox.net>
* gdb.mi/mi-file.exp: New file for -file-list-exec-source-file. * gdb.mi/mi-file.exp: New file for -file-list-exec-source-file.

View File

@ -129,11 +129,17 @@ gdb_expect {
send_gdb "finish\n" send_gdb "finish\n"
gdb_expect { gdb_expect {
-re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:106\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:617\[ \t\r\n\]+617\[\t \]+return 0;.*$gdb_prompt $" { -re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:106\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:617\[ \t\r\n\]+617\[\t \]+return 0;.*$gdb_prompt $" {
pass "finish out from loop_count (line 617)"} pass "finish out from loop_count (line 617)"
}
-re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:106\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:615\[ \t\r\n\]+615\[\t \]+loop_count.*$gdb_prompt $" { -re "Run till exit from .0 loop_count \\(\\) at.*call-rt-st.c:106\[ \t\r\n\]+main \\(\\) at.*call-rt-st.c:615\[ \t\r\n\]+615\[\t \]+loop_count.*$gdb_prompt $" {
pass "finish out from loop_count (line 615)"} pass "finish out from loop_count (line 615)"
-re ".*$gdb_prompt $" { fail "finish out from loop_count"} }
timeout { fail "(timeout)finish out from loop_count"} -re ".*$gdb_prompt $" {
fail "finish out from loop_count"
}
timeout {
fail "finish out from loop_count (timeout)"
}
} }
# Ask GDB to print the value of EXPR, and expect to see the regexp # Ask GDB to print the value of EXPR, and expect to see the regexp

View File

@ -342,7 +342,8 @@ if ![gdb_test "bt 2" \
# Call function (causing a breakpoint hit in the call dummy) and do a finish, # Call function (causing a breakpoint hit in the call dummy) and do a finish,
# make sure we are back at main and still have the same register contents. # make sure we are back at main and still have the same register contents.
gdb_test "print add(4,5)" "The program being debugged stopped while.*" "" gdb_test "print add(4,5)" "The program being debugged stopped while.*" \
"call function causing a breakpoint then do a finish"
gdb_test "finish" \ gdb_test "finish" \
"Value returned is .* = 9" \ "Value returned is .* = 9" \
"finish from call dummy breakpoint returns correct value" "finish from call dummy breakpoint returns correct value"
@ -360,7 +361,8 @@ if ![gdb_test "bt 2" \
# Call function (causing a breakpoint hit in the call dummy) and do a return # Call function (causing a breakpoint hit in the call dummy) and do a return
# with a value, make sure we are back at main with the same register contents. # with a value, make sure we are back at main with the same register contents.
gdb_test "print add(4,5)" "The program being debugged stopped while.*" "" gdb_test "print add(4,5)" "The program being debugged stopped while.*" \
"call function causing a breakpoint and then do a return"
if ![gdb_test "return 7" \ if ![gdb_test "return 7" \
"#0 main.*" \ "#0 main.*" \
"back at main after return from call dummy breakpoint" \ "back at main after return from call dummy breakpoint" \

View File

@ -74,7 +74,7 @@ if [target_info exists use_gdb_stub] {
gdb_test "cle" ".*Deleted breakpoints 2 1.*" "clear worked" gdb_test "cle" ".*Deleted breakpoints 2 1.*" "clear worked"
send_gdb "i b\n" send_gdb "i b\n"
gdb_expect { gdb_expect {
-re ".*breakpoint.*breakpoint.*$gdb_prompt $" { -re ".* breakpoint .* breakpoint .*$gdb_prompt $" {
fail "cleared bp at line before routine" fail "cleared bp at line before routine"
} }
-re ".*3.*main.*31.*$gdb_prompt $" { -re ".*3.*main.*31.*$gdb_prompt $" {
@ -120,7 +120,7 @@ gdb_expect {
send_gdb "i b\n" send_gdb "i b\n"
gdb_expect { gdb_expect {
-re ".*breakpoint.*breakpoint.*$gdb_prompt $" { -re ".* breakpoint .* breakpoint .*$gdb_prompt $" {
fail "all set to continue (didn't clear bps)" fail "all set to continue (didn't clear bps)"
} }
-re ".*3.*main.*31.*$gdb_prompt $" { -re ".*3.*main.*31.*$gdb_prompt $" {

View File

@ -366,9 +366,10 @@ gdb_expect {
send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $" send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
send_gdb "cont\n" send_gdb "cont\n"
gdb_expect { gdb_expect {
-re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" { -re "Break.* marker1 \\(\\) at .*:$decimal.*$gdb_prompt $" {
pass "continue to marker1"
send_gdb "up\n" send_gdb "up\n"
gdb_expect { gdb_expect {
-re ".*more_code.*$gdb_prompt $" { -re ".*more_code.*$gdb_prompt $" {
@ -380,9 +381,13 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
timeout { fail "up from marker1 (timeout)" } timeout { fail "up from marker1 (timeout)" }
} }
} }
-re "$gdb_prompt $" { fail "continue to marker1" } -re "$gdb_prompt $" {
timeout { fail "(timeout) continue to marker1" } fail "continue to marker1"
} }
timeout {
fail "continue to marker1 (timeout)"
}
}
send_gdb "print *pUC\n" send_gdb "print *pUC\n"

View File

@ -541,27 +541,27 @@ proc gdb_test_multiple { command message user_code } {
} }
-re "Program exited with code \[0-9\]+.*$gdb_prompt $" { -re "Program exited with code \[0-9\]+.*$gdb_prompt $" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message: the program exited" set errmsg "$message (the program exited)"
} else { } else {
set errmsg "$command: the program exited" set errmsg "$command (the program exited)"
} }
fail "$errmsg" fail "$errmsg"
set result -1 set result -1
} }
-re "EXIT code \[0-9\r\n\]+Program exited normally.*$gdb_prompt $" { -re "EXIT code \[0-9\r\n\]+Program exited normally.*$gdb_prompt $" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message: the program exited" set errmsg "$message (the program exited)"
} else { } else {
set errmsg "$command: the program exited" set errmsg "$command (the program exited)"
} }
fail "$errmsg" fail "$errmsg"
set result -1 set result -1
} }
-re "The program is not being run.*$gdb_prompt $" { -re "The program is not being run.*$gdb_prompt $" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message: the program is no longer running" set errmsg "$message (the program is no longer running)"
} else { } else {
set errmsg "$command: the program is no longer running" set errmsg "$command (the program is no longer running)"
} }
fail "$errmsg" fail "$errmsg"
set result -1 set result -1

View File

@ -549,18 +549,18 @@ proc mi_gdb_test { args } {
} }
-re "Program exited with code \[0-9\]+.*$mi_gdb_prompt\[ \]*$" { -re "Program exited with code \[0-9\]+.*$mi_gdb_prompt\[ \]*$" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message: the program exited" set errmsg "$message (the program exited)"
} else { } else {
set errmsg "$command: the program exited" set errmsg "$command (the program exited)"
} }
fail "$errmsg" fail "$errmsg"
return -1 return -1
} }
-re "The program is not being run.*$mi_gdb_prompt\[ \]*$" { -re "The program is not being run.*$mi_gdb_prompt\[ \]*$" {
if ![string match "" $message] then { if ![string match "" $message] then {
set errmsg "$message: the program is no longer running" set errmsg "$message (the program is no longer running)"
} else { } else {
set errmsg "$command: the program is no longer running" set errmsg "$command (the program is no longer running)"
} }
fail "$errmsg" fail "$errmsg"
return -1 return -1