From 0a7043e0c55b54adca5ded9bc619c24e5ea1689b Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 14 Dec 2022 09:45:31 -0700 Subject: [PATCH] Use require support_displaced_stepping This changes some tests to use "require support_displaced_stepping". --- gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp | 5 +---- gdb/testsuite/gdb.base/async-shell.exp | 5 +---- gdb/testsuite/gdb.base/inferior-died.exp | 5 +---- gdb/testsuite/gdb.base/moribund-step.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nonstop-exit.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nonstop.exp | 5 +---- gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nsintrall.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nsmoribund.exp | 5 +---- gdb/testsuite/gdb.mi/mi-nsthrexec.exp | 5 +---- gdb/testsuite/gdb.mi/mi-watch-nonstop.exp | 7 +------ gdb/testsuite/gdb.python/py-evthreads.exp | 5 +---- 12 files changed, 12 insertions(+), 50 deletions(-) diff --git a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp index 7ec4f301c18..1a1adf17961 100644 --- a/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp +++ b/gdb/testsuite/gdb.arch/disp-step-insn-reloc.exp @@ -16,10 +16,7 @@ standard_testfile insn-reloc.c set executable $testfile set expfile $testfile.exp -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping # Some targets have leading underscores on assembly symbols. set additional_flags [gdb_target_symbol_prefix_flags] diff --git a/gdb/testsuite/gdb.base/async-shell.exp b/gdb/testsuite/gdb.base/async-shell.exp index ba1efacafae..e79fe143455 100644 --- a/gdb/testsuite/gdb.base/async-shell.exp +++ b/gdb/testsuite/gdb.base/async-shell.exp @@ -15,10 +15,7 @@ standard_testfile -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping # The testfile uses "run". The real bug happened only for ![is_remote target]. if [use_gdb_stub] { diff --git a/gdb/testsuite/gdb.base/inferior-died.exp b/gdb/testsuite/gdb.base/inferior-died.exp index 84aefee0645..4a72e8da98b 100644 --- a/gdb/testsuite/gdb.base/inferior-died.exp +++ b/gdb/testsuite/gdb.base/inferior-died.exp @@ -21,10 +21,7 @@ if {![istarget "*-*-linux*"]} { return } -if { ![support_displaced_stepping] } { - unsupported "inferior-died.exp" - return -1 -} +require support_displaced_stepping standard_testfile .c diff --git a/gdb/testsuite/gdb.base/moribund-step.exp b/gdb/testsuite/gdb.base/moribund-step.exp index 509115cbcc0..d052df72425 100644 --- a/gdb/testsuite/gdb.base/moribund-step.exp +++ b/gdb/testsuite/gdb.base/moribund-step.exp @@ -15,10 +15,7 @@ standard_testfile start.c -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping save_vars { GDBFLAGS } { set GDBFLAGS "$GDBFLAGS -ex \"set non-stop on\"" diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp index 9301f0f2173..0c64ee18320 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp index 8fa60037e4f..84ba40a4448 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp @@ -14,10 +14,7 @@ # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp index 1bb759a4595..47429d6930c 100644 --- a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp +++ b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp @@ -16,10 +16,7 @@ # Regression test for PR11557. Make sure we don't end up with a stale # register cache just after resuming a thread. -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp index 7fefd791c58..98607fc2129 100644 --- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp +++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp index 6b02a544e6a..103aa45d7e1 100644 --- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp +++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp index 6f3b2773187..a6ce493ce8d 100644 --- a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp +++ b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp @@ -18,10 +18,7 @@ # the main thread doesn't just silently stop at the first internal # breakpoint (usually the _dl_debug_state breakpoint). -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp index 515454456b2..b3dc7b772e4 100644 --- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp +++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp @@ -13,12 +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_tests - -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require !skip_hw_watchpoint_tests support_displaced_stepping load_lib mi-support.exp set MIFLAGS "-i=mi" diff --git a/gdb/testsuite/gdb.python/py-evthreads.exp b/gdb/testsuite/gdb.python/py-evthreads.exp index c9afbb7cdb8..fde5501b1db 100644 --- a/gdb/testsuite/gdb.python/py-evthreads.exp +++ b/gdb/testsuite/gdb.python/py-evthreads.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if { ![support_displaced_stepping] } { - unsupported "displaced stepping" - return -1 -} +require support_displaced_stepping load_lib gdb-python.exp -- 2.30.2