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 bec4d278df5684e5e5a14199d29ea4b01aa3f52e..2c36c5854ed4f609e46ad56dd6064a2e3f8a1f3c 100644 (file)
--- a/gdb/testsuite/gdb.cp/annota2.exp
+++ b/gdb/testsuite/gdb.cp/annota2.exp
@@ -1,4 +1,4 @@
-#   Copyright 1999-2016 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
@@ -29,12 +29,10 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
     return -1
 }
 
-# are we on a target board? If so, don't run these tests.
-# note: this is necessary because we cannot use runto_main (which would
-# work for remote targets too) because of the different prompt we get
-# when using annotation level 2.
+# This testcase cannot use runto_main because of the different prompt
+# we get when using annotation level 2.
 #
-if [is_remote target] then {
+if ![target_can_use_run_cmd] {
     return 0
 }
 
@@ -75,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
     }
 }
 
@@ -140,6 +138,8 @@ set pat [multi_line "" \
             "\032\032exited 0" \
             "$inferior_exited_re normally." \
             "" \
+            "\032\032thread-exited,id=\"1\",group-id=\"i1\"" \
+            "" \
             "\032\032stopped" \
             $gdb_prompt$]
 gdb_test_multiple "continue" "continue until exit" {
@@ -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" \
             "" \