Use require !skip_hw_watchpoint_tests

This changes some tests to use "require !skip_hw_watchpoint_tests".
This commit is contained in:
Tom Tromey 2022-12-14 09:38:35 -07:00
parent c76fbc7fc3
commit 7c1a12b3e8
19 changed files with 20 additions and 56 deletions

View File

@ -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

View File

@ -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_watchpoint_tests]} {
return 0
}
require !skip_hw_watchpoint_tests
standard_testfile .c

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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_watchpoint_access_tests]} {
return 0
}
require !skip_hw_watchpoint_access_tests
set test watchpoint-hw-hit-once
set srcfile ${test}.c

View File

@ -18,9 +18,7 @@ if { [use_gdb_stub] } {
return
}
if {[skip_hw_watchpoint_tests]} {
return 0
}
require !skip_hw_watchpoint_tests
standard_testfile

View File

@ -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

View File

@ -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}] } {

View File

@ -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_watchpoint_tests] {
return -1
}
require !skip_hw_watchpoint_tests
if { ![support_displaced_stepping] } {
unsupported "displaced stepping"

View File

@ -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_watchpoint_tests]} {
return 0
}
require !skip_hw_watchpoint_tests
load_lib mi-support.exp
set MIFLAGS "-i=mi"

View File

@ -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"

View File

@ -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 \

View File

@ -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}"]] != "" } {

View File

@ -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
}

View File

@ -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*-*-*]

View File

@ -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"]] != "" } {

View File

@ -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"]] != "" } {