From patchwork Sat Dec 17 00:08:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62081 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 E33303890840 for ; Sat, 17 Dec 2022 00:14:23 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id 8F4E63835E32 for ; Sat, 17 Dec 2022 00:08:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F4E63835E32 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 cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id C7BEF100451F0 for ; Sat, 17 Dec 2022 00:08:46 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6Kkwp7KQdfWVl6KkwpAVbT; Sat, 17 Dec 2022 00:08:46 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=XoA/hXJ9 c=1 sm=1 tr=0 ts=639d088e 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=mDV3o1hIAAAA:8 a=20KFwNOVAAAA:8 a=AmZiTvI1nYe-gC2r3j0A:9 a=_FVE-zBwftR9WsbkzFJk:22 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=eqHnZ/5s/nF0+7SHP7WP6bIPYC1m24i5W0xUK3cBbJM=; b=NrbI/gVjs2BQ3v6GrJqz41VGEy dUmMFO7m8kOZSNra62whKfjK/FR2kW8Eij1e5NpqS/PxSDhEUvxxC1pgKyRulayDZptW4pfVES2qi RvkyghqB9/xgc1pATzZv8H25l; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:58438 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 1p6Kkw-002gw1-Ka; Fri, 16 Dec 2022 17:08:46 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 36/46] Use require skip_shlib_tests Date: Fri, 16 Dec 2022 17:08:08 -0700 Message-Id: <20221217000818.3729389-37-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: 1p6Kkw-002gw1-Ka X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:58438 X-Source-Auth: tom+tromey.com X-Email-Count: 37 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, KAM_SHORT, 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 changes some tests to use "require skip_shlib_tests". This patch cleans up a few spots that were missed in the earlier patch. --- gdb/testsuite/gdb.base/attach-pie-misread.exp | 4 ++-- gdb/testsuite/gdb.base/break-interp.exp | 4 ++-- gdb/testsuite/gdb.base/info-fun.exp | 3 ++- gdb/testsuite/gdb.base/prelink.exp | 4 ++-- gdb/testsuite/gdb.base/skip-solib.exp | 4 ++-- gdb/testsuite/gdb.base/solib-search.exp | 3 ++- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp index d1614b38242..d1b2d781dae 100644 --- a/gdb/testsuite/gdb.base/attach-pie-misread.exp +++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp @@ -14,8 +14,8 @@ # along with this program. If not, see . # This test only works on GNU/Linux. -require !use_gdb_stub isnative -if { [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +require !use_gdb_stub isnative !skip_shlib_tests +if { [is_remote host] || ![istarget *-linux*] } { return } diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index f0923239195..39e49f9be7e 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -14,8 +14,8 @@ # along with this program. If not, see . # This test only works on GNU/Linux. -require !use_gdb_stub isnative -if { [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +require !use_gdb_stub isnative !skip_shlib_tests +if { [is_remote host] || ![istarget *-linux*] } { return } diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp index f2ebd6f19b7..32e1ea52943 100644 --- a/gdb/testsuite/gdb.base/info-fun.exp +++ b/gdb/testsuite/gdb.base/info-fun.exp @@ -12,7 +12,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { [skip_shlib_tests] || [is_remote target] } { +require !skip_shlib_tests +if { [is_remote target] } { return 0 } diff --git a/gdb/testsuite/gdb.base/prelink.exp b/gdb/testsuite/gdb.base/prelink.exp index 755f687607b..2b2b10c1c0d 100644 --- a/gdb/testsuite/gdb.base/prelink.exp +++ b/gdb/testsuite/gdb.base/prelink.exp @@ -19,8 +19,8 @@ # This file was written by Alexandre Oliva -require isnative -if { [is_remote host] || [skip_shlib_tests]} { +require isnative !skip_shlib_tests +if { [is_remote host] } { return } diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp index e1245e7b4b8..a056018ce04 100644 --- a/gdb/testsuite/gdb.base/skip-solib.exp +++ b/gdb/testsuite/gdb.base/skip-solib.exp @@ -20,8 +20,8 @@ # # This only works on GNU/Linux. -require isnative -if { [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { +require isnative !skip_shlib_tests +if { [is_remote host] || ![istarget *-linux*] } { return } diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp index ab4f2c45072..abfcfbfc803 100644 --- a/gdb/testsuite/gdb.base/solib-search.exp +++ b/gdb/testsuite/gdb.base/solib-search.exp @@ -16,7 +16,8 @@ # Test solib-search-path, and in the case of solib-svr4.c whether l_addr_p # is properly reset when the path is changed. -if {[is_remote target] || [skip_shlib_tests]} { +require !skip_shlib_tests +if {[is_remote target]} { untested "skipping remote target and shared library tests" return -1 }