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 6699de01a3bc7acb7a0e68871650555f3c249009..2c36c5854ed4f609e46ad56dd6064a2e3f8a1f3c 100644 (file)
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -1,4 +1,4 @@
-#   Copyright 1999-2019 Free Software Foundation, Inc.
+#   Copyright 1999-2020 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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
     }
 }
 
@@ -218,7 +218,7 @@ set pat [multi_line "" \
             "\032\032post-prompt" \
             "" \
             "\032\032starting" \
-            "\(${frames_invalid}\)*${breakpoints_invalid}" \
+            "\(${frames_invalid}\)*${breakpoints_invalid}\(${frames_invalid}\)*" \
             "\032\032watchpoint 3" \
             ".*atchpoint 3: a.x" \
             "" \
@@ -243,7 +243,6 @@ set pat [multi_line "" \
             "" \
             "" \
             "\032\032source .*$srcfile.*beg:$hex" \
-            "$decimal\[^\r\n\]+" \
             "" \
             "\032\032frame-end" \
             "" \