From patchwork Sat Dec 17 00:07:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62045 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 91F213873CEB for ; Sat, 17 Dec 2022 00:10:12 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id 6FB863834C16 for ; Sat, 17 Dec 2022 00:08:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6FB863834C16 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 cmgw15.mail.unifiedlayer.com (unknown [10.0.90.130]) by progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id CEA8C10044128 for ; Sat, 17 Dec 2022 00:08:30 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KkgpHkODPmV96KkgpNBln; Sat, 17 Dec 2022 00:08:30 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Z4EpoFdA c=1 sm=1 tr=0 ts=639d087e a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=sHyYjHe8cH0A:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=GZSc6SvNzZYai7HdNfkA: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=ahGyBRF8Ei9bSAvpBiiumK36ylDFvPShlD+BsnjIUeQ=; b=yqWCJHN1mMOQ+W/rBVaWL5bDOG oPZ6/EMkR+dQ188vElLEkl8KyROTmBlUM4oIdOR4+vvLvkHznuz3LuipA6CPZZ7UKpP9vYIujuv4y 7kj5I05OyHOzrMyxw/KB9AmYv; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:60688 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 1p6Kkg-002gaf-Ky; Fri, 16 Dec 2022 17:08:30 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 01/46] Don't use ensure_gdb_index with require Date: Fri, 16 Dec 2022 17:07:33 -0700 Message-Id: <20221217000818.3729389-2-tom@tromey.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217000818.3729389-1-tom@tromey.com> References: <20221217000818.3729389-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: 97.122.76.186 X-Source-L: No X-Exim-ID: 1p6Kkg-002gaf-Ky X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:60688 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.3 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 series changes 'require' to take a list of simple predicates. This patch backs out the one use of 'require' that doesn't conform to this -- calling ensure_gdb_index. --- gdb/testsuite/gdb.base/with-mf.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/gdb-add-index.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp | 5 ++++- gdb/testsuite/gdb.rust/dwindex.exp | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.base/with-mf.exp b/gdb/testsuite/gdb.base/with-mf.exp index 589b0ee2a20..023e5338b37 100644 --- a/gdb/testsuite/gdb.base/with-mf.exp +++ b/gdb/testsuite/gdb.base/with-mf.exp @@ -24,7 +24,10 @@ if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \ return -1 } -require {ensure_gdb_index $binfile} != -1 +if { [ensure_gdb_index $binfile] == -1 } { + untested "error adding gdb index" + return -1 +} 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 a578b9d5a40..9050482ad3e 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp @@ -29,7 +29,10 @@ with_test_prefix non-symlink { return -1 } - require {ensure_gdb_index $binfile} != -1 + if { [ensure_gdb_index $binfile] == -1 } { + untested "error adding gdb index" + return -1 + } } # Regenerate exec without index. diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp index e3c55ccc94d..013eca7c50b 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp @@ -27,7 +27,10 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" \ return -1 } -require {ensure_gdb_index $binfile} != -1 +if { [ensure_gdb_index $binfile] == -1 } { + untested "error adding gdb index" + return -1 +} # 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-index-types-dwarf5.exp b/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp index 27cadc523cd..e546da7b95c 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp @@ -24,7 +24,10 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ return -1 } -require {ensure_gdb_index $binfile} == 1 +if { [ensure_gdb_index $binfile] != 1 } { + untested "error adding gdb index" + return -1 +} clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp index 65c32c77370..02450aac074 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp @@ -74,7 +74,10 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ return -1 } -require {ensure_gdb_index $binfile} != -1 +if { [ensure_gdb_index $binfile] == -1 } { + untested "error adding gdb index" + return -1 +} clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index 5f8ea1a298c..09001cbba0f 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -26,7 +26,10 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } -require {ensure_gdb_index $binfile -dwarf-5} != -1 +if {[ensure_gdb_index $binfile -dwarf-5] == -1} { + untested "error adding gdb index" + return -1 +} gdb_exit gdb_start