From patchwork Wed Nov 23 18:39:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61043 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8BEE8384F6E5 for ; Wed, 23 Nov 2022 19:00:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8BEE8384F6E5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669230015; bh=ZH1PVRXr7yL/zRWYJnCohay61fH9sQ68M4CkypMViiI=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=I//Exh7ujHkW4niTFBPtRV+0XuMtI+pRAmbKG94gFFUA46Dmyz6cOsJ+j1UHU7jH2 JJ55eNOY21p2no8SGFFUWCM3Ty1QgF7MQoTt7zpjzznjaHIF38GHMRD4ScYTcLN0Xj JoKh0ea6tuS8vJoTT7S6+AMiuz9nJzFcKawDX29k= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 8606638518B3 for ; Wed, 23 Nov 2022 18:58:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8606638518B3 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2ANIwpoE007708 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Nov 2022 13:58:55 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2ANIwpoE007708 Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 80A141E12C; Wed, 23 Nov 2022 13:40:04 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 07/14] gdb/testsuite/gdb.base/break.exp: split test_break_user_call Date: Wed, 23 Nov 2022 13:39:52 -0500 Message-Id: <20221123183959.2476477-8-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221123183959.2476477-1-simon.marchi@polymtl.ca> References: <20221123183959.2476477-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 23 Nov 2022 18:58:51 +0000 X-Spam-Status: No, score=-3189.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change-Id: I9151ce9db9435722b758f41c6606b461bf15f320 --- gdb/testsuite/gdb.base/break.exp | 54 +++++++++++++++++++------------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index 1f6c620ee0cb..d9cfeb9b21f0 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -626,34 +626,44 @@ with_test_prefix "set line breakpoint via convenience variable" { } # Verify that we can set and trigger a breakpoint in a user-called function. -# -gdb_test "break marker2" \ - "Breakpoint (\[0-9\]*) at .*, line $bp_location8.*" \ - "set breakpoint on to-be-called function" - -gdb_test "print marker2(99)" \ - "The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.[func marker2]. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \ - "hit breakpoint on called function" -# As long as we're stopped (breakpointed) in a called function, -# verify that we can successfully backtrace & such from here. -gdb_test "bt" \ - "#0\[ \t\]*($hex in )?marker2.*:$bp_location8\r\n#1\[ \t\]*.*" \ - "backtrace while in called function" +proc_with_prefix test_break_user_call {} { + clean_restart break -# Return from the called function. For remote targets, it's important to do -# this before runto_main, which otherwise may silently stop on the dummy -# breakpoint inserted by GDB at the program's entry point. -# -gdb_test_multiple "finish" "finish from called function" { - -re "Run till exit from .*marker2.* at .*$bp_location8\r\n.*function called from gdb.*$gdb_prompt $" { - pass "finish from called function" + if { ![runto_main] } { + return } - -re "Run till exit from .*marker2.* at .*$bp_location8\r\n.*Value returned.*$gdb_prompt $" { - pass "finish from called function" + + gdb_test "break marker2" \ + "Breakpoint (\[0-9\]*) at .*, line $::bp_location8.*" \ + "set breakpoint on to-be-called function" + + gdb_test "print marker2(99)" \ + "The program being debugged stopped while in a function called from GDB.\r\nEvaluation of the expression containing the function\r\n.[func marker2]. will be abandoned.\r\nWhen the function is done executing, GDB will silently stop.*" \ + "hit breakpoint on called function" + + # As long as we're stopped (breakpointed) in a called function, + # verify that we can successfully backtrace & such from here. + gdb_test "bt" \ + "#0\[ \t\]*($::hex in )?marker2.*:$::bp_location8\r\n#1\[ \t\]*.*" \ + "backtrace while in called function" + + # Return from the called function. For remote targets, it's important to do + # this before runto_main, which otherwise may silently stop on the dummy + # breakpoint inserted by GDB at the program's entry point. + # + gdb_test_multiple "finish" "finish from called function" { + -re "Run till exit from .*marker2.* at .*$::bp_location8\r\n.*function called from gdb.*$::gdb_prompt $" { + pass "finish from called function" + } + -re "Run till exit from .*marker2.* at .*$::bp_location8\r\n.*Value returned.*$::gdb_prompt $" { + pass "finish from called function" + } } } +test_break_user_call + # Verify that GDB responds gracefully to a "finish" command with # arguments.