From patchwork Thu Jan 12 03:00:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63028 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 7372A3953814 for ; Thu, 12 Jan 2023 03:04:55 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from outbound-ss-761.bluehost.com (outbound-ss-761.bluehost.com [74.220.211.250]) by sourceware.org (Postfix) with ESMTPS id A2EF638493CD for ; Thu, 12 Jan 2023 03:01:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A2EF638493CD 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 progateway8.mail.pro1.eigbox.com (Postfix) with ESMTP id 2723E10043B21 for ; Thu, 12 Jan 2023 03:01:28 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id FnqKpabSaxrINFnqKpERuH; Thu, 12 Jan 2023 03:01:28 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=MrOXV0We c=1 sm=1 tr=0 ts=63bf7808 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=I1M-VKdZ-mElF9oLtlAA:9 a=gDReK6rTb-M7_I2FheKW:22 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=MLVgfx2g4X9Xo6s92PWtAlpzYAZvW9s41qBk2l7SCB4=; b=Wf16l1nyRGQ52HG5OxmLxAgvjN 5vaXV5VVVwWZC6dufjvuzO5ekopwaWsN04X9GP73CsrAOeHqJOFUbip877+TBSkGpNU4IhL/qvHog NH2p0dFXgNYNt7FNUEtPA3Ypq; 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 1pFnqJ-000liJ-Sq; Wed, 11 Jan 2023 20:01:27 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 39/79] Use require gdb_skip_xml_test Date: Wed, 11 Jan 2023 20:00:12 -0700 Message-Id: <20230112030052.3306113-40-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: 1pFnqJ-000liJ-Sq 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: 40 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 gdb_skip_xml_test". --- gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp | 5 +---- gdb/testsuite/gdb.base/info-os.exp | 5 +---- gdb/testsuite/gdb.mi/list-thread-groups-available.exp | 5 +---- gdb/testsuite/gdb.mi/mi-info-os.exp | 5 +---- gdb/testsuite/gdb.xml/maint-xml-dump.exp | 5 +---- gdb/testsuite/gdb.xml/maint_print_struct.exp | 5 +---- gdb/testsuite/gdb.xml/tdesc-arch.exp | 5 +---- gdb/testsuite/gdb.xml/tdesc-errors.exp | 5 +---- gdb/testsuite/gdb.xml/tdesc-regs.exp | 5 +---- gdb/testsuite/gdb.xml/tdesc-reload.exp | 5 +---- gdb/testsuite/gdb.xml/tdesc-xinclude.exp | 5 +---- 11 files changed, 11 insertions(+), 44 deletions(-) diff --git a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp index 42c94d97c46..6819c302187 100644 --- a/gdb/testsuite/gdb.arch/arc-tdesc-cpu.exp +++ b/gdb/testsuite/gdb.arch/arc-tdesc-cpu.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 {[gdb_skip_xml_test]} { - unsupported "arc-tdesc-cpu.exp" - return -1 -} +require !gdb_skip_xml_test gdb_start diff --git a/gdb/testsuite/gdb.base/info-os.exp b/gdb/testsuite/gdb.base/info-os.exp index 81db8a15608..58f7126678e 100644 --- a/gdb/testsuite/gdb.base/info-os.exp +++ b/gdb/testsuite/gdb.base/info-os.exp @@ -22,10 +22,7 @@ if {![istarget *-*-linux*]} { } # Support for XML-output is needed to run this test. -if {[gdb_skip_xml_test]} { - unsupported "info-os.exp" - return -1 -} +require !gdb_skip_xml_test # Compile test program. if { [prepare_for_testing "failed to prepare" $testfile $srcfile {debug pthreads}] } { diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp index 646d74ed0a6..1a77b96f2f8 100644 --- a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp +++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp @@ -21,10 +21,7 @@ set MIFLAGS "-i=mi" standard_testfile # Support for XML is needed to run this test. -if {[gdb_skip_xml_test]} { - unsupported "list-thread-groups-available.exp" - return -1 -} +require !gdb_skip_xml_test if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.mi/mi-info-os.exp b/gdb/testsuite/gdb.mi/mi-info-os.exp index dc70c4cd1f6..7e7db550af7 100644 --- a/gdb/testsuite/gdb.mi/mi-info-os.exp +++ b/gdb/testsuite/gdb.mi/mi-info-os.exp @@ -23,10 +23,7 @@ if {![istarget *-*-linux*]} { } # Support for XML-output is needed to run this test. -if {[gdb_skip_xml_test]} { - unsupported "mi-info-os.exp" - return -1 -} +require !gdb_skip_xml_test gdb_exit if [mi_gdb_start] { diff --git a/gdb/testsuite/gdb.xml/maint-xml-dump.exp b/gdb/testsuite/gdb.xml/maint-xml-dump.exp index 69b21646832..0bf785537b1 100644 --- a/gdb/testsuite/gdb.xml/maint-xml-dump.exp +++ b/gdb/testsuite/gdb.xml/maint-xml-dump.exp @@ -37,10 +37,7 @@ # # 4. Indentation of lines will be preserved so your input file needs # to follow the expected indentation. -if {[gdb_skip_xml_test]} { - unsupported "xml tests not being run" - return -1 -} +require !gdb_skip_xml_test gdb_start diff --git a/gdb/testsuite/gdb.xml/maint_print_struct.exp b/gdb/testsuite/gdb.xml/maint_print_struct.exp index 3260fbc2c1a..f4d32d6623e 100644 --- a/gdb/testsuite/gdb.xml/maint_print_struct.exp +++ b/gdb/testsuite/gdb.xml/maint_print_struct.exp @@ -17,10 +17,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[gdb_skip_xml_test]} { - unsupported "maint_print_struct.exp" - return -1 -} +require !gdb_skip_xml_test gdb_start diff --git a/gdb/testsuite/gdb.xml/tdesc-arch.exp b/gdb/testsuite/gdb.xml/tdesc-arch.exp index 023f9c44ec5..9825320b024 100644 --- a/gdb/testsuite/gdb.xml/tdesc-arch.exp +++ b/gdb/testsuite/gdb.xml/tdesc-arch.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 {[gdb_skip_xml_test]} { - unsupported "tdesc-arch.exp" - return -1 -} +require !gdb_skip_xml_test gdb_start diff --git a/gdb/testsuite/gdb.xml/tdesc-errors.exp b/gdb/testsuite/gdb.xml/tdesc-errors.exp index 5454d26b851..b3243064e9c 100644 --- a/gdb/testsuite/gdb.xml/tdesc-errors.exp +++ b/gdb/testsuite/gdb.xml/tdesc-errors.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 {[gdb_skip_xml_test]} { - unsupported "tdesc-errors.exp" - return -1 -} +require !gdb_skip_xml_test gdb_start diff --git a/gdb/testsuite/gdb.xml/tdesc-regs.exp b/gdb/testsuite/gdb.xml/tdesc-regs.exp index 902671ebeba..13fafa1477e 100644 --- a/gdb/testsuite/gdb.xml/tdesc-regs.exp +++ b/gdb/testsuite/gdb.xml/tdesc-regs.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 {[gdb_skip_xml_test]} { - unsupported "tdesc-regs.exp" - return -1 -} +require !gdb_skip_xml_test gdb_start diff --git a/gdb/testsuite/gdb.xml/tdesc-reload.exp b/gdb/testsuite/gdb.xml/tdesc-reload.exp index b8cf39030d2..997b1f4e0ad 100644 --- a/gdb/testsuite/gdb.xml/tdesc-reload.exp +++ b/gdb/testsuite/gdb.xml/tdesc-reload.exp @@ -16,10 +16,7 @@ # Testing for 'maint print xml-tdesc'. Check we can print out the # current target description and load it back in again. -if {[gdb_skip_xml_test]} { - unsupported "xml tests not being run" - return -1 -} +require !gdb_skip_xml_test standard_testfile diff --git a/gdb/testsuite/gdb.xml/tdesc-xinclude.exp b/gdb/testsuite/gdb.xml/tdesc-xinclude.exp index 361039f1389..3a757126799 100644 --- a/gdb/testsuite/gdb.xml/tdesc-xinclude.exp +++ b/gdb/testsuite/gdb.xml/tdesc-xinclude.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 {[gdb_skip_xml_test]} { - unsupported "tdesc-errors.exp" - return -1 -} +require !gdb_skip_xml_test gdb_start