From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14516 invoked by alias); 28 Sep 2005 22:52:55 -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 14488 invoked by uid 22791); 28 Sep 2005 22:52:46 -0000 Received: from viper.snap.net.nz (HELO viper.snap.net.nz) (202.37.101.8) by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Wed, 28 Sep 2005 22:52:46 +0000 Received: from kahikatea.snap.net.nz (p113-tnt1.snap.net.nz [202.124.110.113]) by viper.snap.net.nz (Postfix) with ESMTP id 44216688ADA; Thu, 29 Sep 2005 10:52:34 +1200 (NZST) Received: by kahikatea.snap.net.nz (Postfix, from userid 500) id AF2D883F9; Thu, 29 Sep 2005 10:51:18 +1200 (NZST) From: Nick Roberts MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <17211.7781.314204.820441@kahikatea.snap.net.nz> Date: Wed, 28 Sep 2005 22:52:00 -0000 To: Daniel Jacobowitz Cc: gdb-patches@sources.redhat.com Subject: Re: [PATCH] Removal of markup annotations In-Reply-To: <20050928131113.GA6924@nevyn.them.org> References: <17071.40307.949193.158796@farnswood.snap.net.nz> <20050928001644.A76A383B3@kahikatea.snap.net.nz> <20050928034539.GA29542@nevyn.them.org> <17210.15172.757495.813012@kahikatea.snap.net.nz> <20050928131113.GA6924@nevyn.them.org> X-SW-Source: 2005-09/txt/msg00283.txt.bz2 > I buy it. The patch is OK. Trying not to break the testsuite this time, here's a patch for gdb.base/annota3.exp and gdb.cp/annota3.exp to go with it. Nick 2005-09-29 Nick Roberts * gdb.base/annota3.exp, gdb.cp/annota3.exp: The annotations frames-invalid and breakpoints-invalid are no longer generated with level 3 so don't expect them in the output. *** gdb.base/annota3.exp.~1.5.~ 2004-07-20 12:24:41.000000000 +1200 --- gdb.base/annota3.exp 2005-09-29 09:26:00.000000000 +1200 *************** *** 118,126 **** gdb_expect_list "run until main breakpoint" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" "Starting program: .*annota3 \r\n" - "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+" "\r\n\032\032starting\r\n" - "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+" "\r\n\032\032breakpoint 1\r\n" "\r\n" "Breakpoint 1, main \\(\\) at .*annota3.c:32\r\n" --- 118,124 ---- *************** *** 139,145 **** gdb_expect_list "go after array init line" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" "\r\n\032\032starting\r\n" - "\(\r\n\032\032frames-invalid\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" } --- 137,142 ---- *************** *** 177,183 **** send_gdb "break handle_USR1\n" gdb_expect_list "breakpoint handle_USR1" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\r\n\032\032breakpoints-invalid\r\n" "Breakpoint.*at 0x\[0-9a-z\]+: file.*annota3.c, line.*\r\n" } --- 174,179 ---- *************** *** 187,193 **** send_gdb "break printf\n" gdb_expect_list "breakpoint printf" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\r\n\032\032breakpoints-invalid\r\n" "Breakpoint.*at 0x\[0-9a-z\]+.*" } --- 183,188 ---- *************** *** 199,205 **** "\r\n\032\032post-prompt\r\n" "Continuing.\r\n" "\r\n\032\032starting\r\n" - "\r\n\032\032frames-invalid\r\n" "\r\n\032\032breakpoint 3\r\n" "\r\n" "Breakpoint 3, \[^\r\n\]*\r\n" --- 194,199 ---- *************** *** 227,233 **** "\r\n\032\032post-prompt\r\n" "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\032source .*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n" --- 221,226 ---- *************** *** 277,283 **** send_gdb "break main\n" gdb_expect_list "break at 28" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\r\n\032\032breakpoints-invalid\r\n" "Breakpoint 4 at 0x\[0-9a-z\]+: file .*annota3.c, line 32.\r\n" } --- 270,275 ---- *************** *** 312,322 **** # # Test that breakpoints-invalid is issued once and only once for # breakpoint ignore count changes, after annotation stopped. ! # send_gdb "break 46\n" gdb_expect_list "break at 46" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\r\n\032\032breakpoints-invalid\r\n" "Breakpoint 5 at 0x\[0-9a-z\]+: file .*annota3.c, line 46.\r\n" } --- 304,315 ---- # # Test that breakpoints-invalid is issued once and only once for # breakpoint ignore count changes, after annotation stopped. ! # NOTE: breakpoints-invalid annotations have been removed from ! # level 3 but keep these tests for continuity and comparison ! # with annota1.exp. send_gdb "break 46\n" gdb_expect_list "break at 46" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" "Breakpoint 5 at 0x\[0-9a-z\]+: file .*annota3.c, line 46.\r\n" } *************** *** 324,343 **** gdb_expect_list "ignore 5 4" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" "Will ignore next 4 crossings of breakpoint 5" - "\r\n\032\032breakpoints-invalid\r\n" "\r\n" } send_gdb "continue\n" gdb_expect_list "annotate ignore count change" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\(\r\n\032\032frames-invalid\r\n\)+" "\r\n\032\032breakpoint 5\r\n" "Breakpoint 5, 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" - "\r\n\032\032breakpoints-invalid\r\n" } # check that ignore command is working, or the above can provide --- 317,333 ---- *************** *** 347,353 **** gdb_expect_list "next to exit loop" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" "\r\n\032\032starting\r\n" - "\(\r\n\032\032frames-invalid\r\n\)+" "\r\n\032\032source.*annota3.c:\[0-9\]+:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n" "1: value = 12\r\n" "\r\n\032\032stopped\r\n" --- 337,342 ---- *************** *** 357,363 **** gdb_expect_list "breakpoint ignore count" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" "\r\n\032\032starting\r\n" - "\(\r\n\032\032frames-invalid\r\n\)+" "\r\n\032\032source.*annota3.c:49:\[0-9\]+:beg:0x\[0-9a-z\]+\r\n" "1: value = 12\r\n" "\r\n\032\032stopped\r\n" --- 346,351 ---- *************** *** 384,391 **** "\r\n\032\032post-prompt\r\n" "Continuing with signal SIGTRAP.\r\n" "\r\n\032\032starting\r\n" - "\r\n\032\032frames-invalid\r\n" - "\r\n\032\032frames-invalid\r\n" "\r\n\032\032signalled\r\n" "\r\nProgram terminated with signal SIGTRAP, Trace.breakpoint trap.\r\n" "The program no longer exists.\r\n" --- 372,377 ---- *** gdb.cp/annota3.exp.~1.3.~ 2004-02-12 03:01:25.000000000 +1300 --- gdb.cp/annota3.exp 2005-09-29 10:32:07.000000000 +1200 *************** *** 93,101 **** gdb_expect_list "first run until main breakpoint" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" "Starting program: .*annota3 \r\n" - "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+" "\r\n\032\032starting\r\n" - "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+" "\r\n\032\032breakpoint 1\r\n" "\r\n" "Breakpoint 1, main \\(\\) at .*annota3.cc:25\r\n" --- 93,99 ---- *************** *** 122,134 **** "\r\n\032\032post-prompt\r\n" "Continuing.\r\n" "\r\n\032\032starting\r\n" - "\r\n\032\032frames-invalid\r\n" "a.x is 1\r\n" - "\r\n\032\032frames-invalid\r\n" "\r\n\032\032exited 0\r\n" "\r\n" "Program exited normally.\r\n" - "\r\n\032\032frames-invalid\r\n" "\r\n\032\032stopped\r\n" } --- 120,129 ---- *************** *** 155,161 **** send_gdb "break 22\n" gdb_expect_list "break at main" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\r\n\032\032breakpoints-invalid\r\n" "Breakpoint.*at 0x\[a-z0-9\]+: file.*annota3.cc, line 22.\r\n" } --- 150,155 ---- *************** *** 167,175 **** send_gdb "run\n" gdb_expect_list "second run until main breakpoint" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+" "\r\n\032\032starting\r\n" - "\(\r\n\032\032\(frames-invalid|breakpoints-invalid\)\r\n\)+" "\r\n\032\032breakpoint 2\r\n" "\r\n" "Breakpoint 2, main \\(\\) at .*annota3.cc:22\r\n" --- 161,167 ---- *************** *** 183,189 **** send_gdb "watch a.x\n" gdb_expect_list "set watch on a.x" "$gdb_prompt$" { "\r\n\032\032post-prompt\r\n" - "\r\n\032\032breakpoints-invalid\r\n" ".*atchpoint 3: a.x\r\n" \ } --- 175,180 ---- *************** *** 193,202 **** # send_gdb "next\n" gdb_expect { ! -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\(\r\n\032\032frames-invalid\r\n\)+\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { pass "watch triggered on a.x" } ! -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { kfail "gdb/38" "watch triggered on a.x" } -re ".*$gdb_prompt$" { --- 184,193 ---- # send_gdb "next\n" gdb_expect { ! -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032watchpoint 3\r\n.*atchpoint 3: a.x\r\n\r\nOld value = 0\r\nNew value = 1\r\nmain \\(\\) at .*$srcfile:$decimal\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n.*$gdb_prompt$" { pass "watch triggered on a.x" } ! -re "\r\n\032\032post-prompt\r\n\r\n\032\032starting\r\n\r\n\032\032source .*$srcfile.*beg:$hex\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { kfail "gdb/38" "watch triggered on a.x" } -re ".*$gdb_prompt$" {