help delete testsuite changes

help delete testsuite changes

[Mark Kettenis]

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.

Is there an easy way to make that bit of the regexp optional?

Mark

Re: help delete testsuite changes

[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.

-- 
Daniel Jacobowitz
CodeSourcery

Re: help delete testsuite changes

[Mark Kettenis]

> Date: Sun, 7 May 2006 16:41:59 -0400
> From: Daniel Jacobowitz <drow@false.org>
> 
> 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  <kettenis@gnu.org>

	* 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