aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2002-09-18 16:04:53 +0000
committerCorinna Vinschen <corinna@vinschen.de>2002-09-18 16:04:53 +0000
commita283c5a10f6f19577851e1c41432797dfa61d057 (patch)
tree2b7b016f7a316a13757527774d3025de4f833400 /gdb
parent948e66d973297513a0ad52512337935007e89c24 (diff)
downloadgdb-a283c5a10f6f19577851e1c41432797dfa61d057.zip
gdb-a283c5a10f6f19577851e1c41432797dfa61d057.tar.gz
gdb-a283c5a10f6f19577851e1c41432797dfa61d057.tar.bz2
* 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.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog7
-rw-r--r--gdb/testsuite/gdb.base/ending-run.exp4
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3235f08..40ff8db 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,12 @@
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.
* gdb.base/ena-dis-br.exp (rerun_to_main): Eliminate.
diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp
index 69f2b26..1b0f560 100644
--- a/gdb/testsuite/gdb.base/ending-run.exp
+++ b/gdb/testsuite/gdb.base/ending-run.exp
@@ -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 $" {