From 435d58376aae933ddb8f2a2f55d24dc93c463bf0 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 8 Jan 2023 10:55:43 -0700 Subject: [PATCH] Rename to allow_hw_watchpoint_access_tests This changes skip_hw_watchpoint_access_tests to invert the sense, and renames it to allow_hw_watchpoint_access_tests. --- 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/gdb.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" } - 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/gdb.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. # This test uses "awatch". -require !skip_hw_watchpoint_access_tests +require allow_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 6533ee2f14c..2c2e165394e 100644 --- a/gdb/testsuite/gdb.base/watch-read.exp +++ b/gdb/testsuite/gdb.base/watch-read.exp @@ -24,7 +24,7 @@ standard_testfile .c -require !skip_hw_watchpoint_access_tests +require allow_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 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 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/watchpoint-hw-hit-once.exp b/gdb/testsuite/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 . -require !skip_hw_watchpoint_access_tests +require allow_hw_watchpoint_access_tests set test watchpoint-hw-hit-once set srcfile ${test}.c diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.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 # 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 if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.threads/watchthreads-reorder.exp b/gdb/testsuite/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 to the # different/new watchpoint, just based on the watchpoint/debug register number. -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 } -# 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 -proc skip_hw_watchpoint_access_tests {} { +proc allow_hw_watchpoint_access_tests {} { if { [skip_hw_watchpoint_tests] } { - return 1 + return 0 } # These targets support just write watchpoints if { [istarget "s390*-*-*"] } { - return 1 + return 0 } - return 0 + return 1 } # Return 1 if we should skip tests that require the runtime unwinder -- 2.30.2