From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id dx3uONMgZGFjKAAAWB0awg (envelope-from ) for ; Mon, 11 Oct 2021 07:32:35 -0400 Received: by simark.ca (Postfix, from userid 112) id DE4431F0B9; Mon, 11 Oct 2021 07:32:35 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 ESMTPS id 1561D1ECEB for ; Mon, 11 Oct 2021 07:32:35 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4A500385800E for ; Mon, 11 Oct 2021 11:32:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A500385800E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1633951954; bh=iNqLGX5UDIOP5JtEcI+kQJ6OoTnYO1We83g6yLAY2c8=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=l9D0fMY5DBQ2hsHCCZGBMpgKVlYLEceL2IoGK+DD8UvMjxdOXRCfFDkFJVOsaB/xE cRupskRPvSj5Bwb0caPSufbhliJqOOkVTcsOcMsk331fEW9J6P3fWkLh/SMmTUAjzf 5yMGhSdjml2a8ZSkSIGjrZcQKCUIhpt3y7tbmk0I= Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id BF6BF3858402 for ; Mon, 11 Oct 2021 11:32:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BF6BF3858402 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 04E961FE95 for ; Mon, 11 Oct 2021 11:32:15 +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 E747E13C5D for ; Mon, 11 Oct 2021 11:32:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id eNtmN74gZGFqWgAAMHmgww (envelope-from ) for ; Mon, 11 Oct 2021 11:32:14 +0000 Date: Mon, 11 Oct 2021 13:32:13 +0200 To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix double debug info in gdb.dwarf2/dw2-ref-missing-frame.exp Message-ID: <20211011113211.GA16882@delia.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) 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: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, A mistake slipped in in commit a5ea23036d8 "[gdb/testsuite] Use function_range in gdb.dwarf2/dw2-ref-missing-frame.exp". Before the commit the main file was compiled with debug info, and the two others not: ... if {[prepare_for_testing_full "failed to prepare" \ [list $testfile {} $srcfile {} $srcfuncfile {} \ $srcmainfile debug]]} { ... After the commit, all were compiled with debug info, and consequently, there are two versions of debug info for $srcfuncfile. This shows up as a FAIL when running the test-case with target boards readnow and cc-with-debug-names. Fix this by using prepare_for_testing_full, as before. Tested on x86_64-linux. Fixes: a5ea23036d8 ("[gdb/testsuite] Use function_range in gdb.dwarf2/dw2-ref-missing-frame.exp") Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix double debug info in gdb.dwarf2/dw2-ref-missing-frame.exp --- gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp index e8d7c0ff280..d4734f27bff 100644 --- a/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp +++ b/gdb/testsuite/gdb.dwarf2/dw2-ref-missing-frame.exp @@ -29,15 +29,17 @@ lassign [function_range func_loopfb \ set flags \ [list \ - "debug" \ "additional_flags=\"-DFUNC_NOFB_START=$func_nofb_start\"" \ "additional_flags=\"-DFUNC_NOFB_END=$func_nofb_start + $func_nofb_len\"" \ "additional_flags=\"-DFUNC_LOOPFB_START=$func_loopfb_start\"" \ "additional_flags=\"-DFUNC_LOOPFB_END=$func_loopfb_start + $func_loopfb_len\""] set executable ${testfile} -if {[prepare_for_testing "failed to prepare" $testfile \ - [list $srcfile3 $srcfile $srcfile2] $flags] == -1} { +if { [prepare_for_testing_full "failed to prepare" \ + [list $testfile {} \ + $srcfile [concat $flags {nodebug}] \ + $srcfile2 {nodebug} \ + $srcfile3 {debug}]] == -1 } { return -1 }