From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id EF1483858C39; Fri, 13 Jan 2023 20:39:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EF1483858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642365; bh=DMTAUa2syRc2Pn+3J6U7rEeRR8FwScd+cvXwkhWiuKA=; h=From:To:Subject:Date:From; b=DtI8wifHeaaxJLSRsBFn+jud182mCRJV+KxTbFY3zaI6y9u/VjUnK4gha4ZpkzYfa 0c44yTrjVpERS5Eyq1w1QMRgb+lhqKRP4JmbY5YMqBL1DbQJcEdsssCM8tlqnyYFPx 7sK4pGXxWFvQZFuS1gFB/sLTqTg773ktmwu30wJk= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Rename to allow_hw_watchpoint_access_tests X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: b63724b8c2840302e498ce45298d361d6e57b4b9 X-Git-Newrev: 435d58376aae933ddb8f2a2f55d24dc93c463bf0 Message-Id: <20230113203925.EF1483858C39@sourceware.org> Date: Fri, 13 Jan 2023 20:39:25 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D435d58376aae= 933ddb8f2a2f55d24dc93c463bf0 commit 435d58376aae933ddb8f2a2f55d24dc93c463bf0 Author: Tom Tromey Date: Sun Jan 8 10:55:43 2023 -0700 Rename to allow_hw_watchpoint_access_tests =20 This changes skip_hw_watchpoint_access_tests to invert the sense, and renames it to allow_hw_watchpoint_access_tests. Diff: --- gdb/testsuite/gdb.base/break-idempotent.exp | 2 +- gdb/testsuite/gdb.base/watch-before-fork.exp | 2 +- gdb/testsuite/gdb.base/watch-read.exp | 2 +- gdb/testsuite/gdb.base/watch_thread_num.exp | 2 +- gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp | 2 +- gdb/testsuite/gdb.multi/watchpoint-multi.exp | 2 +- gdb/testsuite/gdb.threads/watchthreads-reorder.exp | 2 +- gdb/testsuite/lib/gdb.exp | 10 +++++----- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gdb/testsuite/gdb.base/break-idempotent.exp b/gdb/testsuite/gd= b.base/break-idempotent.exp index 058c9327dcd..e967b563dda 100644 --- a/gdb/testsuite/gdb.base/break-idempotent.exp +++ b/gdb/testsuite/gdb.base/break-idempotent.exp @@ -184,7 +184,7 @@ foreach_with_prefix pie { "nopie" "pie" } { test_break $always_inserted "watch" } =20 - if {![skip_hw_watchpoint_access_tests] + if {[allow_hw_watchpoint_access_tests] && ![skip_hw_watchpoint_multi_tests]} { test_break $always_inserted "rwatch" test_break $always_inserted "awatch" diff --git a/gdb/testsuite/gdb.base/watch-before-fork.exp b/gdb/testsuite/g= db.base/watch-before-fork.exp index 41574169e8f..a9e212026bf 100644 --- a/gdb/testsuite/gdb.base/watch-before-fork.exp +++ b/gdb/testsuite/gdb.base/watch-before-fork.exp @@ -18,7 +18,7 @@ # followed by a catchpoint hit. =20 # This test uses "awatch". -require !skip_hw_watchpoint_access_tests +require allow_hw_watchpoint_access_tests =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/watch-read.exp b/gdb/testsuite/gdb.base= /watch-read.exp index 6533ee2f14c..2c2e165394e 100644 --- a/gdb/testsuite/gdb.base/watch-read.exp +++ b/gdb/testsuite/gdb.base/watch-read.exp @@ -24,7 +24,7 @@ =20 standard_testfile .c =20 -require !skip_hw_watchpoint_access_tests +require allow_hw_watchpoint_access_tests =20 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/gd= b.base/watch_thread_num.exp index 799b386a390..28b8581ba5a 100644 --- a/gdb/testsuite/gdb.base/watch_thread_num.exp +++ b/gdb/testsuite/gdb.base/watch_thread_num.exp @@ -23,7 +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. -require !skip_hw_watchpoint_access_tests +require allow_hw_watchpoint_access_tests =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsu= ite/gdb.base/watchpoint-hw-hit-once.exp index e93391a6512..fa16b3c456c 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -require !skip_hw_watchpoint_access_tests +require allow_hw_watchpoint_access_tests =20 set test watchpoint-hw-hit-once set srcfile ${test}.c diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/g= db.multi/watchpoint-multi.exp index e29e0675d8e..69996ba88d2 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -22,7 +22,7 @@ require !use_gdb_stub =20 # 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. -require !skip_hw_watchpoint_access_tests +require allow_hw_watchpoint_access_tests =20 if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" e= xecutable {debug}] !=3D "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/tests= uite/gdb.threads/watchthreads-reorder.exp index 2469b3ada0c..d5de2c68684 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 t= o the # different/new watchpoint, just based on the watchpoint/debug register nu= mber. =20 -require !skip_hw_watchpoint_access_tests !skip_hw_watchpoint_multi_tests +require allow_hw_watchpoint_access_tests !skip_hw_watchpoint_multi_tests if {![istarget *-*-linux*]} { return 0 } diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index f3f0bfac762..13d1ae881b5 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4081,19 +4081,19 @@ proc skip_hw_watchpoint_multi_tests {} { return 0 } =20 -# Return a 1 if we should skip tests that require read/access watchpoints +# Return a 1 if we should run tests that require read/access watchpoints =20 -proc skip_hw_watchpoint_access_tests {} { +proc allow_hw_watchpoint_access_tests {} { if { [skip_hw_watchpoint_tests] } { - return 1 + return 0 } =20 # These targets support just write watchpoints if { [istarget "s390*-*-*"] } { - return 1 + return 0 } =20 - return 0 + return 1 } =20 # Return 1 if we should skip tests that require the runtime unwinder