From patchwork Thu Jan 12 03:00:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63022 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 A09BE382FAE6 for ; Thu, 12 Jan 2023 03:04:19 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id BF709383D81A for ; Thu, 12 Jan 2023 03:01:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BF709383D81A 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 progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id 43BEA10048A67 for ; Thu, 12 Jan 2023 03:01:27 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id FnqJpqV3GB18UFnqJpA3pr; Thu, 12 Jan 2023 03:01:27 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Ns4Uz+RJ c=1 sm=1 tr=0 ts=63bf7807 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA: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=WhNSfaVBUy/MeTiE4mWGpxVDJ3DqiWXIEQwsIDOJ4RU=; b=rNJl2Jw2gE4ubrql7LGMhKRZvQ ZR7HhqYWPRssjYi1vlVb0Cikp67Me8Un5OrPuKtr0ZrBufD2hCgbmOO5Jiwrrc7wdrN8IzY9MlhEi CZZ/8VotrlJn5H7Q5LhgzrxcC; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:36770 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 1pFnqI-000liJ-VC; Wed, 11 Jan 2023 20:01:27 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 36/79] Use require skip_shlib_tests Date: Wed, 11 Jan 2023 20:00:09 -0700 Message-Id: <20230112030052.3306113-37-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230112030052.3306113-1-tom@tromey.com> References: <20230112030052.3306113-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: 1pFnqI-000liJ-VC X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:36770 X-Source-Auth: tom+tromey.com X-Email-Count: 37 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.0 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 4e0d549351c..9adf107ad92 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 2cee092b184..21452d8569e 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 5bae3e22656..07520049244 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 9c5b777b4a2..1e40aecc92b 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 22a1e8746e7..f5850c7a0b1 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 8d2dacfb947..c77fcc4f5ca 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 }