Re: Regression for gdb.base/help.exp [Re: [PATCH v3] gdb: improve usage strings]

Mike Frysinger
2012-08-17T03:06:33Z

[-- Attachment #1: Type: Text/Plain, Size: 8287 bytes --]

On Wednesday 15 August 2012 03:22:11 Jan Kratochvil wrote:
> On Wed, 15 Aug 2012 03:58:41 +0200, Mike Frysinger wrote:
> > so i'll merge this and we can fight over improving it further if need be
> > ;)
>
> Running ./gdb.base/help.exp ...
> FAIL: gdb.base/help.exp: help finish
> FAIL: gdb.base/help.exp: help jump
> FAIL: gdb.base/help.exp: help next "n" abbreviation
> FAIL: gdb.base/help.exp: help next
> FAIL: gdb.base/help.exp: help nexti
> FAIL: gdb.base/help.exp: help step "s" abbreviation
> FAIL: gdb.base/help.exp: help step #1
> FAIL: gdb.base/help.exp: help step #2
> FAIL: gdb.base/help.exp: help stepi "si" abbreviation
> FAIL: gdb.base/help.exp: help stepi
> FAIL: gdb.base/help.exp: help signal

i've committed this
-mike

2012-08-16 Mike Frysinger <vapier@gentoo.org>

* infcmd.c (_initialize_infcmd): Remove trailing ) in next help text.

--- infcmd.c 15 Aug 2012 01:59:42 -0000 1.309
+++ infcmd.c 17 Aug 2012 03:03:46 -0000
@@ -3051,7 +3051,7 @@ Step program, proceeding through subrout
Usage: next [N]\n\
Unlike \"step\", if the current source line calls a subroutine,\n\
this command does not enter the subroutine, but instead steps over\n\
-the call, in effect treating it as a single source line.)"));
+the call, in effect treating it as a single source line."));
add_com_alias ("n", "next", class_run, 1);
if (xdb_commands)
add_com_alias ("S", "next", class_run, 1);

2012-08-16 Mike Frysinger <vapier@gentoo.org>

* gdb.base/help.exp: Update expected output.

