aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2023-01-08 10:57:35 -0700
committerTom Tromey <tom@tromey.com>2023-01-13 13:18:57 -0700
commit9bc8ef1d750796d69d38f1822c8dd6df5729a187 (patch)
treef1c57b5d81500805166f0dc3daca3c07038488da
parent435d58376aae933ddb8f2a2f55d24dc93c463bf0 (diff)
downloadgdb-9bc8ef1d750796d69d38f1822c8dd6df5729a187.zip
gdb-9bc8ef1d750796d69d38f1822c8dd6df5729a187.tar.gz
gdb-9bc8ef1d750796d69d38f1822c8dd6df5729a187.tar.bz2
Rename to allow_hw_watchpoint_multi_tests
This changes skip_hw_watchpoint_multi_tests to invert the sense, and renames it to allow_hw_watchpoint_multi_tests.
-rw-r--r--gdb/testsuite/gdb.base/break-idempotent.exp2
-rw-r--r--gdb/testsuite/gdb.base/watchpoint.exp2
-rw-r--r--gdb/testsuite/gdb.multi/watchpoint-multi.exp2
-rw-r--r--gdb/testsuite/gdb.threads/local-watch-wrong-thread.exp2
-rw-r--r--gdb/testsuite/gdb.threads/watchthreads-reorder.exp2
-rw-r--r--gdb/testsuite/gdb.threads/watchthreads.exp2
-rw-r--r--gdb/testsuite/lib/gdb.exp10
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 e967b56..4d74bb5 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 c47e083..5f5e792 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 69996ba..109defa 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 2f627a0..d58c777 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 d5de2c6..68409ef 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 d2a95bf..1aa7957 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 13d1ae8..446f89a 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