[patch/rfa] tweak patterns for annota3.exp

[Randolph Chung <randolph@tausq.org>]

Note: i don't really understand the annotation stuff in gdb...

I've been getting FAILs for this test for a long time, and i never quite
understood why....

In the first case, i see an extra \r\n between "breakpoint 2" and
"Breakpoint 2, ...". Also on hppa-linux, the backtrace prints out the
address of the signal handler... i.e. i get 

#0  0x000105d4 in handle_USR1 (sig=16) at /home/tausq/gdb/gdb-cvs/gdb/testsuite/gdb.base/annota3.c:18

instead of what the script expected, which seems to be
#0  handle_USR1 (sig=16) at /home/tausq/gdb/gdb-cvs/gdb/testsuite/gdb.base/annota3.c:18

i see from test results posted by others that these tests do pass on
other platforms, but i don't see how this could be hppa specific....

can someone enlighten me about what's going on? or is this patch ok?

randolph


2004-12-05  Randolph Chung  <tausq@debian.org>

	* gdb.base/annota3.exp: allow addresses to be printed for signal 
	handlers, and multiple \r\n sequences after "breakpoint n".

Index: testsuite/gdb.base/annota3.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/annota3.exp,v
retrieving revision 1.5
diff -u -p -r1.5 annota3.exp
--- testsuite/gdb.base/annota3.exp	20 Jul 2004 00:24:41 -0000	1.5
+++ testsuite/gdb.base/annota3.exp	6 Dec 2004 02:13:54 -0000
@@ -228,8 +228,8 @@ if [target_info exists gdb,nosignals] {
 	"Continuing with signal SIGUSR1.\r\n"
 	"\r\n\032\032starting\r\n"
 	"\r\n\032\032frames-invalid\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\032\032breakpoint 2\[\r\n\]+"
+	"Breakpoint 2, .*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"
     }
@@ -245,7 +245,7 @@ if [target_info exists gdb,nosignals] {
     verbose "match_max now is: [match_max]"
     send_gdb "backtrace\n"
     gdb_expect_list "backtrace @ signal handler" "$gdb_prompt$" {
-	"#0 +handle_USR1 \[^\r\n\]+\r\n"
+	"#0 .*handle_USR1 \[^\r\n\]+\r\n"
 	"#1 +.signal handler called.\r\n"
 	"#2 .* printf \[^\r\n\]+\r\n"
 	"#3 .* main \[^\r\n\]+\r\n"
-- 
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/