aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2023-01-08 11:54:47 -0700
committerTom Tromey <tom@tromey.com>2023-01-13 13:18:58 -0700
commite0c86460bcd9e19bb3f069af19ab5d1e3333e4c9 (patch)
tree4a27471b6f9eb22f1126fb836bc1f1ef1fa13b61
parent1cf897dec9466eed3d63f3b0c42257f41eb55fcc (diff)
downloadgdb-e0c86460bcd9e19bb3f069af19ab5d1e3333e4c9.zip
gdb-e0c86460bcd9e19bb3f069af19ab5d1e3333e4c9.tar.gz
gdb-e0c86460bcd9e19bb3f069af19ab5d1e3333e4c9.tar.bz2
Rename to allow_hw_breakpoint_tests
This changes skip_hw_breakpoint_tests to invert the sense, and renames it to allow_hw_breakpoint_tests. This also converts some tests to use "require" -- I missed this particular check in the first series.
-rw-r--r--gdb/testsuite/gdb.base/break-idempotent.exp2
-rw-r--r--gdb/testsuite/gdb.base/break-unload-file.exp2
-rw-r--r--gdb/testsuite/gdb.base/hbreak-unmapped.exp4
-rw-r--r--gdb/testsuite/gdb.base/hbreak.exp4
-rw-r--r--gdb/testsuite/gdb.base/hw-sw-break-same-address.exp4
-rw-r--r--gdb/testsuite/gdb.python/py-breakpoint.exp2
-rw-r--r--gdb/testsuite/gdb.threads/watchpoint-fork.exp2
-rw-r--r--gdb/testsuite/lib/gdb.exp10
8 files changed, 12 insertions, 18 deletions
diff --git a/gdb/testsuite/gdb.base/break-idempotent.exp b/gdb/testsuite/gdb.base/break-idempotent.exp
index 559a3a6..4090cd2 100644
--- a/gdb/testsuite/gdb.base/break-idempotent.exp
+++ b/gdb/testsuite/gdb.base/break-idempotent.exp
@@ -176,7 +176,7 @@ foreach_with_prefix pie { "nopie" "pie" } {
foreach_with_prefix always_inserted { "off" "on" } {
test_break $always_inserted "break"
- if {![skip_hw_breakpoint_tests]} {
+ if {[allow_hw_breakpoint_tests]} {
test_break $always_inserted "hbreak"
}
diff --git a/gdb/testsuite/gdb.base/break-unload-file.exp b/gdb/testsuite/gdb.base/break-unload-file.exp
index 3bf10d0..82e9694 100644
--- a/gdb/testsuite/gdb.base/break-unload-file.exp
+++ b/gdb/testsuite/gdb.base/break-unload-file.exp
@@ -149,7 +149,7 @@ foreach initial_load { "cmdline" "file" } {
# coverage.
foreach always_inserted { "off" "on" } {
test_break $initial_load $always_inserted "break"
- if {![skip_hw_breakpoint_tests]} {
+ if {[allow_hw_breakpoint_tests]} {
test_break $initial_load $always_inserted "hbreak"
}
}
diff --git a/gdb/testsuite/gdb.base/hbreak-unmapped.exp b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
index 3572452..18d9c09 100644
--- a/gdb/testsuite/gdb.base/hbreak-unmapped.exp
+++ b/gdb/testsuite/gdb.base/hbreak-unmapped.exp
@@ -13,9 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-if {[skip_hw_breakpoint_tests]} {
- return 0
-}
+require allow_hw_breakpoint_tests
standard_testfile
diff --git a/gdb/testsuite/gdb.base/hbreak.exp b/gdb/testsuite/gdb.base/hbreak.exp
index f18d23d..7fc1bb2 100644
--- a/gdb/testsuite/gdb.base/hbreak.exp
+++ b/gdb/testsuite/gdb.base/hbreak.exp
@@ -13,9 +13,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-if {[skip_hw_breakpoint_tests]} {
- return 0
-}
+require allow_hw_breakpoint_tests
set test hbreak
set srcfile ${test}.c
diff --git a/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp b/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp
index 1f68326..9f94118 100644
--- a/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp
+++ b/gdb/testsuite/gdb.base/hw-sw-break-same-address.exp
@@ -18,9 +18,7 @@
# breakpoint locations as duplicate locations, which would lead to bad
# behavior. See PR gdb/25741.
-if {[skip_hw_breakpoint_tests]} {
- return 0
-}
+require allow_hw_breakpoint_tests
set test hbreak
set srcfile ${test}.c
diff --git a/gdb/testsuite/gdb.python/py-breakpoint.exp b/gdb/testsuite/gdb.python/py-breakpoint.exp
index bee2cea..9535040 100644
--- a/gdb/testsuite/gdb.python/py-breakpoint.exp
+++ b/gdb/testsuite/gdb.python/py-breakpoint.exp
@@ -259,7 +259,7 @@ proc_with_prefix test_hardware_breakpoints { } {
global srcfile testfile hex decimal
# Skip these tests if the HW does not support hardware breakpoints.
- if { [skip_hw_breakpoint_tests] } { return 0 }
+ if { ![allow_hw_breakpoint_tests] } { return 0 }
# Start with a fresh gdb.
clean_restart ${testfile}
diff --git a/gdb/testsuite/gdb.threads/watchpoint-fork.exp b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
index d3804e6..b484fa8 100644
--- a/gdb/testsuite/gdb.threads/watchpoint-fork.exp
+++ b/gdb/testsuite/gdb.threads/watchpoint-fork.exp
@@ -74,7 +74,7 @@ proc test {type symbol} {
gdb_test "watch var" "atchpoint \[0-9\]+: var" "set the watchpoint"
# It is never hit but it should not be left over in the fork()ed-off child.
- if [skip_hw_breakpoint_tests] {
+ if {![allow_hw_breakpoint_tests]} {
set hbreak "break"
} else {
set hbreak "hbreak"
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 94dccf8..31f11b2 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4017,13 +4017,13 @@ proc skip_inline_var_tests {} {
return 0
}
-# Return a 1 if we should skip tests that require hardware breakpoints
+# Return a 1 if we should run tests that require hardware breakpoints
-proc skip_hw_breakpoint_tests {} {
+proc allow_hw_breakpoint_tests {} {
# Skip tests if requested by the board (note that no_hardware_watchpoints
# disables both watchpoints and breakpoints)
if { [target_info exists gdb,no_hardware_watchpoints]} {
- return 1
+ return 0
}
# These targets support hardware breakpoints natively
@@ -4033,10 +4033,10 @@ proc skip_hw_breakpoint_tests {} {
|| [istarget "arm*-*-*"]
|| [istarget "aarch64*-*-*"]
|| [istarget "s390*-*-*"] } {
- return 0
+ return 1
}
- return 1
+ return 0
}
# Return a 1 if we should run tests that require hardware watchpoints