From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14264 invoked by alias); 17 Aug 2012 03:06:33 -0000 Received: (qmail 14250 invoked by uid 22791); 17 Aug 2012 03:06:31 -0000 X-SWARE-Spam-Status: No, hits=-8.5 required=5.0 tests=AWL,BAYES_00,KHOP_PGP_SIGNED,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,TW_VX,TW_XG X-Spam-Check-By: sourceware.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 17 Aug 2012 03:06:16 +0000 Received: from vapier.localnet (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 5656B1B400E; Fri, 17 Aug 2012 03:06:15 +0000 (UTC) From: Mike Frysinger To: Jan Kratochvil Subject: Re: Regression for gdb.base/help.exp [Re: [PATCH v3] gdb: improve usage strings] Date: Fri, 17 Aug 2012 03:06:00 -0000 User-Agent: KMail/1.13.7 (Linux/3.5.0; KDE/4.6.5; x86_64; ; ) Cc: Eli Zaretskii , Doug Evans , gdb-patches@sourceware.org References: <1344704080-24677-1-git-send-email-vapier@gentoo.org> <201208142158.42487.vapier@gentoo.org> <20120815072211.GA12876@host2.jankratochvil.net> In-Reply-To: <20120815072211.GA12876@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1781776.MvMg15yyyT"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201208162306.18510.vapier@gentoo.org> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-08/txt/msg00470.txt.bz2 --nextPart1781776.MvMg15yyyT Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Content-length: 8291 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 > > ;) >=20 > 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 * 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 * gdb.base/help.exp: Update expected output.=20=20=20 --- 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=20 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=20 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=20 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=20 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=20 \[\r\n\]+Give as argument either LINENUM or \[*\]+ADDR, where ADD= R is an expression\[\r\n\]+for an address to start=20 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=20 calls do not happen;\[\r\n\]+when they do, the call is treated as one instr= uction\.\[\r\n\]+Argument N means do this N times \\(or=20 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=20 current source line calls a subroutine,\[\r\n\]+this command does not enter= the subroutine, but instead steps over\[\r\n\]+the call,=20 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=20 subroutine calls do not happen;\[\r\n\]+when they do, the call is treated a= s one instruction\.\[\r\n\]+Argument N means do this N=20 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=20 the current source line calls a subroutine,\[\r\n\]+this command does not e= nter the subroutine, but instead steps over\[\r\n\]+the=20 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 c= alls\.\[\r\n\]+Argument N means do this N times \\(or till=20 program stops for another reason\\)\." "help nexti" +gdb_test "help ni" "Step one instruction, but proceed through subroutine c= alls\.\[\r\n\]+Usage: nexti \\\[N\\\]\[\r\n\]+Argument N=20 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=20 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=20 step N times \\(or till program stops for another reason\\)\.\[\r\n\]+" "he= lp step \"s\" abbreviation" # test help step -gdb_test "help step" "Step program until it reaches a different source lin= e\.\[\r\n\]+Argument N means do this N times \\(or till=20 program stops for another reason\\)\." "help step #1" +gdb_test "help step" "Step program until it reaches a different source lin= e\.\[\r\n\]+Usage: step \\\[N\\\]\[\r\n\]+Argument N=20 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 lin= e\.\[\r\n\]+Argument N means do this N times \\(or till=20 program stops for another reason\\)\." "help step #2" +gdb_test "help step" "Step program until it reaches a different source lin= e\.\[\r\n\]+Usage: step \\\[N\\\]\[\r\n\]+Argument N=20 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 mean= s do this N times \\(or till program stops for another=20 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=20 program stops for another reason\\)\.\[\r\n\]+" "help stepi \"si\" abbrevia= tion" # test help stepi -gdb_test "help stepi" "Step one instruction exactly\.\[\r\n\]+Argument N m= eans do this N times \\(or till program stops for another=20 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=20 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.*" "hel= p signal" # test help source # vxgdb reads .vxgdbinit # ".-s. .-v." is written that way to avoid the complications of trying --nextPart1781776.MvMg15yyyT Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. Content-length: 836 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iQIcBAABAgAGBQJQLbUqAAoJEEFjO5/oN/WB83oP/03Um9BVRWpX9SF8k5GkNPIf swJmChaUL0RI9iAHrQCXdQHyhOIr3cFyJeHfyI4WV/guwJVECaBGLQTo30RwotoW ZXq0m/wGR1Iy0yRmhOsSLpyqE5mgpkT0uA/8L4pBjYJB2BpyXyl5/OpscvXQtkdW ZOn0RWE9ZpwkjHkC3zA2oJPCzFtHS710xiFTBUWjXHdTmH8i5wew3y2I9AhtcGP8 HIrukUs9qTFCfVY1ekXwbn7VVsPNk2Pa1aEyZeD4Vp+BEX0O7RpwXsSO4yLqjZPj aZYvAopq+xFAaGonJO0Nh4U9wBiZgKPxsjyFq6vL/Ccu/R0NVNskJMNA5pke+Cki RbZS2M0saNsnDSh4dskiQ2RHpKrJsyNJM556V6KNz6gOtnxy6nB1iT9S5w6OCtuG Brwg+xqkK18ykOzSGI3h0JtIEvckD+1rrAjRq66BNcFMzHagAdN+UAYb+eg6ACwo aaT2o2rJM1xWdjCbtviPnWCss/zcRvnyel38zCq4wVdt0Lk1pSbBNbVEJu5raJZ1 LDbt0BqXS/rAVaR1lSPYvOW5lsRLKPwNTdHqXakN6oHhrhEFMT2KnyBroQaVV3Ww 7c6LYanFlPkOLOg0Kf9zGXcyDF2Rk8Sv1DCCznANevS9zj1gg420Zvx3tcj2WK7d qg+78eechQ2JKu5b4eSh =Y/is -----END PGP SIGNATURE----- --nextPart1781776.MvMg15yyyT--