From patchwork Wed Jan 25 14:24:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 63676 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 8772A3858410 for ; Wed, 25 Jan 2023 14:25:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8772A3858410 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674656703; bh=SHmDbydAgxtrp63Boz0wBX+FPZbfrmsIyBmyjGmr894=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=KGkdSRH7tuR01OU/0/V7g4L04i71q5okJ4hst0l1E8KNXr56ci7zn6kqlY0/njdP7 yQlUnc7PkkWwWmNU3NB2ShWE5xKXXe5d5kzb825oIe03wwqcjMkm3yfY1qOq5SsAp+ YwEkShJ3morfzYjxuhQx0bktuKAK4s6cCGS+DaEg= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 7B3953858407 for ; Wed, 25 Jan 2023 14:24:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7B3953858407 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id AD4F21F854 for ; Wed, 25 Jan 2023 14:24:40 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 9C81D1358F for ; Wed, 25 Jan 2023 14:24:40 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id Cf0tJag70WMySwAAMHmgww (envelope-from ) for ; Wed, 25 Jan 2023 14:24:40 +0000 To: gdb-patches@sourceware.org Subject: [pushed] [gdb/testsuite] Allow debug srcfile2 in gdb.base/unwind-on-each-insn.exp Date: Wed, 25 Jan 2023 15:24:40 +0100 Message-Id: <20230125142440.29694-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, 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: Tom de Vries via Gdb-patches From: Tom de Vries Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Test-case gdb.base/unwind-on-each-insn.exp compiles $srcfile with debug info, and $srcfile2 without. Occasionally, I try both files with debug info: ... - $srcfile $debug_flags $srcfile2 $nodebug_flags]]} { + $srcfile $debug_flags $srcfile2 $debug_flags]]} { ... This shortcuts the test due to no longer recognizing that stepi still lands in foo. Fix this by determining whether still in foo by checking the info frame output. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/unwind-on-each-insn.exp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) base-commit: 621271c7819c3337e3eb5e48b7a7ee66573543da diff --git a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp index d6f90dde8c1..059967a2b2e 100644 --- a/gdb/testsuite/gdb.base/unwind-on-each-insn.exp +++ b/gdb/testsuite/gdb.base/unwind-on-each-insn.exp @@ -142,9 +142,11 @@ proc do_test { function step_cmd } { break } + gdb_test $step_cmd + set in_fn 0 - gdb_test_multiple $step_cmd "" { - -re -wrap "$::hex in $function \\(\\)" { + gdb_test_multiple "info frame" "" { + -re -wrap "rip = $::hex in ${function}( \\(.*\\))?;.*" { set in_fn 1 } -re -wrap "" {}