* gdb.base/ending-run.exp: Fix expected string for _wrap_main to

allow correct handling of #ifdef UNDERSCORES from dejagnu/testglue.c.
	Add newline to expected string in "step out of main (status wrapper)"
	case.
This commit is contained in:
Corinna Vinschen 2002-09-18 16:04:53 +00:00
parent 948e66d973
commit a283c5a10f
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,10 @@
2002-09-18 Corinna Vinschen <vinschen@redhat.com>
* gdb.base/ending-run.exp: Fix expected string for _wrap_main to
allow correct handling of #ifdef UNDERSCORES from dejagnu/testglue.c.
Add newline to expected string in "step out of main (status wrapper)"
case.
2002-09-18 Corinna Vinschen <vinschen@redhat.com>
* lib/gdb.exp (rerun_to_main): Allow restarting application.

View File

@ -195,7 +195,7 @@ gdb_expect {
-re ".*in.*\\\$START\\\$.*from.*dld.sl.*$gdb_prompt $" {
pass "step out of main"
}
-re ".*in __wrap_main ().*$gdb_prompt $" {
-re ".*in __wrap__?main ().*$gdb_prompt $" {
pass "step out of main (status wrapper)"
}
-re ".*$gdb_prompt $" { fail "step out of main (at end 2)" }
@ -245,7 +245,7 @@ if {! [target_info exists use_gdb_stub]
# exit" message.
pass "step to end of run"
}
-re "Single.*EXIT code 0.*Program exited normally.*$gdb_prompt $" {
-re "Single.*EXIT code 0\r\n.*Program exited normally.*$gdb_prompt $" {
pass "step to end of run (status wrapper)"
}
-re ".*Single.*Program exited.*$gdb_prompt $" {