[patch] relax test in gdb.base/commands.exp

[Randolph Chung <randolph@tausq.org>]

The regexp below checked for a specific line number in the caller when
the watchpoint goes out of scope. On a target that emulates watchpoints
with single stepping i've seen that we get the "watchpoint deleted"
message when we're in the epilogue of a function. in this case the
current line number may still be in the called function. This patch
relaxes the line number checking a bit so we allow both cases (but not
any random line). Tested on hppa-linux. ok?

randolph



2004-11-22  Randolph Chung  <tausq@debian.org>

testsuite/
	* gdb.base/commands.exp (watchpoint_command_test): Relax line number 
	check to allow line number inside the called function.

Index: testsuite/gdb.base/commands.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/commands.exp,v
retrieving revision 1.13
diff -u -p -r1.13 commands.exp
--- testsuite/gdb.base/commands.exp	29 Sep 2003 15:08:52 -0000	1.13
+++ testsuite/gdb.base/commands.exp	22 Nov 2004 23:18:02 -0000
@@ -331,7 +331,7 @@ proc watchpoint_command_test {} {
     }
     send_gdb "continue\n"
     gdb_expect {
-	-re "Continuing.*\[Ww\]atchpoint $wp_id deleted because the program has left the block in.*which its expression is valid.*run.c:57.*$gdb_prompt $" {
+	-re "Continuing.*\[Ww\]atchpoint $wp_id deleted because the program has left the block in.*which its expression is valid.*run.c:\(57|82\).*$gdb_prompt $" {
 	    pass "continue with watch"
 	}
 	-re "$gdb_prompt $"   {fail "continue with watch"}
-- 
Randolph Chung
Debian GNU/Linux Developer, hppa/ia64 ports
http://www.tausq.org/