gdb: Restore old annotations behaviour when printing frame info

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.cp / annota2.exp

diff --git a/gdb/testsuite/gdb.cp/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
index 1b4f04bb44570e04b27668105f6efe2fb279b38b..2c36c5854ed4f609e46ad56dd6064a2e3f8a1f3c 100644 (file)
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -73,9 +73,9 @@ gdb_expect {
     timeout                { fail "annotation set at level 2 (timeout)" }
   }
 
-gdb_test_multiple "run" "run until main breakpoint" {
+gdb_test_multiple "run" "run until main breakpoint, first time" {
     -re "$main_line.*$gdb_prompt$" {
-       pass "run until main breakpoint"
+       pass $gdb_test_name
     }
 }
 
@@ -189,9 +189,9 @@ set main_line 22
 # run program up to breakpoint.
 #
 
-gdb_test_multiple "run" "run until main breakpoint" {
+gdb_test_multiple "run" "run until main breakpoint, second time" {
     -re "$main_line.*$gdb_prompt$"    {
-       pass "run until main breakpoint"
+       pass $gdb_test_name
     }
 }
 
@@ -243,7 +243,6 @@ set pat [multi_line "" \
             "" \
             "" \
             "\032\032source .*$srcfile.*beg:$hex" \
-            "$decimal\[^\r\n\]+" \
             "" \
             "\032\032frame-end" \
             "" \