From patchwork Sat Dec 17 00:07:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62060 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 49E40382CB85 for ; Sat, 17 Dec 2022 00:12:18 +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 7304A3834368 for ; Sat, 17 Dec 2022 00:08:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7304A3834368 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 cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 1C2341004559C for ; Sat, 17 Dec 2022 00:08:41 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KkrpubgC1CVE6KkrpUM29; Sat, 17 Dec 2022 00:08:41 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=QfCjAuXv c=1 sm=1 tr=0 ts=639d0889 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=swZ28CMxc7Jwfk3a6mUA: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=EwtEJcoqP1HN5mihIa46sWAa5UcDkPIWP9XpwjFAE0o=; b=RqfPqdJojoGeY/TeiKm2gIx3A0 /knrq0eGa8wY08AsGnlYGXwHkIPKajA1yqs2Go+rnzaeOQiFE3k/B+M8PsCtwLQt/OiF+TL46ntH3 sxk1R25fH1klOFibhXMtQW9/K; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:58422 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 1p6Kkq-002gox-Tw; Fri, 16 Dec 2022 17:08:40 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 24/46] Use require support_displaced_stepping Date: Fri, 16 Dec 2022 17:07:56 -0700 Message-Id: <20221217000818.3729389-25-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: 1p6Kkq-002gox-Tw X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:58422 X-Source-Auth: tom+tromey.com X-Email-Count: 25 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 support_displaced_stepping". --- gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp | 5 +---- gdb/testsuite/gdb.base/async-shell.exp | 5 +---- gdb/testsuite/gdb.base/inferior-died.exp | 5 +---- gdb/testsuite/gdb.base/moribund-step.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nonstop-exit.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nonstop.exp | 5 +---- gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nsintrall.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nsmoribund.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nsthrexec.exp | 5 +---- gdb/testsuite/gdb.mi/mi-watch-nonstop.exp | 7 +------ gdb/testsuite/gdb.python/py-evthreads.exp | 5 +---- 12 files changed, 12 insertions(+), 50 deletions(-) diff --git a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp index a7676bdadc0..5e8e57a51e1 100644 --- a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp +++ b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp @@ -16,10 +16,7 @@ standard_testfile insn-reloc.c set executable $testfile set expfile $testfile.exp -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] diff --git a/gdb/testsuite/gdb.base/async-shell.exp b/gdb/testsuite/gdb.base/async-shell.exp index 2c09863ad59..b66f70909ae 100644 --- a/gdb/testsuite/gdb.base/async-shell.exp +++ b/gdb/testsuite/gdb.base/async-shell.exp @@ -15,10 +15,7 @@ standard_testfile -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping # The testfile uses "run". The real bug happened only for ![is_remote target]. if [use_gdb_stub] { diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp index fc0a722d4b4..f301546a0da 100644 --- a/gdb/testsuite/gdb.base/inferior-died.exp +++ b/gdb/testsuite/gdb.base/inferior-died.exp @@ -21,10 +21,7 @@ if {![istarget "*-*-linux*"]} { return } -if { ![support_displaced_stepping] } { - unsupported "inferior-died.exp" - return -1 -} +require support_displaced_stepping standard_testfile .c diff --git a/gdb/testsuite/gdb.base/moribund-step.exp b/gdb/testsuite/gdb.base/moribund-step.exp index caaa8ed5672..ad3185e00f0 100644 --- a/gdb/testsuite/gdb.base/moribund-step.exp +++ b/gdb/testsuite/gdb.base/moribund-step.exp @@ -15,10 +15,7 @@ standard_testfile start.c -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping save_vars { GDBFLAGS } { set GDBFLAGS "$GDBFLAGS -ex \"set non-stop on\"" diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp index 9e650b82534..07ce0b378c6 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp index 12cfab2619f..75d26a0dcf4 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp @@ -14,10 +14,7 @@ # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp index 847e28b1985..dc68b150009 100644 --- a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp +++ b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp @@ -16,10 +16,7 @@ # Regression test for PR11557. Make sure we don't end up with a stale # register cache just after resuming a thread. -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp index b8184f9bba7..98d3a6660b3 100644 --- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp +++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp index db6e6ec3633..1947de86211 100644 --- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp +++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp index fa106fa9efa..837a9d4879d 100644 --- a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp +++ b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp @@ -18,10 +18,7 @@ # the main thread doesn't just silently stop at the first internal # breakpoint (usually the _dl_debug_state breakpoint). -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp index e3b9b23c109..fa5a56c34b2 100644 --- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp @@ -13,12 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -require !skip_hw_watchpoint_tests - -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require !skip_hw_watchpoint_tests support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.python/py-evthreads.exp b/gdb/testsuite/gdb.python/py-evthreads.exp index 76896ddf14a..44d9a559f18 100644 --- a/gdb/testsuite/gdb.python/py-evthreads.exp +++ b/gdb/testsuite/gdb.python/py-evthreads.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib gdb-python.exp