From a283c5a10f6f19577851e1c41432797dfa61d057 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 18 Sep 2002 16:04:53 +0000 Subject: [PATCH] * 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. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.base/ending-run.exp | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3235f08a703..40ff8db9757 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2002-09-18 Corinna Vinschen + + * 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 * lib/gdb.exp (rerun_to_main): Allow restarting application. diff --git a/gdb/testsuite/gdb.base/ending-run.exp b/gdb/testsuite/gdb.base/ending-run.exp index 69f2b26917c..1b0f5607834 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 $" { -- 2.30.2