From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1724 invoked by alias); 22 Nov 2004 23:29:21 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 1675 invoked from network); 22 Nov 2004 23:29:16 -0000 Received: from unknown (HELO pippin.tausq.org) (64.81.244.94) by sourceware.org with SMTP; 22 Nov 2004 23:29:16 -0000 Received: by pippin.tausq.org (Postfix, from userid 1000) id E8935CD2E1; Mon, 22 Nov 2004 15:29:15 -0800 (PST) Date: Mon, 22 Nov 2004 23:29:00 -0000 From: Randolph Chung To: gdb-patches@sources.redhat.com Subject: [patch] relax test in gdb.base/commands.exp Message-ID: <20041122232915.GG9148@tausq.org> Reply-To: Randolph Chung Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-GPG: for GPG key, see http://www.tausq.org/gpg.txt User-Agent: Mutt/1.5.5.1+cvs20040105i X-SW-Source: 2004-11/txt/msg00440.txt.bz2 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 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/