From patchwork Thu Jan 12 03:00:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63063 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 B4A3A382D33D for ; Thu, 12 Jan 2023 03:07:49 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy2-pub.mail.unifiedlayer.com (gproxy2-pub.mail.unifiedlayer.com [69.89.18.3]) by sourceware.org (Postfix) with ESMTPS id 0479A3832374 for ; Thu, 12 Jan 2023 03:01:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0479A3832374 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 cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway4.mail.pro1.eigbox.com (Postfix) with ESMTP id 7C6D910047E0B for ; Thu, 12 Jan 2023 03:01:45 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id FnqbpOwobNX2aFnqbpDVSz; Thu, 12 Jan 2023 03:01:45 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=NMAQR22g c=1 sm=1 tr=0 ts=63bf7819 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=vaZ4-xE1rYFCIprTUrQA: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=qgsGWwkPSw6LuEpFmHmYRnmOup6R0msFtLhjbjDRzcU=; b=WQ7/kAlUxT69O7/UYvDXigIJbb mscOu8v2vHTzi8auMsSBzrlUTlbezCRi0o9Xx1tVT7dH62A2CfflkX7W2gN/2ktXWpCV7w+Vser/X 9gu3CbyzjMjdM4j7BzIavswhT; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:60786 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 1pFnqa-000mAD-VG; Wed, 11 Jan 2023 20:01:45 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 67/79] Rename to allow_hw_watchpoint_multi_tests Date: Wed, 11 Jan 2023 20:00:40 -0700 Message-Id: <20230112030052.3306113-68-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: 1pFnqa-000mAD-VG X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:60786 X-Source-Auth: tom+tromey.com X-Email-Count: 68 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, 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 skip_hw_watchpoint_multi_tests to invert the sense, and renames it to allow_hw_watchpoint_multi_tests. --- gdb/testsuite/gdb.base/break-idempotent.exp | 2 +- gdb/testsuite/gdb.base/watchpoint.exp | 2 +- gdb/testsuite/gdb.multi/watchpoint-multi.exp | 2 +- gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp | 2 +- gdb/testsuite/gdb.threads/watchthreads-reorder.exp | 2 +- gdb/testsuite/gdb.threads/watchthreads.exp | 2 +- gdb/testsuite/lib/gdb.exp | 10 +++++----- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/gdb.base/break-idempotent.exp b/gdb/testsuite/gdb.base/break-idempotent.exp index e967b563dda..4d74bb54a1e 100644 --- a/gdb/testsuite/gdb.base/break-idempotent.exp +++ b/gdb/testsuite/gdb.base/break-idempotent.exp @@ -185,7 +185,7 @@ foreach_with_prefix pie { "nopie" "pie" } { } if {[allow_hw_watchpoint_access_tests] - && ![skip_hw_watchpoint_multi_tests]} { + && [allow_hw_watchpoint_multi_tests]} { test_break $always_inserted "rwatch" test_break $always_inserted "awatch" } diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp index c47e083d083..5f5e7923c79 100644 --- a/gdb/testsuite/gdb.base/watchpoint.exp +++ b/gdb/testsuite/gdb.base/watchpoint.exp @@ -771,7 +771,7 @@ proc test_inaccessible_watchpoint {} { # This step requires two HW watchpoints. Since some platforms only # have a single one, accept either SW or HW watchpoint in this case. - if {[skip_hw_watchpoint_multi_tests]} { + if {![allow_hw_watchpoint_multi_tests]} { set watchpoint_msg "(Watchpoint|Hardware watchpoint)" } diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp index 69996ba88d2..109defa864a 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -62,7 +62,7 @@ gdb_breakpoint "marker_exit" gdb_test "inferior 1" "witching to inferior 1 .*" "switch back to inferior 1" -if [skip_hw_watchpoint_multi_tests] { +if {![allow_hw_watchpoint_multi_tests]} { # On single hardware watchpoint at least test the watchpoint in inferior # 2 is not hit. } else { diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp index 2f627a05980..d58c777cef6 100644 --- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp +++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp @@ -19,7 +19,7 @@ # thread other than the thread the local watchpoint was set in stops # for a breakpoint. -require !skip_hw_watchpoint_multi_tests +require allow_hw_watchpoint_multi_tests standard_testfile if {[gdb_compile_pthreads \ diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp index d5de2c68684..68409eff325 100644 --- a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp +++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp @@ -25,7 +25,7 @@ # could be assigned during continuation of a thread with pending SIGTRAP to the # different/new watchpoint, just based on the watchpoint/debug register number. -require allow_hw_watchpoint_access_tests !skip_hw_watchpoint_multi_tests +require allow_hw_watchpoint_access_tests allow_hw_watchpoint_multi_tests if {![istarget *-*-linux*]} { return 0 } diff --git a/gdb/testsuite/gdb.threads/watchthreads.exp b/gdb/testsuite/gdb.threads/watchthreads.exp index d2a95bf7d5c..1aa7957c867 100644 --- a/gdb/testsuite/gdb.threads/watchthreads.exp +++ b/gdb/testsuite/gdb.threads/watchthreads.exp @@ -20,7 +20,7 @@ # This test verifies that a watchpoint is detected in the proper thread # so the test is only meaningful on a system with hardware watchpoints. -require !skip_hw_watchpoint_multi_tests +require allow_hw_watchpoint_multi_tests proc target_no_stopped_data { } { return [istarget s390*-*-*] diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 13d1ae881b5..446f89a8a25 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4064,21 +4064,21 @@ proc skip_hw_watchpoint_tests {} { return 1 } -# Return a 1 if we should skip tests that require *multiple* hardware +# Return a 1 if we should run tests that require *multiple* hardware # watchpoints to be active at the same time -proc skip_hw_watchpoint_multi_tests {} { +proc allow_hw_watchpoint_multi_tests {} { if { [skip_hw_watchpoint_tests] } { - return 1 + return 0 } # These targets support just a single hardware watchpoint if { [istarget "arm*-*-*"] || [istarget "powerpc*-*-linux*"] } { - return 1 + return 0 } - return 0 + return 1 } # Return a 1 if we should run tests that require read/access watchpoints