From patchwork Sat Apr 15 15:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 67783 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 05BFB3856DE2 for ; Sat, 15 Apr 2023 15:14:09 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-820.bluehost.com (outbound-ss-820.bluehost.com [69.89.24.241]) by sourceware.org (Postfix) with ESMTPS id 047903858439 for ; Sat, 15 Apr 2023 15:13:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 047903858439 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway2.mail.pro1.eigbox.com (Postfix) with ESMTP id 4105E10047FA3 for ; Sat, 15 Apr 2023 15:13:44 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id nhayp3Ggib9i8nhaypAQgC; Sat, 15 Apr 2023 15:13:44 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Wd7J12tX c=1 sm=1 tr=0 ts=643abf28 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=dKHAf1wccvYA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=iwCwxDv_wYLa6ffIqj8A:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=GD82DljCI9OHgnmc897vIPdr4H0PVf0P6u6Ba94lOo4=; b=FBkEKkFdeV7F3Ws+HAsibWEpFd /BffAx49EGdLdISq7FhIAzK7O5osc9Rmgcthlk44FcMcTiVzCAlDx/xVs0wUf1bIEGB/UZq46o9H5 gY0kdpQMv8nYAvfGnLFztz9DM; Received: from 71-211-191-82.hlrn.qwest.net ([71.211.191.82]:43720 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pnhax-0021Ms-UO; Sat, 15 Apr 2023 09:13:43 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 3/5] Use "critical ensure_gdb_index" in gdb.rust Date: Sat, 15 Apr 2023 09:13:34 -0600 Message-Id: <20230415151336.4104455-4-tom@tromey.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230415151336.4104455-1-tom@tromey.com> References: <20230415151336.4104455-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.191.82 X-Source-L: No X-Exim-ID: 1pnhax-0021Ms-UO X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-191-82.hlrn.qwest.net (localhost.localdomain) [71.211.191.82]:43720 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3025.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This converts gdb.rust to use "critical ensure_gdb_index" rather than "if". --- gdb/testsuite/gdb.base/with-mf.exp | 5 +---- gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp | 10 ++-------- gdb/testsuite/gdb.dwarf2/gdb-add-index.exp | 5 +---- gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp | 5 +---- gdb/testsuite/gdb.rust/dwindex.exp | 5 +---- 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/gdb/testsuite/gdb.base/with-mf.exp b/gdb/testsuite/gdb.base/with-mf.exp index f26d48e1026..5ae4234056f 100644 --- a/gdb/testsuite/gdb.base/with-mf.exp +++ b/gdb/testsuite/gdb.base/with-mf.exp @@ -24,10 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile clean_restart $binfile diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp index d6f96ab9f5b..0654249e302 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp @@ -30,10 +30,7 @@ with_test_prefix non-symlink { return -1 } - if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 - } + critical ensure_gdb_index $binfile } # Regenerate exec without index. @@ -48,10 +45,7 @@ if { ![file exists $symlink] } { file link -symbolic $symlink $binfile } -if { [ensure_gdb_index $symlink] == -1 } { - fail "Unable to call gdb-add-index with a symlink to a symfile" - return -1 -} +critical ensure_gdb_index $symlink # Ok, we have a copy of $binfile with an index. # Restart gdb and verify the index was used. diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp index 4ecf4408c38..849680314da 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp @@ -25,10 +25,7 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile # Ok, we have a copy of $binfile with an index. # Restart gdb and verify the index was used. diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp index dea3f3fe461..1227a66f643 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp @@ -72,10 +72,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index 1a82c2e92fe..0b7e3911ab1 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -25,10 +25,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } -if {[ensure_gdb_index $binfile -dwarf-5] == -1} { - untested "error adding gdb index" - return -1 -} +critical ensure_gdb_index $binfile -dwarf-5 gdb_exit gdb_start