From patchwork Sun Jan 22 21:55:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63566 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 9135938582A4 for ; Sun, 22 Jan 2023 21:56:32 +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 6178C3858D38 for ; Sun, 22 Jan 2023 21:56:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6178C3858D38 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 BD5FD100471D5 for ; Sun, 22 Jan 2023 21:56:10 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id JiJup388ziJ4bJiJup6yaU; Sun, 22 Jan 2023 21:56:10 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=DfLSFthW c=1 sm=1 tr=0 ts=63cdb0fa 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=EprtKk16ycEAGXLIdHsA: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=1UT+3wKJ77HlUuu0DbA/dmIqq6evbw0DOVERbmlVVk8=; b=kANava8mqqdz4SdwJG5OGQn8MC qA0WACVXRE1GgrLJ7r0jANRuu66JomDSeBDBuh7j33FX/Vwn/AOFBiR6gIRgjQ1+6buAImJLqGdBM /s6flIAelDjZPomhLtogiGjXF; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:55760 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 1pJiJu-003faM-BM; Sun, 22 Jan 2023 14:56:10 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 3/8] Rename skip_power_isa_3_1_tests to allow form Date: Sun, 22 Jan 2023 14:55:53 -0700 Message-Id: <20230122215558.1931803-4-tom@tromey.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230122215558.1931803-1-tom@tromey.com> References: <20230122215558.1931803-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: 1pJiJu-003faM-BM X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:55760 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.8 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 renames skip_power_isa_3_1_tests to allow_power_isa_3_1_tests and updates its users to use require. --- gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp | 5 +---- .../gdb.reverse/ppc_record_test_isa_3_1.exp | 5 +---- gdb/testsuite/lib/gdb.exp | 18 +++++++++--------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp index a1aacb05070..acad3c5a57b 100644 --- a/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp +++ b/gdb/testsuite/gdb.arch/powerpc-plxv-nonrel.exp @@ -16,10 +16,7 @@ # Test to see if gdb is properly single stepping over the # displaced plxv instruction. -if { ![istarget powerpc*-*] || [skip_power_isa_3_1_tests] } { - verbose "Skipping powerpc ISA 3.1 plxv test." - return -} +require {istarget powerpc*-*} allow_power_isa_3_1_tests set retval 0 diff --git a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp index f6bf4857fdf..9899da36829 100644 --- a/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp +++ b/gdb/testsuite/gdb.reverse/ppc_record_test_isa_3_1.exp @@ -37,10 +37,7 @@ standard_testfile set gen_src record_test_isa_3_1.c set executable record_test_isa_3_1 -if {![istarget "powerpc*"] || [skip_power_isa_3_1_tests]} { - verbose "Skipping PowerPC ISA 3.1 instruction record_test." - return -} +require {istarget "powerpc*"} allow_power_isa_3_1_tests set options [list additional_flags=-mcpu=power10 debug] if {[build_executable "failed to prepare" $executable $srcfile $options] == -1} { diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 2c53ebe7774..5425ae74cb9 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3525,10 +3525,10 @@ gdb_caching_proc allow_altivec_tests { } # Run a test on the power target to see if it supports ISA 3.1 instructions -gdb_caching_proc skip_power_isa_3_1_tests { +gdb_caching_proc allow_power_isa_3_1_tests { global srcdir subdir gdb_prompt inferior_exited_re - set me "skip_power_isa_3_1_tests" + set me "allow_power_isa_3_1_tests" # Compile a test program containing ISA 3.1 instructions. set src { @@ -3540,7 +3540,7 @@ gdb_caching_proc skip_power_isa_3_1_tests { } if {![gdb_simple_compile $me $src executable ]} { - return 1 + return 0 } # No error message, compilation succeeded so now run it via gdb. @@ -3553,22 +3553,22 @@ gdb_caching_proc skip_power_isa_3_1_tests { gdb_expect { -re ".*Illegal instruction.*${gdb_prompt} $" { verbose -log "\n$me Power ISA 3.1 hardware not detected" - set skip_power_isa_3_1_tests 1 + set allow_power_isa_3_1_tests 0 } -re ".*$inferior_exited_re normally.*${gdb_prompt} $" { verbose -log "\n$me: Power ISA 3.1 hardware detected" - set skip_power_isa_3_1_tests 0 + set allow_power_isa_3_1_tests 1 } default { - warning "\n$me: default case taken" - set skip_power_isa_3_1_tests 1 + warning "\n$me: default case taken" + set allow_power_isa_3_1_tests 0 } } gdb_exit remote_file build delete $obj - verbose "$me: returning $skip_power_isa_3_1_tests" 2 - return $skip_power_isa_3_1_tests + verbose "$me: returning $allow_power_isa_3_1_tests" 2 + return $allow_power_isa_3_1_tests } # Run a test on the target to see if it supports vmx hardware. Return 0 if so,