From patchwork Thu Jan 12 02:59:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63004 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 A3422385483F for ; Thu, 12 Jan 2023 03:02:06 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from alt-proxy28.mail.unifiedlayer.com (alt-proxy28.mail.unifiedlayer.com [74.220.216.123]) by sourceware.org (Postfix) with ESMTPS id AC51D3857803 for ; Thu, 12 Jan 2023 03:01:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AC51D3857803 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 cmgw11.mail.unifiedlayer.com (unknown [10.0.90.126]) by progateway1.mail.pro1.eigbox.com (Postfix) with ESMTP id 302391003F8F1 for ; Thu, 12 Jan 2023 03:01:13 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id Fnq5p34hbFxgHFnq5pCGZ3; Thu, 12 Jan 2023 03:01:13 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=ePfWMFl1 c=1 sm=1 tr=0 ts=63bf77f9 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=MV6LiApk2wsxiSlJvREA:9 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=oTGJYfO3Pn93sWfV8boFs3Wu18Wq7TaHJhsLvnzrGdg=; b=wUYfPiaAu39LSlUaFO4W9/R55Q vyX22QvWWHEiQRvP4EfDvN8egrTextGPEmuuxl40R+4f4aAGIOnWe+Ny0+Fk19uvc3OrsVk4thsEn 7NJDo45iDgmF2nMUmOIl6TAas; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:54890 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 1pFnq4-000lPe-TZ; Wed, 11 Jan 2023 20:01:13 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 12/79] Use require skip_rust_tests Date: Wed, 11 Jan 2023 19:59:45 -0700 Message-Id: <20230112030052.3306113-13-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: 1pFnq4-000lPe-TZ X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:54890 X-Source-Auth: tom+tromey.com X-Email-Count: 13 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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_rust_tests". --- gdb/testsuite/gdb.rust/dwindex.exp | 4 +--- gdb/testsuite/gdb.rust/expr.exp | 2 +- gdb/testsuite/gdb.rust/fnfield.exp | 4 +--- gdb/testsuite/gdb.rust/generics.exp | 4 +--- gdb/testsuite/gdb.rust/methods.exp | 4 +--- gdb/testsuite/gdb.rust/modules.exp | 4 +--- gdb/testsuite/gdb.rust/pp.exp | 4 +--- gdb/testsuite/gdb.rust/rawids.exp | 4 +--- gdb/testsuite/gdb.rust/rust-style.exp | 4 +--- gdb/testsuite/gdb.rust/simple.exp | 4 +--- gdb/testsuite/gdb.rust/traits.exp | 4 +--- gdb/testsuite/gdb.rust/unicode.exp | 4 +--- gdb/testsuite/gdb.rust/union.exp | 4 +--- gdb/testsuite/gdb.rust/unsized.exp | 4 +--- gdb/testsuite/gdb.rust/watch.exp | 4 +--- 15 files changed, 15 insertions(+), 43 deletions(-) diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index 4f05cb9eca8..a617457571f 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -16,9 +16,7 @@ # Test that a rustc-produced .debug_aranges can be read. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp index d67199eae68..8fd6b23023f 100644 --- a/gdb/testsuite/gdb.rust/expr.exp +++ b/gdb/testsuite/gdb.rust/expr.exp @@ -17,7 +17,7 @@ # Rust compiler. This serves as a smoke test. load_lib "rust-support.exp" -if {[skip_rust_tests]} { return } +require !skip_rust_tests gdb_start diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp index 21f0facd4c3..2f6ddd74828 100644 --- a/gdb/testsuite/gdb.rust/fnfield.exp +++ b/gdb/testsuite/gdb.rust/fnfield.exp @@ -16,9 +16,7 @@ # Test trait object printing. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp index fa0f7b9f813..5c0c105abe5 100644 --- a/gdb/testsuite/gdb.rust/generics.exp +++ b/gdb/testsuite/gdb.rust/generics.exp @@ -16,9 +16,7 @@ # Test expressions involving generics. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp index e57ef2fe21b..dfbebd6bc38 100644 --- a/gdb/testsuite/gdb.rust/methods.exp +++ b/gdb/testsuite/gdb.rust/methods.exp @@ -16,9 +16,7 @@ # Test method calls. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp index 983fbd1f0a3..9ab758b5d30 100644 --- a/gdb/testsuite/gdb.rust/modules.exp +++ b/gdb/testsuite/gdb.rust/modules.exp @@ -16,9 +16,7 @@ # Test name lookup. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp index b077c76a3ef..a456afc1b35 100644 --- a/gdb/testsuite/gdb.rust/pp.exp +++ b/gdb/testsuite/gdb.rust/pp.exp @@ -17,9 +17,7 @@ load_lib gdb-python.exp load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp index 0570697fa6e..234b4329f91 100644 --- a/gdb/testsuite/gdb.rust/rawids.exp +++ b/gdb/testsuite/gdb.rust/rawids.exp @@ -16,9 +16,7 @@ # Test raw identifiers. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests set v [split [rust_compiler_version] .] if {[lindex $v 0] == 1 && [lindex $v 1] < 30} { diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp index 0a5ff5ecfb4..ed76fbf9760 100644 --- a/gdb/testsuite/gdb.rust/rust-style.exp +++ b/gdb/testsuite/gdb.rust/rust-style.exp @@ -16,9 +16,7 @@ # Test CLI output styling for Rust. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests save_vars { env(TERM) } { # We need an ANSI-capable terminal to get the output. diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp index 3f698f12dcd..7314aab395c 100644 --- a/gdb/testsuite/gdb.rust/simple.exp +++ b/gdb/testsuite/gdb.rust/simple.exp @@ -16,9 +16,7 @@ # Test expression parsing and evaluation that requires Rust compiler. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp index c3d1b524d7f..63a6df451f8 100644 --- a/gdb/testsuite/gdb.rust/traits.exp +++ b/gdb/testsuite/gdb.rust/traits.exp @@ -16,9 +16,7 @@ # Test trait object printing. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp index 63ed8d1250c..aa1ace0608a 100644 --- a/gdb/testsuite/gdb.rust/unicode.exp +++ b/gdb/testsuite/gdb.rust/unicode.exp @@ -16,9 +16,7 @@ # Test raw identifiers. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests # Non-ASCII identifiers were allowed starting in 1.53. set v [split [rust_compiler_version] .] diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp index baf47d2651f..28b787b38da 100644 --- a/gdb/testsuite/gdb.rust/union.exp +++ b/gdb/testsuite/gdb.rust/union.exp @@ -16,9 +16,7 @@ # Test of "union" for Rust. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp index ca45914444c..ac46b2eefac 100644 --- a/gdb/testsuite/gdb.rust/unsized.exp +++ b/gdb/testsuite/gdb.rust/unsized.exp @@ -16,9 +16,7 @@ # Test expression parsing and evaluation that requires Rust compiler. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp index b709c00e394..2c0e57db427 100644 --- a/gdb/testsuite/gdb.rust/watch.exp +++ b/gdb/testsuite/gdb.rust/watch.exp @@ -16,9 +16,7 @@ # Test watch -location with Rust. load_lib rust-support.exp -if {[skip_rust_tests]} { - return -} +require !skip_rust_tests standard_testfile .rs if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {