From eecc4fc75a0905ee4f21831eb10b3979a0be6e2b Mon Sep 17 00:00:00 2001
From: Nick Roberts <nickrob@snap.net.nz>
Date: Mon, 17 Jul 2006 07:29:47 +0000
Subject: Expect frame-begin annotation.

---
 gdb/testsuite/gdb.base/annota3.exp | 14 +++++++++++---
 gdb/testsuite/gdb.cp/annota3.exp   |  8 ++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'gdb')

diff --git a/gdb/testsuite/gdb.base/annota3.exp b/gdb/testsuite/gdb.base/annota3.exp
index 51543904e9f..2bdf88cdfcb 100644
--- 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 63f68daf9d1..87db9e3a736 100644
--- 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"
 }
-- 
cgit v1.2.1