From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy3-pub.mail.unifiedlayer.com (gproxy3-pub.mail.unifiedlayer.com [69.89.30.42]) by sourceware.org (Postfix) with ESMTPS id 346A93834E18 for ; Sat, 17 Dec 2022 00:08:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 346A93834E18 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 progateway5.mail.pro1.eigbox.com (Postfix) with ESMTP id A0E361004877C for ; Sat, 17 Dec 2022 00:08:37 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KknpHkTBPmV96KknpNBqh; Sat, 17 Dec 2022 00:08:37 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Z4EpoFdA c=1 sm=1 tr=0 ts=639d0885 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=vvWY1OzmxowyN2FbmmEA: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=yTgpibvm+nkoyk8nII6rg4Da186YT7I4QpHqsCZD0v4=; b=BEdwswrqrfZm5YtWblmh8qx4No fGFzxQ39UXCABS68atZBuHPOQ83boUu1MxvrNuWUcic2TSYj3Cz0Qf/tQfb7MEviy143P1BwWBdON gARFQeBctI8clbmz6wF1S1ZQc; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:60704 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 1p6Kkn-002ghj-EN; Fri, 16 Dec 2022 17:08:37 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 18/46] Use require skip_hw_watchpoint_tests Date: Fri, 16 Dec 2022 17:07:50 -0700 Message-Id: <20221217000818.3729389-19-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 Content-Transfer-Encoding: 8bit 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: 1p6Kkn-002ghj-EN X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:60704 X-Source-Auth: tom+tromey.com X-Email-Count: 19 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 List-Id: This changes some tests to use "require skip_hw_watchpoint_tests". --- gdb/testsuite/gdb.ada/task_watch.exp | 2 +- gdb/testsuite/gdb.base/pr11022.exp | 4 +--- gdb/testsuite/gdb.base/watch-before-fork.exp | 4 +--- gdb/testsuite/gdb.base/watch-read.exp | 4 +--- gdb/testsuite/gdb.base/watch_thread_num.exp | 4 +--- gdb/testsuite/gdb.base/watchpoint-hw-attach.exp | 4 +--- gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp | 4 +--- gdb/testsuite/gdb.base/watchpoint-hw.exp | 4 +--- gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp | 4 +--- gdb/testsuite/gdb.base/watchpoint-unaligned.exp | 4 +--- gdb/testsuite/gdb.mi/mi-watch-nonstop.exp | 4 +--- gdb/testsuite/gdb.mi/pr11022.exp | 4 +--- gdb/testsuite/gdb.multi/watchpoint-multi.exp | 5 +---- gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp | 4 +--- gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp | 4 +--- gdb/testsuite/gdb.threads/watchthreads-reorder.exp | 5 ++--- gdb/testsuite/gdb.threads/watchthreads.exp | 4 +--- gdb/testsuite/gdb.threads/watchthreads2.exp | 4 +--- gdb/testsuite/gdb.threads/wp-replication.exp | 4 +--- 19 files changed, 20 insertions(+), 56 deletions(-) diff --git a/gdb/testsuite/gdb.ada/task_watch.exp b/gdb/testsuite/gdb.ada/task_watch.exp index 295efd5b010..a01d4c7c659 100644 --- a/gdb/testsuite/gdb.ada/task_watch.exp +++ b/gdb/testsuite/gdb.ada/task_watch.exp @@ -19,7 +19,7 @@ load_lib "ada.exp" require !skip_ada_tests -if { [skip_hw_watchpoint_tests] } { return -1 } +require !skip_hw_watchpoint_tests standard_ada_testfile foo diff --git a/gdb/testsuite/gdb.base/pr11022.exp b/gdb/testsuite/gdb.base/pr11022.exp index 56d26ccd132..d0b9c1f1aa0 100644 --- a/gdb/testsuite/gdb.base/pr11022.exp +++ b/gdb/testsuite/gdb.base/pr11022.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests standard_testfile .c diff --git a/gdb/testsuite/gdb.base/watch-before-fork.exp b/gdb/testsuite/gdb.base/watch-before-fork.exp index 7c2a481e454..3993778035b 100644 --- a/gdb/testsuite/gdb.base/watch-before-fork.exp +++ b/gdb/testsuite/gdb.base/watch-before-fork.exp @@ -18,9 +18,7 @@ # followed by a catchpoint hit. # This test uses "awatch". -if {[skip_hw_watchpoint_access_tests]} { - return -} +require !skip_hw_watchpoint_access_tests standard_testfile diff --git a/gdb/testsuite/gdb.base/watch-read.exp b/gdb/testsuite/gdb.base/watch-read.exp index d73bc5c4ab3..1b856bb109b 100644 --- a/gdb/testsuite/gdb.base/watch-read.exp +++ b/gdb/testsuite/gdb.base/watch-read.exp @@ -24,9 +24,7 @@ standard_testfile .c -if {[skip_hw_watchpoint_access_tests]} { - return 0 -} +require !skip_hw_watchpoint_access_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 diff --git a/gdb/testsuite/gdb.base/watch_thread_num.exp b/gdb/testsuite/gdb.base/watch_thread_num.exp index da921a72346..8ec4dd3fe00 100644 --- a/gdb/testsuite/gdb.base/watch_thread_num.exp +++ b/gdb/testsuite/gdb.base/watch_thread_num.exp @@ -23,9 +23,7 @@ # so the test is only meaningful on a system with hardware watchpoints. # More specifically, the implementation of this test uses access # watchpoints, so skip it when those are not available. -if {[skip_hw_watchpoint_access_tests]} { - return 0 -} +require !skip_hw_watchpoint_access_tests standard_testfile .c diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp index 456d5570fb2..ce9263ef37a 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-attach.exp @@ -16,9 +16,7 @@ # watchpoint-hw-attach.exp -- Test if hardware watchpoints are used # when attaching to a target. -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests if {![can_spawn_for_attach]} { return 0 diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp index ebcd2eb29c7..b84de75b734 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_hw_watchpoint_access_tests]} { - return 0 -} +require !skip_hw_watchpoint_access_tests set test watchpoint-hw-hit-once set srcfile ${test}.c diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp index d0fd1621efe..785f949efe9 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw.exp @@ -18,9 +18,7 @@ if { [use_gdb_stub] } { return } -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests standard_testfile diff --git a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp index 0364591d745..7112a2db355 100644 --- a/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp +++ b/gdb/testsuite/gdb.base/watchpoint-stops-at-right-insn.exp @@ -71,9 +71,7 @@ standard_testfile # No use testing this if we can't use hardware watchpoints. -if {[skip_hw_watchpoint_tests]} { - return -1 -} +require !skip_hw_watchpoint_tests if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 diff --git a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp index 00c6ebcf4eb..c25233e1a1b 100644 --- a/gdb/testsuite/gdb.base/watchpoint-unaligned.exp +++ b/gdb/testsuite/gdb.base/watchpoint-unaligned.exp @@ -17,9 +17,7 @@ # Test inserting read watchpoints on unaligned addresses. -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests standard_testfile if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } { diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp index 9648d7ee41c..e3b9b23c109 100644 --- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if [skip_hw_watchpoint_tests] { - return -1 -} +require !skip_hw_watchpoint_tests if { ![support_displaced_stepping] } { unsupported "displaced stepping" diff --git a/gdb/testsuite/gdb.mi/pr11022.exp b/gdb/testsuite/gdb.mi/pr11022.exp index cdb39e7b65f..9fc47ce7215 100644 --- a/gdb/testsuite/gdb.mi/pr11022.exp +++ b/gdb/testsuite/gdb.mi/pr11022.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp index 0fc1bee762f..121d1e8a660 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -25,10 +25,7 @@ if [use_gdb_stub] { # Do not use simple hardware watchpoints ("watch") as its false hit may be # unnoticed by GDB if it reads it still has the same value. -if [skip_hw_watchpoint_access_tests] { - untested "${testfile} (no hardware access watchpoints)" - return -} +require !skip_hw_watchpoint_access_tests if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp index 9ddcd589226..18cd7e9f8ae 100644 --- a/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp +++ b/gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp @@ -19,9 +19,7 @@ # thread other than the thread the local watchpoint was set in stops # for a breakpoint. -if {[skip_hw_watchpoint_multi_tests]} { - return 0 -} +require !skip_hw_watchpoint_multi_tests standard_testfile if {[gdb_compile_pthreads \ diff --git a/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp b/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp index 332ec9a03fd..b5c85c1b245 100644 --- a/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp +++ b/gdb/testsuite/gdb.threads/step-over-trips-on-watchpoint.exp @@ -22,9 +22,7 @@ set executable ${testfile} # This test verifies that a watchpoint is detected in a multithreaded # program so the test is only meaningful on a system with hardware # watchpoints. -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable [list debug "incdir=${objdir}"]] != "" } { diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp index 3f9467c795e..b2be631420a 100644 --- a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp +++ b/gdb/testsuite/gdb.threads/watchthreads-reorder.exp @@ -25,9 +25,8 @@ # could be assigned during continuation of a thread with pending SIGTRAP to the # different/new watchpoint, just based on the watchpoint/debug register number. -if {[skip_hw_watchpoint_access_tests] - || [skip_hw_watchpoint_multi_tests] - || ![istarget *-*-linux*]} { +require !skip_hw_watchpoint_access_tests !skip_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 7fac8a3df80..3dde5458385 100644 --- a/gdb/testsuite/gdb.threads/watchthreads.exp +++ b/gdb/testsuite/gdb.threads/watchthreads.exp @@ -20,9 +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. -if {[skip_hw_watchpoint_multi_tests]} { - return 0 -} +require !skip_hw_watchpoint_multi_tests proc target_no_stopped_data { } { return [istarget s390*-*-*] diff --git a/gdb/testsuite/gdb.threads/watchthreads2.exp b/gdb/testsuite/gdb.threads/watchthreads2.exp index 8b887f2a944..97f20b31619 100644 --- a/gdb/testsuite/gdb.threads/watchthreads2.exp +++ b/gdb/testsuite/gdb.threads/watchthreads2.exp @@ -24,9 +24,7 @@ set X_INCR_COUNT 10 # This test verifies that a watchpoint is detected in the proper thread # so the test is only meaningful on a system with hardware watchpoints. -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests standard_testfile if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS -DX_INCR_COUNT=$X_INCR_COUNT"]] != "" } { diff --git a/gdb/testsuite/gdb.threads/wp-replication.exp b/gdb/testsuite/gdb.threads/wp-replication.exp index bec3d10fd67..d057513c46d 100644 --- a/gdb/testsuite/gdb.threads/wp-replication.exp +++ b/gdb/testsuite/gdb.threads/wp-replication.exp @@ -27,9 +27,7 @@ set NR_TRIGGERS_PER_THREAD 2 # This test verifies that a hardware watchpoint gets replicated to # every existing thread and is detected properly. This test is # only meaningful on a target with hardware watchpoint support. -if {[skip_hw_watchpoint_tests]} { - return 0 -} +require !skip_hw_watchpoint_tests standard_testfile if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug "additional_flags=-DNR_THREADS=$NR_THREADS -DNR_TRIGGERS_PER_THREAD=$NR_TRIGGERS_PER_THREAD"]] != "" } { -- 2.38.1