--- testsuite/gdb.base/help.exp 13 Aug 2012 21:14:48 -0000 1.60
+++ testsuite/gdb.base/help.exp 17 Aug 2012 03:03:46 -0000
@@ -194,7 +194,7 @@ gdb_test "help file" "Use FILE as progra
# test help files
gdb_test "help files" "Specifying.*" "help files"
# test help finish
-gdb_test "help finish" "Execute until selected stack frame returns\.\[\r\n\]+Upon return, the value returned is printed and put in
the value history\." "help finish"
+gdb_test "help finish" "Execute until selected stack frame returns\.\[\r\n\]+Usage: finish\[\r\n\]+Upon return, the value returned is
printed and put in the value history\.\[\r\n\]+" "help finish"
# test help forward-search
gdb_test "help forward-search" "Search for regular expression \\(see regex\\(3\\)\\) from last line listed.*" "help forward-search"
# test help gcore
@@ -295,7 +295,7 @@ gdb_test "help info watchpoints" \
# test help inspect
gdb_test "help inspect" "Same as \"print\" command, except that if you are running in the epoch\[\r\n\]+environment, the value is
printed in its own window\." "help inspect"
# test help jump
-gdb_test "help jump" "Continue program being debugged at specified line or address\.\[\r\n\]+Give as argument either LINENUM
or \[*\]+ADDR, where ADDR is an expression\[\r\n\]+for an address to start at\." "help jump"
+gdb_test "help jump" "Continue program being debugged at specified line or address\.\[\r\n\]+Usage: jump
<location>\[\r\n\]+Give as argument either LINENUM or \[*\]+ADDR, where ADDR is an expression\[\r\n\]+for an address to start
at\." "help jump"
# test help kill
test_prefix_command_help "kill" {
"Kill execution of program being debugged\.\[\r\n\]+"
@@ -309,11 +309,11 @@ gdb_test "help load" "Dynamically load F
# test help make
gdb_test "help make" "Run the ``make'' program using the rest of the line as arguments\." "help make"
# test help next "n" abbreviation
-gdb_test "help n" "Step program, proceeding through subroutine calls\.\[\r\n\]+Like the \"step\" command as long as subroutine
calls do not happen;\[\r\n\]+when they do, the call is treated as one instruction\.\[\r\n\]+Argument N means do this N times \\(or
till program stops for another reason\\)\." "help next \"n\" abbreviation"
+gdb_test "help n" "Step program, proceeding through subroutine calls\.\[\r\n\]+Usage: next \\\[N\\\]\[\r\n\]+Unlike \"step\", if the
current source line calls a subroutine,\[\r\n\]+this command does not enter the subroutine, but instead steps over\[\r\n\]+the call,
in effect treating it as a single source line\.\[\r\n\]+" "help next \"n\" abbreviation"
# test help next
-gdb_test "help next" "Step program, proceeding through subroutine calls\.\[\r\n\]+Like the \"step\" command as long as
subroutine calls do not happen;\[\r\n\]+when they do, the call is treated as one instruction\.\[\r\n\]+Argument N means do this N
times \\(or till program stops for another reason\\)\." "help next"
+gdb_test "help next" "Step program, proceeding through subroutine calls\.\[\r\n\]+Usage: next \\\[N\\\]\[\r\n\]+Unlike \"step\", if
the current source line calls a subroutine,\[\r\n\]+this command does not enter the subroutine, but instead steps over\[\r\n\]+the
call, in effect treating it as a single source line\.\[\r\n\]+" "help next \"n\" abbreviation"
# test help nexti
-gdb_test "help ni" "Step one instruction, but proceed through subroutine calls\.\[\r\n\]+Argument N means do this N times \\(or till
program stops for another reason\\)\." "help nexti"
+gdb_test "help ni" "Step one instruction, but proceed through subroutine calls\.\[\r\n\]+Usage: nexti \\\[N\\\]\[\r\n\]+Argument N
means step N times \\(or till program stops for another reason\\)\.\[\r\n\]+" "help nexti"
# all the commands that used to be here are now in "maintainance" instead
# test help obscure
test_class_help "obscure" {
@@ -365,9 +365,9 @@ test_class_help "running" {
"Running the program\.\[\r\n\]+"
}
# test help step "s" abbreviation
-gdb_test "help s" "Step program until it reaches a different source line\.\[\r\n\]+Argument N means do this N times \\(or till
program stops for another reason\\)\." "help step \"s\" abbreviation"
+gdb_test "help s" "Step program until it reaches a different source line\.\[\r\n\]+Usage: step \\\[N\\\]\[\r\n\]+Argument N means
step N times \\(or till program stops for another reason\\)\.\[\r\n\]+" "help step \"s\" abbreviation"
# test help step
-gdb_test "help step" "Step program until it reaches a different source line\.\[\r\n\]+Argument N means do this N times \\(or till
program stops for another reason\\)\." "help step #1"
+gdb_test "help step" "Step program until it reaches a different source line\.\[\r\n\]+Usage: step \\\[N\\\]\[\r\n\]+Argument N
means step N times \\(or till program stops for another reason\\)\.\[\r\n\]+" "help step #1"
# test help search
gdb_test "help search" "Search for regular expression \\(see regex\\(3\\)\\) from last line listed\..*" "help search"
# test help section
@@ -590,13 +590,13 @@ test_prefix_command_help "show" {
"Generic command for showing things about the debugger\.\[\r\n\]+"
}
# test help step
-gdb_test "help step" "Step program until it reaches a different source line\.\[\r\n\]+Argument N means do this N times \\(or till
program stops for another reason\\)\." "help step #2"
+gdb_test "help step" "Step program until it reaches a different source line\.\[\r\n\]+Usage: step \\\[N\\\]\[\r\n\]+Argument N
means step N times \\(or till program stops for another reason\\)\.\[\r\n\]+" "help step #2"
# test help stepi "si" abbreviation
-gdb_test "help si" "Step one instruction exactly\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another
reason\\)\." "help stepi \"si\" abbreviation"
+gdb_test "help si" "Step one instruction exactly\.\[\r\n\]+Usage: stepi \\\[N\\\]\[\r\n\]+Argument N means step N times \\(or till
program stops for another reason\\)\.\[\r\n\]+" "help stepi \"si\" abbreviation"
# test help stepi
-gdb_test "help stepi" "Step one instruction exactly\.\[\r\n\]+Argument N means do this N times \\(or till program stops for another
reason\\)\." "help stepi"
+gdb_test "help stepi" "Step one instruction exactly\.\[\r\n\]+Usage: stepi \\\[N\\\]\[\r\n\]+Argument N means step N times \\(or till
program stops for another reason\\)\.\[\r\n\]+" "help stepi"
# test help signal
-gdb_test "help signal" "Continue program giving it signal.*" "help signal"
+gdb_test "help signal" "Continue program with the specified signal.*" "help signal"
# test help source
# vxgdb reads .vxgdbinit
# ".-s. .-v." is written that way to avoid the complications of trying

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]