From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4000 invoked by alias); 7 May 2006 20:51:21 -0000 Received: (qmail 3987 invoked by uid 22791); 7 May 2006 20:51:20 -0000 X-Spam-Check-By: sourceware.org Received: from sibelius.xs4all.nl (HELO sibelius.xs4all.nl) (82.92.89.47) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sun, 07 May 2006 20:51:13 +0000 Received: from elgar.sibelius.xs4all.nl (root@elgar.sibelius.xs4all.nl [192.168.0.2]) by sibelius.xs4all.nl (8.13.4/8.13.4) with ESMTP id k47Kod3K010468; Sun, 7 May 2006 22:50:39 +0200 (CEST) Received: from elgar.sibelius.xs4all.nl (kettenis@localhost.sibelius.xs4all.nl [127.0.0.1]) by elgar.sibelius.xs4all.nl (8.13.6/8.13.6) with ESMTP id k47KocI5019171; Sun, 7 May 2006 22:50:38 +0200 (CEST) Received: (from kettenis@localhost) by elgar.sibelius.xs4all.nl (8.13.6/8.13.6/Submit) id k47Koch8000356; Sun, 7 May 2006 22:50:38 +0200 (CEST) Date: Sun, 07 May 2006 21:13:00 -0000 Message-Id: <200605072050.k47Koch8000356@elgar.sibelius.xs4all.nl> From: Mark Kettenis To: drow@false.org CC: gdb@sourceware.org, gdb-patches@sourceware.org In-reply-to: <20060507204159.GA17361@nevyn.them.org> (message from Daniel Jacobowitz on Sun, 7 May 2006 16:41:59 -0400) Subject: Re: help delete testsuite changes References: <200605072035.k47KZGgR027212@elgar.sibelius.xs4all.nl> <20060507204159.GA17361@nevyn.them.org> Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2006-05/txt/msg00064.txt.bz2 > Date: Sun, 7 May 2006 16:41:59 -0400 > From: Daniel Jacobowitz > > On Sun, May 07, 2006 at 10:35:16PM +0200, Mark Kettenis wrote: > > Hi Daniel, > > > > Your changes to gdb.base/help.exp made two tests FAIL: > > > > -PASS: gdb.base/help.exp: help delete "d" abbreviation > > -PASS: gdb.base/help.exp: help delete > > +FAIL: gdb.base/help.exp: help delete "d" abbreviation > > +FAIL: gdb.base/help.exp: help delete > > > > Coparing the gdblog output with the regexp in the test, it's obvious > > why: not all systems support checkpointing, and on systems that don't, > > the "delete checkpoint" stuff doesn't show up. > > D'oh! Sorry, I didn't even think of that. > > > Is there an easy way to make that bit of the regexp optional? > > It should be as simple as ()? around the new line I added. If you don't > beat me to it, I'll try to build a simulator toolchain or something and > run help.exp. That seems to do the trick. So I've committed the attached. Thanks, Mark Index: ChangeLog from Mark Kettenis * gdb.base/help.exp: Make "delete checkpoint" part option for "help d" and "help delete" tests. Index: gdb.base/help.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/help.exp,v retrieving revision 1.19 diff -u -p -r1.19 help.exp --- gdb.base/help.exp 5 May 2006 15:45:09 -0000 1.19 +++ gdb.base/help.exp 7 May 2006 20:48:39 -0000 @@ -84,9 +84,9 @@ gdb_test "help condition" "Specify break # test help core-file gdb_test "help core-file" "Use FILE as core dump for examining memory and registers\.\[\r\n\]+No arg means have no core file\. This command has been superseded by the\[\r\n\]+`target core' and `detach' commands\." "help core-file" # test help delete "d" abbreviation -gdb_test "help d" "Delete some breakpoints or auto-display expressions\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To delete all breakpoints, give no argument\.\[\r\n\]+Also a prefix command for deletion of other GDB objects\.\[\r\n\]+The \"unset\" command is also an alias for \"delete\"\.\[\r\n\]+List of delete subcommands:\[\r\n\]+delete breakpoints -- Delete some breakpoints or auto-display expressions\[\r\n\]+delete checkpoint -- Delete a fork/checkpoint \\(experimental\\)\[\r\n\]+delete display -- Cancel some expressions to be displayed when program stops\[\r\n\]+delete mem -- Delete memory region\[\r\n\]+delete tracepoints -- Delete specified tracepoints\[\r\n\]+Type \"help delete\" followed by delete subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help delete \"d\" abbreviation" +gdb_test "help d" "Delete some breakpoints or auto-display expressions\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To delete all breakpoints, give no argument\.\[\r\n\]+Also a prefix command for deletion of other GDB objects\.\[\r\n\]+The \"unset\" command is also an alias for \"delete\"\.\[\r\n\]+List of delete subcommands:\[\r\n\]+delete breakpoints -- Delete some breakpoints or auto-display expressions\[\r\n\]+(delete checkpoint -- Delete a fork/checkpoint \\(experimental\\)\[\r\n\]+)?delete display -- Cancel some expressions to be displayed when program stops\[\r\n\]+delete mem -- Delete memory region\[\r\n\]+delete tracepoints -- Delete specified tracepoints\[\r\n\]+Type \"help delete\" followed by delete subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help delete \"d\" abbreviation" # test help delete -gdb_test "help delete" "Delete some breakpoints or auto-display expressions\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To delete all breakpoints, give no argument\.\[\r\n\]+Also a prefix command for deletion of other GDB objects\.\[\r\n\]+The \"unset\" command is also an alias for \"delete\"\.\[\r\n\]+List of delete subcommands:\[\r\n\]+delete breakpoints -- Delete some breakpoints or auto-display expressions\[\r\n\]+delete checkpoint -- Delete a fork/checkpoint \\(experimental\\)\[\r\n\]+delete display -- Cancel some expressions to be displayed when program stops\[\r\n\]+delete mem -- Delete memory region\[\r\n\]+delete tracepoints -- Delete specified tracepoints\[\r\n\]+Type \"help delete\" followed by delete subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help delete" +gdb_test "help delete" "Delete some breakpoints or auto-display expressions\.\[\r\n\]+Arguments are breakpoint numbers with spaces in between\.\[\r\n\]+To delete all breakpoints, give no argument\.\[\r\n\]+Also a prefix command for deletion of other GDB objects\.\[\r\n\]+The \"unset\" command is also an alias for \"delete\"\.\[\r\n\]+List of delete subcommands:\[\r\n\]+delete breakpoints -- Delete some breakpoints or auto-display expressions\[\r\n\]+(delete checkpoint -- Delete a fork/checkpoint \\(experimental\\)\[\r\n\]+)?delete display -- Cancel some expressions to be displayed when program stops\[\r\n\]+delete mem -- Delete memory region\[\r\n\]+delete tracepoints -- Delete specified tracepoints\[\r\n\]+Type \"help delete\" followed by delete subcommand name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help delete" # test help data gdb_test "help data" "Examining data\.\[\r\n\]+List of commands:.*\[\r\n\]+Type \"help\" followed by command name for full documentation\.\[\r\n\]+Command name abbreviations are allowed if unambiguous\." "help data" # test help define