From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25392 invoked by alias); 2 May 2011 14:36:35 -0000 Received: (qmail 25244 invoked by uid 22791); 2 May 2011 14:36:34 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from e24smtp01.br.ibm.com (HELO e24smtp01.br.ibm.com) (32.104.18.85) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 02 May 2011 14:36:19 +0000 Received: from mailhub3.br.ibm.com (mailhub3.br.ibm.com [9.18.232.110]) by e24smtp01.br.ibm.com (8.14.4/8.13.1) with ESMTP id p42FZNI2027343 for ; Mon, 2 May 2011 11:35:23 -0400 Received: from d24av01.br.ibm.com (d24av01.br.ibm.com [9.8.31.91]) by mailhub3.br.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p42EbOQw524422 for ; Mon, 2 May 2011 11:37:24 -0300 Received: from d24av01.br.ibm.com (loopback [127.0.0.1]) by d24av01.br.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p42CaD7F000411 for ; Mon, 2 May 2011 09:36:14 -0300 Received: from [9.12.226.187] ([9.12.226.187]) by d24av01.br.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p42CaCj8000379; Mon, 2 May 2011 09:36:13 -0300 Message-ID: <4DBEC15C.10503@linux.vnet.ibm.com> Date: Mon, 02 May 2011 14:36:00 -0000 From: Edjunior Barbosa Machado User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.15) Gecko/20110402 Lightning/1.0b2 Icedove/3.1.9 MIME-Version: 1.0 To: Jan Kratochvil CC: "gdb-patches@sourceware.org" Subject: Re: [PATCH] testsuite: inline-cmds.exp: adjust checks with 'finish' command References: <4DB7BAEF.3070303@linux.vnet.ibm.com> <20110430145414.GA8989@host1.jankratochvil.net> In-Reply-To: <20110430145414.GA8989@host1.jankratochvil.net> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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: 2011-05/txt/msg00013.txt.bz2 Thanks Jan for the feedback, and sorry about the confusion with the mail format, I hope it works better now. Here is the updated patch. Thanks, -- Edjunior gdb/testsuite/ 2011-05-02 Edjunior Machado * gdb.opt/inline-cmds.exp: Adjust checks with "finish" command to accept to show the caller line again as well as the line after. diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp index cde86f5..cb5f96f 100644 --- a/gdb/testsuite/gdb.opt/inline-cmds.exp +++ b/gdb/testsuite/gdb.opt/inline-cmds.exp @@ -263,7 +263,20 @@ gdb_continue_to_breakpoint "finish into func1" gdb_test "next" ".*marker \\\(\\\);" "next to finish marker" gdb_test "step" ".*set breakpoint 2 here.*" "step into finish marker" -gdb_test "finish" "func1 \\\(\\\);" "finish from marker to func1" + +# Some architectures will have one or more instructions after +# the call instruction which still are part of the call sequence, +# so it should be expected to return to the caller line after issue +# a 'finish' command. +gdb_test_multiple "finish" "finish from marker" { + -re "func1 \\\(\\\);.*\r\n$gdb_prompt $" { + pass "finish from marker to func1" + } + -re "marker \\\(\\\);.*\r\n$gdb_prompt $" { + pass "finish from marker" + gdb_test "step" "func1 \\\(\\\);.*" "step after marker to reach func1" + } +} gdb_test "step" "bar \\\(\\\);" "step into func1 for finish" gdb_test "finish" "func3 \\\(\\\);" "finish from func1 to func3" @@ -273,7 +286,15 @@ set line6 [gdb_get_line_number "set breakpoint 6 here"] gdb_breakpoint $line6 gdb_continue_to_breakpoint "before the outer_inline call" gdb_test "step" "marker \\\(\\\) at .*" "reach 1 the outer_inline call" -gdb_test "finish" "main \\\(\\\) at .*outer_inline2 \\\(\\\);" "reach outer_inline2" +gdb_test_multiple "finish" "finish from marker" { + -re "main \\\(\\\) at .*outer_inline2 \\\(\\\);.*\r\n$gdb_prompt $" { + pass "reach outer_inline2" + } + -re "main \\\(\\\) at .*marker \\\(\\\);.*\r\n$gdb_prompt $" { + pass "finish from marker" + gdb_test "step" "outer_inline2 \\\(\\\);.*" "step after marker to reach outer_inline2" + } +} gdb_test "bt" "#0 main.*" "backtrace at main of outer_inline" gdb_test "step" "outer_inline2 \\\(\\\) at .*" "enter outer_inline2" gdb_test "bt" "#0 outer_inline2.*#1 main.*" "backtrace at outer_inline2"