From dbf6a605eef9bd4ab5aaaa010de58baa025fb09b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 17 Aug 2012 03:06:11 +0000 Subject: gdb: fix test failures after updating usage strings --- gdb/ChangeLog | 4 ++++ gdb/infcmd.c | 2 +- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/help.exp | 22 +++++++++++----------- 4 files changed, 20 insertions(+), 12 deletions(-) (limited to 'gdb') diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ec0532e..ae3443a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2012-08-16 Mike Frysinger + + * infcmd.c (_initialize_infcmd): Remove trailing ) in next help text. + 2012-08-16 Joel Brobecker * ia64-hpux-nat.c (ia64_hpux_get_register_from_save_state_t): diff --git a/gdb/infcmd.c b/gdb/infcmd.c index cbd8a0a..8300182 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -3051,7 +3051,7 @@ Step program, proceeding through subroutine calls.\n\ 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); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 9c80ecb..f4eec64 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-08-16 Mike Frysinger + + * gdb.base/help.exp: Update expected output. + 2012-08-16 Joel Brobecker * gdb.ada/rdv_wait: New testcase. diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp index 547495b..ac646e7 100644 --- a/gdb/testsuite/gdb.base/help.exp +++ b/gdb/testsuite/gdb.base/help.exp @@ -194,7 +194,7 @@ gdb_test "help file" "Use FILE as program to be debugged\.\[\r\n\]+It is read fo # 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 \[\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 FILE into the running program, and record # 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 -- cgit v1.1