From patchwork Sat Dec 17 00:08:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 62073 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 728153948821 for ; Sat, 17 Dec 2022 00:13:27 +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 55F7F3832373 for ; Sat, 17 Dec 2022 00:08:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 55F7F3832373 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 progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 3CFCC100451F2 for ; Sat, 17 Dec 2022 00:08:47 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KkxpHkZkPmV96KkxpNBxE; Sat, 17 Dec 2022 00:08:47 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Z4EpoFdA c=1 sm=1 tr=0 ts=639d088f 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=xd910ScmLSglmP-JhLEA: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=IlTFQn3uvkya4brQxnJQNUBAZBlCq1xGH5Yd7vGArVY=; b=ohqX8uuT5wWh/4gfa83hLvivzJ cdRecNRn47YnAKI2WtHOHirrKsUEzQqdfojcxpXJIt9evINV0sRG2jXFgAY2R3nKwAFVJY/SqzYCg BuwODFgoGb6/R4v3Z48JG35Sx; 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-Uu; Fri, 16 Dec 2022 17:08:47 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 38/46] Use require gdb_debug_enabled Date: Fri, 16 Dec 2022 17:08:10 -0700 Message-Id: <20221217000818.3729389-39-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-Uu 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: 39 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 gdb_debug_enabled". --- gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp | 5 +---- gdb/testsuite/gdb.base/debug-expr.exp | 5 +---- gdb/testsuite/gdb.base/foll-fork.exp | 5 +---- gdb/testsuite/gdb.base/fork-print-inferior-events.exp | 5 +---- gdb/testsuite/gdb.base/gdb-sigterm.exp | 5 +---- gdb/testsuite/gdb.base/gdbinit-history.exp | 5 +---- gdb/testsuite/gdb.base/osabi.exp | 5 +---- gdb/testsuite/gdb.base/page-logging.exp | 5 +---- gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp | 5 +---- gdb/testsuite/gdb.base/style-logging.exp | 5 +---- gdb/testsuite/gdb.base/ui-redirect.exp | 5 +---- gdb/testsuite/gdb.fortran/debug-expr.exp | 5 +---- gdb/testsuite/gdb.gdb/unittest.exp | 5 +---- gdb/testsuite/gdb.mi/new-ui-mi-sync.exp | 5 +---- gdb/testsuite/gdb.mi/user-selected-context-sync.exp | 5 +---- gdb/testsuite/gdb.threads/check-libthread-db.exp | 5 +---- .../signal-while-stepping-over-bp-other-thread.exp | 4 +--- gdb/testsuite/gdb.threads/stepi-random-signal.exp | 5 +---- 18 files changed, 18 insertions(+), 71 deletions(-) diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp index a3b654be99a..2f47b940270 100644 --- a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp +++ b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp @@ -17,10 +17,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp index f0aea197ed2..c47b6619b8a 100644 --- a/gdb/testsuite/gdb.base/debug-expr.exp +++ b/gdb/testsuite/gdb.base/debug-expr.exp @@ -17,10 +17,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile .c diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index 0ab2290c82c..4c30a85eb8f 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -15,10 +15,7 @@ # Test relies on checking follow-fork output. Do not run if gdb debug is # enabled as it will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp index 7fdd6d43809..b33f5333c89 100644 --- a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp +++ b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp @@ -24,10 +24,7 @@ require !use_gdb_stub # Test relies on checking follow-fork output. Do not run if gdb debug is # enabled as it will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile diff --git a/gdb/testsuite/gdb.base/gdb-sigterm.exp b/gdb/testsuite/gdb.base/gdb-sigterm.exp index dd3bb731ab2..b27322ae986 100644 --- a/gdb/testsuite/gdb.base/gdb-sigterm.exp +++ b/gdb/testsuite/gdb.base/gdb-sigterm.exp @@ -17,10 +17,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp index 408f090367c..ac971de3d01 100644 --- a/gdb/testsuite/gdb.base/gdbinit-history.exp +++ b/gdb/testsuite/gdb.base/gdbinit-history.exp @@ -22,10 +22,7 @@ # local machine. # Do not run if gdb debug is enabled - it interferes with the command history. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled if { [is_remote host] } { unsupported "can't set environment variables on remote host" diff --git a/gdb/testsuite/gdb.base/osabi.exp b/gdb/testsuite/gdb.base/osabi.exp index 1ec7e922129..306e34de96e 100644 --- a/gdb/testsuite/gdb.base/osabi.exp +++ b/gdb/testsuite/gdb.base/osabi.exp @@ -17,10 +17,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled # Test that choosing "set osabi none" really requests a gdbarch with no osabi. diff --git a/gdb/testsuite/gdb.base/page-logging.exp b/gdb/testsuite/gdb.base/page-logging.exp index ffc180aad4d..17f067415ac 100644 --- a/gdb/testsuite/gdb.base/page-logging.exp +++ b/gdb/testsuite/gdb.base/page-logging.exp @@ -14,10 +14,7 @@ # along with this program. If not, see . # Do not run if gdb debug is enabled as it will interfere with log redirect. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled gdb_start diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp index a25c54b69ab..f3b904b905f 100644 --- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp +++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp @@ -33,10 +33,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile diff --git a/gdb/testsuite/gdb.base/style-logging.exp b/gdb/testsuite/gdb.base/style-logging.exp index 2564473bd81..6b218f98942 100644 --- a/gdb/testsuite/gdb.base/style-logging.exp +++ b/gdb/testsuite/gdb.base/style-logging.exp @@ -16,10 +16,7 @@ # Test that logging does not style. # Do not run if gdb debug is enabled as it will interfere with log redirect. -if {[gdb_debug_enabled]} { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled if {[is_remote host]} { untested "does not work on remote host" diff --git a/gdb/testsuite/gdb.base/ui-redirect.exp b/gdb/testsuite/gdb.base/ui-redirect.exp index 4ed82ae63bf..6e93165979a 100644 --- a/gdb/testsuite/gdb.base/ui-redirect.exp +++ b/gdb/testsuite/gdb.base/ui-redirect.exp @@ -14,10 +14,7 @@ # along with this program. If not, see . # Do not run if gdb debug is enabled as it will interfere with log redirect. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled if { [prepare_for_testing "failed to prepare" ui-redirect start.c] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/debug-expr.exp b/gdb/testsuite/gdb.fortran/debug-expr.exp index acc0aadc11e..400c5ae4dbd 100644 --- a/gdb/testsuite/gdb.fortran/debug-expr.exp +++ b/gdb/testsuite/gdb.fortran/debug-expr.exp @@ -19,10 +19,7 @@ require !skip_fortran_tests # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp index fdae7a24632..ec4cd170abb 100644 --- a/gdb/testsuite/gdb.gdb/unittest.exp +++ b/gdb/testsuite/gdb.gdb/unittest.exp @@ -15,10 +15,7 @@ # Do not run if gdb debug is enabled as maintenance output will be # redirected to the log files. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled load_lib completion-support.exp diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp index ebb9c983a0f..d11d81c36e4 100644 --- a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp +++ b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp @@ -21,10 +21,7 @@ # stops again. See PR gdb/20418. # Do not run if gdb debug is enabled as it doesn't work for separate-mi-tty. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index 1ff35229741..dc89a4e1bcc 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -30,10 +30,7 @@ # are using all-stop, or running, if we are using non-stop. # Do not run if gdb debug is enabled as it doesn't work for separate-mi-tty. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsuite/gdb.threads/check-libthread-db.exp index 231c1d2596d..b2a6d975f83 100644 --- a/gdb/testsuite/gdb.threads/check-libthread-db.exp +++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp @@ -20,10 +20,7 @@ if {[target_info gdb_protocol] != "" || ![istarget *-linux*]} { # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile diff --git a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp index 2a9746a502e..cde98933fde 100644 --- a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp +++ b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.exp @@ -20,9 +20,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - return -} +require !gdb_debug_enabled standard_testfile set executable ${testfile} diff --git a/gdb/testsuite/gdb.threads/stepi-random-signal.exp b/gdb/testsuite/gdb.threads/stepi-random-signal.exp index cc0564db04e..f71bc10396a 100644 --- a/gdb/testsuite/gdb.threads/stepi-random-signal.exp +++ b/gdb/testsuite/gdb.threads/stepi-random-signal.exp @@ -15,10 +15,7 @@ # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled standard_testfile set executable ${testfile}