From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12969 invoked by alias); 6 Dec 2004 02:19:58 -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 12891 invoked from network); 6 Dec 2004 02:19:47 -0000 Received: from unknown (HELO arwen.tausq.org) (64.81.244.109) by sourceware.org with SMTP; 6 Dec 2004 02:19:47 -0000 Received: by arwen.tausq.org (Postfix, from userid 1000) id 8880943810; Sun, 5 Dec 2004 18:19:44 -0800 (PST) Date: Mon, 06 Dec 2004 02:49:00 -0000 From: Randolph Chung To: gdb-patches@sources.redhat.com Subject: [patch/rfa] tweak patterns for annota3.exp Message-ID: <20041206021944.GX6359@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.6+20040722i X-SW-Source: 2004-12/txt/msg00141.txt.bz2 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 * 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/