Testsuite failures

[Mark Kettenis <mark.kettenis@xs4all.nl>]

Hi Nick,

I'm seeing some new testsuite failures on several OpenBSD machines:

Running ../../../../src/gdb/gdb/testsuite/gdb.base/annota3.exp ...
FAIL: gdb.base/annota3.exp: run until main breakpoint (pattern 6)
FAIL: gdb.base/annota3.exp: send SIGUSR1 (pattern 5)
FAIL: gdb.base/annota3.exp: annotate ignore count change (pattern 3)

I think these are caused by your last commit:

2006-07-13  Nick Roberts  <nickrob@snap.net.nz>

	* annotate.c (annotate_frame_begin): Re-instate frame-begin
	annotation for level 3 annotations.

Here's a patch that adjusts the testsuite to deal with the re-instated
frame-begin annotation.  Can you verify that this is indeed the
intended effect of your change?


Index: ChangeLog
from  Mark Kettenis  <kettenis@gnu.org>

	* gdb.base/annota3.exp: Adjust patterns for re-instated
	frame-begin annotation.

Index: gdb.base/annota3.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota3.exp,v
retrieving revision 1.7
diff -u -p -r1.7 annota3.exp
--- gdb.base/annota3.exp 7 Mar 2006 15:23:32 -0000 1.7
+++ gdb.base/annota3.exp 16 Jul 2006 11:41:02 -0000
@@ -112,6 +112,7 @@ gdb_expect_list "breakpoint info" "$gdb_
 
 #
 # run to a break point will test:
+# annotate-frame-begin
 #
 #exp_internal 1
 send_gdb "run\n"
@@ -121,7 +122,9 @@ gdb_expect_list "run until main breakpoi
     "\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 +225,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 +330,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"