Expect frame-begin annotation.

diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index 51543904e9f11434e1ae47588b6344fd13f58e16..2bdf88cdfcb2e9e6a5e909181b12f626dc60b493 100644 (file)
--- a/gdb/testsuite/gdb.base/annota3.exp
+++ b/gdb/testsuite/gdb.base/annota3.exp
@@ -121,7 +121,9 @@ gdb_expect_list "run until main breakpoint" "$gdb_prompt$" {
     "\r\n\032\032starting\r\n"
     "\r\n\032\032breakpoint 1\r\n"
     "\r\n"
-    "Breakpoint 1, main \\(\\) at .*annota3.c:32\r\n"
+    "Breakpoint 1, "
+    "\r\n\032\032frame-begin 0 0x\[0-9a-z\]+\r\n"
+    "main \\(\\) at .*annota3.c:32\r\n"
     "\r\n\032\032source.*annota3.c:32:.*:beg:0x\[0-9a-z\]+\r\n"
     "\r\n\032\032stopped\r\n"
 }
@@ -222,7 +224,10 @@ if [target_info exists gdb,nosignals] {
        "Continuing with signal SIGUSR1.\r\n"
        "\r\n\032\032starting\r\n"
        "\r\n\032\032breakpoint 2\r\n"
-       "Breakpoint 2, handle_USR1 \\(sig=\[0-9\]+\\) at .*annota3.c:\[0-9\]+\r\n"
+       "\r\n"
+       "Breakpoint 2, "
+       "\r\n\032\032frame-begin 0 0x\[0-9a-z\]+\r\n"
+       "handle_USR1 \\(sig=\[0-9\]+\\) at .*annota3.c:\[0-9\]+\r\n"
        "\r\n\032\032source .*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
        "\r\n\032\032stopped\r\n"
     }
@@ -324,7 +329,10 @@ send_gdb "continue\n"
 gdb_expect_list "annotate ignore count change" "$gdb_prompt$" {
     "\r\n\032\032post-prompt\r\n"
     "\r\n\032\032breakpoint 5\r\n"
-    "Breakpoint 5, main \\(\\) at .*annota3.c:46\r\n"
+    "\r\n"
+    "Breakpoint 5, "
+    "\r\n\032\032frame-begin 0 0x\[0-9a-z\]+\r\n"
+    "main \\(\\) at .*annota3.c:46\r\n"
     "\r\n\032\032source .*annota3.c:46:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n"
     "1: value = 11\r\n"
     "\r\n\032\032stopped\r\n"

diff --git a/gdb/testsuite/gdb.cp/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp
index 63f68daf9d1e2717ce1f30f123bd43b4ecc726e4..87db9e3a7361b0cc14f1ce36f34944605d34b361 100644 (file)
--- a/gdb/testsuite/gdb.cp/annota3.exp
+++ b/gdb/testsuite/gdb.cp/annota3.exp
@@ -96,7 +96,9 @@ gdb_expect_list "first run until main breakpoint" "$gdb_prompt$" {
     "\r\n\032\032starting\r\n"
     "\r\n\032\032breakpoint 1\r\n"
     "\r\n"
-    "Breakpoint 1, main \\(\\) at .*annota3.cc:25\r\n"
+    "Breakpoint 1, "
+    "\r\n\032\032frame-begin 0 0x\[0-9a-z\]+\r\n"
+    "main \\(\\) at .*annota3.cc:25\r\n"
     "\r\n\032\032source.*annota3.cc:25:.*:beg:0x\[0-9a-z\]+\r\n"
     "\r\n\032\032stopped\r\n"
 }
@@ -164,7 +166,9 @@ gdb_expect_list "second run until main breakpoint" "$gdb_prompt$" {
     "\r\n\032\032starting\r\n"
     "\r\n\032\032breakpoint 2\r\n"
     "\r\n"
-    "Breakpoint 2, main \\(\\) at .*annota3.cc:22\r\n"
+    "Breakpoint 2, "
+    "\r\n\032\032frame-begin 0 0x\[0-9a-z\]+\r\n"
+    "main \\(\\) at .*annota3.cc:22\r\n"
     "\r\n\032\032source.*annota3.cc:22:.*:beg:0x\[0-9a-z\]+\r\n"
     "\r\n\032\032stopped\r\n"
 }