From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 8D8643858D32; Fri, 10 Mar 2023 15:21:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D8643858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678461717; bh=XfxTVlhPgtr0uya+5B8bUZj9CmC5mSf4TSgoJm70KR0=; h=From:To:Subject:Date:From; b=rIk4lxIYkj6s4TZ6igR0x812j4BtwudPEbWcLusqP0jot5DNS8pDokZV+7TWhkzlV 9HYAIVCjoO/IJat+0ehPvDh3eu708TNs2fByW39e1B7DrauRb2MqtZu+EY51SCaBOR +/kkvZw81iITXHkOFddELcfwIKlfkbvtQbtT2S4M= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Use require with target_info X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 1cd0716eb199963ec63fcafa94699d14bbf45e01 X-Git-Newrev: 450d26c851c15e08249fc0fdeb3a06b31ac4fcfd Message-Id: <20230310152157.8D8643858D32@sourceware.org> Date: Fri, 10 Mar 2023 15:21:57 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D450d26c851c1= 5e08249fc0fdeb3a06b31ac4fcfd commit 450d26c851c15e08249fc0fdeb3a06b31ac4fcfd Author: Tom Tromey Date: Wed Feb 22 14:49:47 2023 -0700 Use require with target_info =20 This changes many tests to use 'require' when checking target_info. In a few spots, the require is hoisted to the top of the file, to avoid doing any extra work when the test is going to be skipped anyway. Diff: --- gdb/testsuite/gdb.base/args.exp | 4 +--- gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp | 10 ++-------- gdb/testsuite/gdb.base/branch-to-self.exp | 5 +---- gdb/testsuite/gdb.base/call-ar-st.exp | 5 +---- gdb/testsuite/gdb.base/call-rt-st.exp | 11 +++-------- gdb/testsuite/gdb.base/call-sc.exp | 5 +---- gdb/testsuite/gdb.base/call-signal-resume.exp | 16 +++++-------= ---- gdb/testsuite/gdb.base/call-strs.exp | 5 +---- gdb/testsuite/gdb.base/callexit.exp | 5 +---- gdb/testsuite/gdb.base/callfuncs.exp | 5 +---- gdb/testsuite/gdb.base/cast-call.exp | 5 +---- gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp | 5 +---- gdb/testsuite/gdb.base/catch-signal-fork.exp | 5 +---- gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp | 5 +---- gdb/testsuite/gdb.base/catch-signal.exp | 5 +---- gdb/testsuite/gdb.base/exitsignal.exp | 5 +---- gdb/testsuite/gdb.base/fileio.exp | 5 +---- gdb/testsuite/gdb.base/huge.exp | 4 +--- gdb/testsuite/gdb.base/infcall-input.exp | 5 +---- gdb/testsuite/gdb.base/inferior-args.exp | 5 +---- gdb/testsuite/gdb.base/interrupt-daemon-attach.exp | 10 ++-------- gdb/testsuite/gdb.base/interrupt.exp | 10 ++-------- gdb/testsuite/gdb.base/kill-after-signal.exp | 5 +---- gdb/testsuite/gdb.base/long-inferior-output.exp | 5 +---- gdb/testsuite/gdb.base/long_long.exp | 4 +--- gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp | 5 +---- gdb/testsuite/gdb.base/random-signal.exp | 10 ++-------- gdb/testsuite/gdb.base/relativedebug.exp | 5 +---- gdb/testsuite/gdb.base/savedregs.exp | 5 +---- gdb/testsuite/gdb.base/sigall.exp | 5 +---- gdb/testsuite/gdb.base/sigaltstack.exp | 5 +---- gdb/testsuite/gdb.base/sigbpt.exp | 5 +---- gdb/testsuite/gdb.base/sigchld.exp | 5 +---- gdb/testsuite/gdb.base/siginfo-addr.exp | 5 +---- gdb/testsuite/gdb.base/siginfo-infcall.exp | 5 +---- gdb/testsuite/gdb.base/siginfo-obj.exp | 5 +---- gdb/testsuite/gdb.base/siginfo-thread.exp | 5 +---- gdb/testsuite/gdb.base/siginfo.exp | 5 +---- gdb/testsuite/gdb.base/signals.exp | 5 +---- gdb/testsuite/gdb.base/signest.exp | 5 +---- gdb/testsuite/gdb.base/signull.exp | 5 +---- gdb/testsuite/gdb.base/sigrepeat.exp | 5 +---- gdb/testsuite/gdb.base/sigstep.exp | 5 +---- gdb/testsuite/gdb.base/sigwinch-notty.exp | 5 +---- gdb/testsuite/gdb.base/structs.exp | 5 +---- gdb/testsuite/gdb.base/unwindonsignal.exp | 10 ++-------- gdb/testsuite/gdb.base/watch-cond-infcall.exp | 5 +---- gdb/testsuite/gdb.cp/gdb2495.exp | 10 ++-------- gdb/testsuite/gdb.fortran/array-slices.exp | 4 +--- gdb/testsuite/gdb.fortran/lbound-ubound.exp | 8 +++----- gdb/testsuite/gdb.gdb/python-helper.exp | 5 +---- gdb/testsuite/gdb.mi/mi-syn-frame.exp | 5 +---- gdb/testsuite/gdb.mi/mi-threads-interrupt.exp | 5 +---- gdb/testsuite/gdb.reverse/sigall-precsave.exp | 5 +---- gdb/testsuite/gdb.reverse/sigall-reverse.exp | 5 +---- gdb/testsuite/gdb.server/reconnect-ctrl-c.exp | 5 +---- gdb/testsuite/gdb.threads/continue-pending-status.exp | 5 +---- gdb/testsuite/gdb.threads/hand-call-in-threads.exp | 11 ++++------- gdb/testsuite/gdb.threads/interrupted-hand-call.exp | 11 ++++------- gdb/testsuite/gdb.threads/leader-exit.exp | 5 +---- gdb/testsuite/gdb.threads/manythreads.exp | 5 +---- gdb/testsuite/gdb.threads/multiple-step-overs.exp | 5 +---- gdb/testsuite/gdb.threads/names.exp | 4 +--- gdb/testsuite/gdb.threads/non-stop-fair-events.exp | 5 +---- gdb/testsuite/gdb.threads/pthreads.exp | 5 +---- gdb/testsuite/gdb.threads/schedlock.exp | 5 +---- .../gdb.threads/signal-command-handle-nopass.exp | 5 +---- .../signal-command-multiple-signals-pending.exp | 5 +---- .../gdb.threads/signal-delivered-right-thread.exp | 5 +---- gdb/testsuite/gdb.threads/signal-sigtrap.exp | 5 +---- .../signal-while-stepping-over-bp-other-thread.exp | 5 +---- gdb/testsuite/gdb.threads/sigthread.exp | 9 +++------ gdb/testsuite/gdb.threads/thread-unwindonsignal.exp | 11 ++++------- gdb/testsuite/gdb.trace/signal.exp | 5 +---- gdb/testsuite/gdb.tui/completion.exp | 4 +--- 75 files changed, 100 insertions(+), 341 deletions(-) diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.= exp index 17890745208..0b55c4444aa 100644 --- a/gdb/testsuite/gdb.base/args.exp +++ b/gdb/testsuite/gdb.base/args.exp @@ -16,9 +16,7 @@ # This is a test for the gdb invocation option --args. =20 # Skip test if target does not support argument passing. -if [target_info exists noargs] { - return -} +require {!target_info exists noargs} =20 # This test requires starting new inferior processes, skip it if the target # board is a stub. diff --git a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp b/gdb/tests= uite/gdb.base/bp-cmds-continue-ctrl-c.exp index d8eb353bd5b..f773fdbe3b8 100644 --- a/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp +++ b/gdb/testsuite/gdb.base/bp-cmds-continue-ctrl-c.exp @@ -19,16 +19,10 @@ # the terminal (between the stop and the re-resume), the resulting # "Quit" doesn't mess up the debug session. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 # This test requires sending ^C to interrupt the running target. -if [target_info exists gdb,nointerrupts] { - verbose "Skipping because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/branch-to-self.exp b/gdb/testsuite/gdb.= base/branch-to-self.exp index 0327955d7a0..abb12c0084e 100644 --- a/gdb/testsuite/gdb.base/branch-to-self.exp +++ b/gdb/testsuite/gdb.base/branch-to-self.exp @@ -15,10 +15,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping branch-to-self.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base= /call-ar-st.exp index 7e2aee6a4aa..8abd3b40d91 100644 --- a/gdb/testsuite/gdb.base/call-ar-st.exp +++ b/gdb/testsuite/gdb.base/call-ar-st.exp @@ -21,10 +21,7 @@ standard_testfile =20 # Some targets can't call functions, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 # Create and source the file that provides information about the compiler # used to compile the test case. diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base= /call-rt-st.exp index a84c1671e3a..9840e3cd8ed 100644 --- a/gdb/testsuite/gdb.base/call-rt-st.exp +++ b/gdb/testsuite/gdb.base/call-rt-st.exp @@ -19,7 +19,9 @@ # corresponding source file: call_return_struct.c =20 =20 - +# Some targets can't do function calls, so don't even bother with this +# test. +require {!target_info exists gdb,cannot_call_functions} =20 standard_testfile .c =20 @@ -28,13 +30,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${b= infile}" executable {deb return -1 } =20 -# Some targets can't do function calls, so don't even bother with this -# test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} - set allow_float_test [allow_float_test] =20 # Start with a fresh gdb. diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/ca= ll-sc.exp index cda6f618472..45728de53d3 100644 --- a/gdb/testsuite/gdb.base/call-sc.exp +++ b/gdb/testsuite/gdb.base/call-sc.exp @@ -22,10 +22,7 @@ # Some targets can't call functions, so don't even bother with this # test. =20 -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/= gdb.base/call-signal-resume.exp index 2388b9459d4..a08ca7e1cc3 100644 --- a/gdb/testsuite/gdb.base/call-signal-resume.exp +++ b/gdb/testsuite/gdb.base/call-signal-resume.exp @@ -20,10 +20,11 @@ # 2) Inferior is stopped at a signal. Upon resumption it should continue # with that signal, regardless of whatever the hand-called function did. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping call-signal-resume.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} + +# Some targets can't do function calls, so don't even bother with this +# test. +require {!target_info exists gdb,cannot_call_functions} =20 =20 standard_testfile call-signals.c @@ -33,13 +34,6 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${b= infile}" executable {deb return -1 } =20 -# Some targets can't do function calls, so don't even bother with this -# test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} - proc get_dummy_frame_number { } { global gdb_prompt =20 diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/= call-strs.exp index 90fe1763db8..f1577cb44df 100644 --- a/gdb/testsuite/gdb.base/call-strs.exp +++ b/gdb/testsuite/gdb.base/call-strs.exp @@ -27,10 +27,7 @@ standard_testfile =20 # Some targets can't call functions, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 =20 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { diff --git a/gdb/testsuite/gdb.base/callexit.exp b/gdb/testsuite/gdb.base/c= allexit.exp index 4ed68936ae4..a6849796686 100644 --- a/gdb/testsuite/gdb.base/callexit.exp +++ b/gdb/testsuite/gdb.base/callexit.exp @@ -23,10 +23,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${b= infile}" executable {deb =20 # Some targets can't do function calls, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 # Start with a fresh gdb. =20 diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/= callfuncs.exp index 9bbf108ac0e..2c797a224a7 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -27,10 +27,7 @@ if [support_complex_tests] { =20 # Some targets can't do function calls, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 set allow_float_test [allow_float_test] =20 diff --git a/gdb/testsuite/gdb.base/cast-call.exp b/gdb/testsuite/gdb.base/= cast-call.exp index d80524f35a7..7e55cd33c45 100644 --- a/gdb/testsuite/gdb.base/cast-call.exp +++ b/gdb/testsuite/gdb.base/cast-call.exp @@ -16,10 +16,7 @@ # along with this program. If not, see . =20 =20 -if {[target_info exists gdb,cannot_call_functions]} { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp b/gdb/test= suite/gdb.base/catch-gdb-caused-signals.exp index 580221c8551..9908c1af539 100644 --- a/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp +++ b/gdb/testsuite/gdb.base/catch-gdb-caused-signals.exp @@ -23,10 +23,7 @@ standard_testfile =20 # Some targets can't call functions, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "cannot call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 set dp_location [gdb_get_line_number "set dprintf here"] set bp_location [gdb_get_line_number "set breakpoint here"] diff --git a/gdb/testsuite/gdb.base/catch-signal-fork.exp b/gdb/testsuite/g= db.base/catch-signal-fork.exp index 3dac304a407..fce5b65c701 100644 --- a/gdb/testsuite/gdb.base/catch-signal-fork.exp +++ b/gdb/testsuite/gdb.base/catch-signal-fork.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping catch-signal-fork.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp b/gdb/tes= tsuite/gdb.base/catch-signal-siginfo-cond.exp index 182b2f25faa..7a9452f2d55 100644 --- a/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp +++ b/gdb/testsuite/gdb.base/catch-signal-siginfo-cond.exp @@ -25,10 +25,7 @@ # 56 return INLINE_SYSCALL (tgkill, 3, pid, selftid, sig); # (gdb) FAIL: gdb.base/catch-signal-siginfo-cond.exp: continue =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping catch-signal-siginfo-cond.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 require supports_get_siginfo_type =20 diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.ba= se/catch-signal.exp index 774eb8ee856..b3f202f951d 100644 --- a/gdb/testsuite/gdb.base/catch-signal.exp +++ b/gdb/testsuite/gdb.base/catch-signal.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping catch-signal.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/exitsignal.exp b/gdb/testsuite/gdb.base= /exitsignal.exp index d38e9ff7a05..24e4aa1f3ae 100644 --- a/gdb/testsuite/gdb.base/exitsignal.exp +++ b/gdb/testsuite/gdb.base/exitsignal.exp @@ -21,10 +21,7 @@ # killed by a signal. However, if it was killed by an uncaught # signal, then there is no way for it to have exited. =20 -if { [target_info exists gdb,nosignals] } { - verbose "Skipping exitsignal.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile segv.c =20 diff --git a/gdb/testsuite/gdb.base/fileio.exp b/gdb/testsuite/gdb.base/fil= eio.exp index 09ca29eebee..33c88d064c4 100644 --- a/gdb/testsuite/gdb.base/fileio.exp +++ b/gdb/testsuite/gdb.base/fileio.exp @@ -15,10 +15,7 @@ =20 # This file was written by Corinna Vinschen =20 -if [target_info exists gdb,nofileio] { - verbose "Skipping fileio.exp because of no fileio capabilities." - return -} +require {!target_info exists gdb,nofileio} =20 =20 standard_testfile diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.= exp index d1dac02770b..e28310c6eef 100644 --- a/gdb/testsuite/gdb.base/huge.exp +++ b/gdb/testsuite/gdb.base/huge.exp @@ -19,9 +19,7 @@ # Define if you want to skip this test # (could be very time-consuming on remote targets with slow connection). # -if [target_info exists gdb,skip_huge_test] { - return -} +require {!target_info exists gdb,skip_huge_test} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/infcall-input.exp b/gdb/testsuite/gdb.b= ase/infcall-input.exp index 1de3bc9f07d..2e276b65e97 100644 --- a/gdb/testsuite/gdb.base/infcall-input.exp +++ b/gdb/testsuite/gdb.base/infcall-input.exp @@ -18,10 +18,7 @@ =20 standard_testfile =20 -if [target_info exists gdb,cannot_call_functions] { - unsupported "can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 diff --git a/gdb/testsuite/gdb.base/inferior-args.exp b/gdb/testsuite/gdb.b= ase/inferior-args.exp index 3d381739338..19bada6d2c7 100644 --- a/gdb/testsuite/gdb.base/inferior-args.exp +++ b/gdb/testsuite/gdb.base/inferior-args.exp @@ -16,10 +16,7 @@ # Test running an inferior with arguments. =20 # This does not work on boards that don't support inferior arguments. -if {[target_info exists noargs]} { - verbose "skipping gdb.base/inferior-args.exp because of noargs" - return -} +require {!target_info exists noargs} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp b/gdb/tests= uite/gdb.base/interrupt-daemon-attach.exp index 0448de1de77..ba3383f3acf 100644 --- a/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp +++ b/gdb/testsuite/gdb.base/interrupt-daemon-attach.exp @@ -13,16 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . */ =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping interrupt-daemon-attach.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 # This test requires sending ^C to interrupt the running target. -if [target_info exists gdb,nointerrupts] { - verbose "Skipping interrupt-daemon-attach.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 require can_spawn_for_attach =20 diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/= interrupt.exp index 815994287d4..19628e2f419 100644 --- a/gdb/testsuite/gdb.base/interrupt.exp +++ b/gdb/testsuite/gdb.base/interrupt.exp @@ -13,15 +13,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nointerrupts] { - verbose "Skipping interrupt.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 -if [target_info exists gdb,noinferiorio] { - verbose "Skipping interrupt.exp because of noinferiorio." - return -} +require {!target_info exists gdb,noinferiorio} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/kill-after-signal.exp b/gdb/testsuite/g= db.base/kill-after-signal.exp index 1372c9670ee..5ca84a9e436 100644 --- a/gdb/testsuite/gdb.base/kill-after-signal.exp +++ b/gdb/testsuite/gdb.base/kill-after-signal.exp @@ -17,10 +17,7 @@ standard_testfile .c =20 require can_single_step_to_signal_handler =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping kill-after-signal.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 if [prepare_for_testing "failed to prepare" ${testfile}] { return -1 diff --git a/gdb/testsuite/gdb.base/long-inferior-output.exp b/gdb/testsuit= e/gdb.base/long-inferior-output.exp index 58fd715a5c5..a287fdcdb47 100644 --- a/gdb/testsuite/gdb.base/long-inferior-output.exp +++ b/gdb/testsuite/gdb.base/long-inferior-output.exp @@ -28,10 +28,7 @@ # # 4. The breakpoint is never reached. =20 -if [target_info exists gdb,noinferiorio] { - verbose "Skipping because of noinferiorio." - return -} +require {!target_info exists gdb,noinferiorio} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/= long_long.exp index 3e72d69ece9..6aa26f1d1a1 100644 --- a/gdb/testsuite/gdb.base/long_long.exp +++ b/gdb/testsuite/gdb.base/long_long.exp @@ -18,9 +18,7 @@ # long_long.exp Test printing of 64-bit things in 32-bit gdb. # Also test differnet kinds of formats. # -if [target_info exists no_long_long] { - return 0 -} +require {!target_info exists no_long_long} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp b/gdb= /testsuite/gdb.base/paginate-after-ctrl-c-running.exp index 05f89e43298..f1296080b73 100644 --- a/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp +++ b/gdb/testsuite/gdb.base/paginate-after-ctrl-c-running.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nointerrupts] { - verbose "Skipping paginate-after-ctrl-c-running.exp because of nointer= rupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/random-signal.exp b/gdb/testsuite/gdb.b= ase/random-signal.exp index b08a1c5feb9..7e53c91eca3 100644 --- a/gdb/testsuite/gdb.base/random-signal.exp +++ b/gdb/testsuite/gdb.base/random-signal.exp @@ -13,16 +13,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping catch-signal.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 # This test requires sending ^C to interrupt the running target. -if [target_info exists gdb,nointerrupts] { - verbose "Skipping random-signal.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/relativedebug.exp b/gdb/testsuite/gdb.b= ase/relativedebug.exp index 004d3d98911..41eb0ccc111 100644 --- a/gdb/testsuite/gdb.base/relativedebug.exp +++ b/gdb/testsuite/gdb.base/relativedebug.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping relativedebug.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/savedregs.exp b/gdb/testsuite/gdb.base/= savedregs.exp index 598d51b2c47..212fa61d0c2 100644 --- a/gdb/testsuite/gdb.base/savedregs.exp +++ b/gdb/testsuite/gdb.base/savedregs.exp @@ -24,10 +24,7 @@ # instructions executed to perform the call may affect "info frame" # output. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping savedregs.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/sigall.exp b/gdb/testsuite/gdb.base/sig= all.exp index 7f78d24e1ec..5b623210d62 100644 --- a/gdb/testsuite/gdb.base/sigall.exp +++ b/gdb/testsuite/gdb.base/sigall.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigall.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/sigaltstack.exp b/gdb/testsuite/gdb.bas= e/sigaltstack.exp index 6acc4dad70d..3f1348a9bf7 100644 --- a/gdb/testsuite/gdb.base/sigaltstack.exp +++ b/gdb/testsuite/gdb.base/sigaltstack.exp @@ -22,10 +22,7 @@ # This test confirms that GDB can both backtrace through and finish # such a stack. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigaltstack.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/sigbpt.exp b/gdb/testsuite/gdb.base/sig= bpt.exp index e5dace1b0fd..892d756e467 100644 --- a/gdb/testsuite/gdb.base/sigbpt.exp +++ b/gdb/testsuite/gdb.base/sigbpt.exp @@ -28,10 +28,7 @@ # instruction. Since the kernel problems can be "fixed" using # software single-step this is KFAILed rather than XFAILed. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigbpt.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile diff --git a/gdb/testsuite/gdb.base/sigchld.exp b/gdb/testsuite/gdb.base/si= gchld.exp index 2374e1e59bf..532e22e0c1c 100644 --- a/gdb/testsuite/gdb.base/sigchld.exp +++ b/gdb/testsuite/gdb.base/sigchld.exp @@ -16,10 +16,7 @@ # Check that GDB isn't messing the SIGCHLD mask while creating an # inferior. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigchld.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/siginfo-addr.exp b/gdb/testsuite/gdb.ba= se/siginfo-addr.exp index b11b4611d87..a2359fd1572 100644 --- a/gdb/testsuite/gdb.base/siginfo-addr.exp +++ b/gdb/testsuite/gdb.base/siginfo-addr.exp @@ -21,10 +21,7 @@ # This test confirms that the si_addr value is correct rather than # having been corrupted when GDB passed the signal on to the handler. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping siginfo-addr.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { diff --git a/gdb/testsuite/gdb.base/siginfo-infcall.exp b/gdb/testsuite/gdb= .base/siginfo-infcall.exp index fdc7e01dc3e..efc83b01984 100644 --- a/gdb/testsuite/gdb.base/siginfo-infcall.exp +++ b/gdb/testsuite/gdb.base/siginfo-infcall.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping siginfo-infcall.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/siginfo-obj.exp b/gdb/testsuite/gdb.bas= e/siginfo-obj.exp index 9d8bfe75731..634d9263320 100644 --- a/gdb/testsuite/gdb.base/siginfo-obj.exp +++ b/gdb/testsuite/gdb.base/siginfo-obj.exp @@ -21,10 +21,7 @@ # This test confirms that we can inspect signal info using the # $_siginfo convenience variable. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping siginfo-obj.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 require supports_get_siginfo_type =20 diff --git a/gdb/testsuite/gdb.base/siginfo-thread.exp b/gdb/testsuite/gdb.= base/siginfo-thread.exp index 718889fcc47..122be719c4b 100644 --- a/gdb/testsuite/gdb.base/siginfo-thread.exp +++ b/gdb/testsuite/gdb.base/siginfo-thread.exp @@ -16,10 +16,7 @@ =20 # Multi-threaded siginfo test. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping siginfo-thread.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 require supports_get_siginfo_type =20 diff --git a/gdb/testsuite/gdb.base/siginfo.exp b/gdb/testsuite/gdb.base/si= ginfo.exp index 1a6ad9b9ae3..4083120990c 100644 --- a/gdb/testsuite/gdb.base/siginfo.exp +++ b/gdb/testsuite/gdb.base/siginfo.exp @@ -23,10 +23,7 @@ # alternative sa_sigaction signal handler, and second that GDB can # nexti/stepi out of such a handler. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping siginfo.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/si= gnals.exp index 6c41739348f..338cf4b298c 100644 --- a/gdb/testsuite/gdb.base/signals.exp +++ b/gdb/testsuite/gdb.base/signals.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping signals.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/signest.exp b/gdb/testsuite/gdb.base/si= gnest.exp index 1785f89a70c..65c87c3fbb1 100644 --- a/gdb/testsuite/gdb.base/signest.exp +++ b/gdb/testsuite/gdb.base/signest.exp @@ -17,10 +17,7 @@ =20 standard_testfile =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 if [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debug}= ] { return -1 diff --git a/gdb/testsuite/gdb.base/signull.exp b/gdb/testsuite/gdb.base/si= gnull.exp index a7cda03c315..9facc6d8a66 100644 --- a/gdb/testsuite/gdb.base/signull.exp +++ b/gdb/testsuite/gdb.base/signull.exp @@ -27,10 +27,7 @@ =20 # This also tests backtrace/gdb1476. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping signull.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/sigrepeat.exp b/gdb/testsuite/gdb.base/= sigrepeat.exp index 26d2dee6c4f..8726f85deb8 100644 --- a/gdb/testsuite/gdb.base/sigrepeat.exp +++ b/gdb/testsuite/gdb.base/sigrepeat.exp @@ -19,10 +19,7 @@ # sigalrm signals and hence cause repeated signal delivery without any # cpu advancment. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigrepeat.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/sigstep.exp b/gdb/testsuite/gdb.base/si= gstep.exp index 54cdfda5f29..51737f58760 100644 --- a/gdb/testsuite/gdb.base/sigstep.exp +++ b/gdb/testsuite/gdb.base/sigstep.exp @@ -21,10 +21,7 @@ # This test runs the program up to the signal handler, and then # attempts to step/next out of the handler and back into main. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigstep.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 standard_testfile diff --git a/gdb/testsuite/gdb.base/sigwinch-notty.exp b/gdb/testsuite/gdb.= base/sigwinch-notty.exp index 0be07910228..efb0baff12c 100644 --- a/gdb/testsuite/gdb.base/sigwinch-notty.exp +++ b/gdb/testsuite/gdb.base/sigwinch-notty.exp @@ -17,10 +17,7 @@ # without readline, and, it receives a SIGWINCH. Regression test for # PR gdb/26056. =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping $subdir/$gdb_test_file_name.exp because of nosignals= ." - return -} +require {!target_info exists gdb,nosignals} =20 # The testfile relies on "run" from the command line, so only works # with "target native". diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/st= ructs.exp index 0a1920501c4..abfaabc3ed5 100644 --- a/gdb/testsuite/gdb.base/structs.exp +++ b/gdb/testsuite/gdb.base/structs.exp @@ -19,10 +19,7 @@ # Some targets can't call functions, so don't even bother with this # test. =20 -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.= base/unwindonsignal.exp index d10d1fe244d..625b0c4db12 100644 --- a/gdb/testsuite/gdb.base/unwindonsignal.exp +++ b/gdb/testsuite/gdb.base/unwindonsignal.exp @@ -13,18 +13,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping unwindonsignal.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 =20 # Some targets can't do function calls, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/watch-cond-infcall.exp b/gdb/testsuite/= gdb.base/watch-cond-infcall.exp index c8f5d584fc7..7daa2b76164 100644 --- a/gdb/testsuite/gdb.base/watch-cond-infcall.exp +++ b/gdb/testsuite/gdb.base/watch-cond-infcall.exp @@ -26,10 +26,7 @@ set allow_hw_watchpoint_tests_p [allow_hw_watchpoint_tes= ts] =20 standard_testfile =20 -if [target_info exists gdb,cannot_call_functions] { - unsupported "can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 if { [build_executable ${testfile}.exp ${testfile} ${testfile}.c {debug}] = } { untested "failed to compile" diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb249= 5.exp index 0cb8bdd0ada..e3c0cca3175 100644 --- a/gdb/testsuite/gdb.cp/gdb2495.exp +++ b/gdb/testsuite/gdb.cp/gdb2495.exp @@ -33,19 +33,13 @@ =20 require allow_cplus_tests =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping gdb2495.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 standard_testfile .cc =20 # Some targets can't do function calls, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return -} +require {!target_info exists gdb,cannot_call_functions} =20 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++= }]} { return -1 diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb= .fortran/array-slices.exp index 56bed15e965..ce17b8dc268 100644 --- a/gdb/testsuite/gdb.fortran/array-slices.exp +++ b/gdb/testsuite/gdb.fortran/array-slices.exp @@ -36,9 +36,7 @@ require allow_fortran_tests =20 # This test relies on output from the inferior. -if [target_info exists gdb,noinferiorio] { - return -1 -} +require {!target_info exists gdb,noinferiorio} =20 standard_testfile ".f90" load_lib fortran.exp diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gd= b.fortran/lbound-ubound.exp index bb652a9223c..fced41f9fe3 100644 --- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp +++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp @@ -17,6 +17,9 @@ =20 require allow_fortran_tests =20 +# This test relies on output from the inferior. +require {!target_info exists gdb,noinferiorio} + standard_testfile ".F90" load_lib fortran.exp =20 @@ -32,11 +35,6 @@ if ![fortran_runto_main] { return -1 } =20 -# This test relies on output from the inferior. -if [target_info exists gdb,noinferiorio] { - return 0 -} - # Avoid libc symbols, in particular the 'array' type. gdb_test_no_output "nosharedlibrary" =20 diff --git a/gdb/testsuite/gdb.gdb/python-helper.exp b/gdb/testsuite/gdb.gd= b/python-helper.exp index 16b419984cf..dbd78cbcf78 100644 --- a/gdb/testsuite/gdb.gdb/python-helper.exp +++ b/gdb/testsuite/gdb.gdb/python-helper.exp @@ -19,10 +19,7 @@ =20 load_lib selftest-support.exp =20 -if [target_info exists gdb,noinferiorio] { - verbose "Skipping because of no inferiorio capabilities." - return -} +require {!target_info exists gdb,noinferiorio} =20 require allow_python_tests =20 diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/m= i-syn-frame.exp index 5b3e60f4f34..40df312a1cc 100644 --- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp @@ -16,10 +16,7 @@ # Test MI output with synthetic frames on the stack (call dummies, # signal handlers). =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping mi-syn-frame.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 load_lib mi-support.exp set MIFLAGS "-i=3Dmi" diff --git a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp b/gdb/testsuite/= gdb.mi/mi-threads-interrupt.exp index 149940d6743..bbb82195fb7 100644 --- a/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp +++ b/gdb/testsuite/gdb.mi/mi-threads-interrupt.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nointerrupts] { - verbose "Skipping mi-threads-interrupt.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 load_lib mi-support.exp set MIFLAGS "-i=3Dmi" diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/= gdb.reverse/sigall-precsave.exp index e2a786a7b9b..7bbffa18219 100644 --- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp +++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigall-precsave.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 require supports_reverse =20 diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/g= db.reverse/sigall-reverse.exp index 7891dca92a9..ffbcac7bb5f 100644 --- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp +++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp @@ -13,10 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping sigall-reverse.exp because of nosignals." - return -} +require {!target_info exists gdb,nosignals} =20 require supports_reverse =20 diff --git a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp b/gdb/testsuite/= gdb.server/reconnect-ctrl-c.exp index 6146cc3888e..d7a934d519f 100644 --- a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp +++ b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp @@ -21,10 +21,7 @@ load_lib gdbserver-support.exp =20 require allow_gdbserver_tests =20 -if [target_info exists gdb,nointerrupts] { - verbose "Skipping reconnect-ctrl-c.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/continue-pending-status.exp b/gdb/te= stsuite/gdb.threads/continue-pending-status.exp index 6132a0f9903..8cf65e4993d 100644 --- a/gdb/testsuite/gdb.threads/continue-pending-status.exp +++ b/gdb/testsuite/gdb.threads/continue-pending-status.exp @@ -17,10 +17,7 @@ # thread, then switching to a thread that has a status pending and # continuing. =20 -if [target_info exists gdb,nointerrupts] { - verbose "Skipping continue-pending-status.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp b/gdb/tests= uite/gdb.threads/hand-call-in-threads.exp index 336199112b0..58039ddd30e 100644 --- a/gdb/testsuite/gdb.threads/hand-call-in-threads.exp +++ b/gdb/testsuite/gdb.threads/hand-call-in-threads.exp @@ -19,15 +19,12 @@ set NR_THREADS 4 =20 standard_testfile =20 -if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" ex= ecutable [list debug "additional_flags=3D-DNR_THREADS=3D$NR_THREADS"]] !=3D= "" } { - return -1 -} - # Some targets can't do function calls, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return +require {!target_info exists gdb,cannot_call_functions} + +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" ex= ecutable [list debug "additional_flags=3D-DNR_THREADS=3D$NR_THREADS"]] !=3D= "" } { + return -1 } =20 proc get_dummy_frame_number { } { diff --git a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp b/gdb/test= suite/gdb.threads/interrupted-hand-call.exp index ed1ea9fe64d..0edc645fe66 100644 --- a/gdb/testsuite/gdb.threads/interrupted-hand-call.exp +++ b/gdb/testsuite/gdb.threads/interrupted-hand-call.exp @@ -20,15 +20,12 @@ set NR_THREADS 4 =20 standard_testfile =20 -if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" ex= ecutable [list debug "additional_flags=3D-DNR_THREADS=3D$NR_THREADS"]] !=3D= "" } { - return -1 -} - # Some targets can't do function calls, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return +require {!target_info exists gdb,cannot_call_functions} + +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" ex= ecutable [list debug "additional_flags=3D-DNR_THREADS=3D$NR_THREADS"]] !=3D= "" } { + return -1 } =20 clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.threads/leader-exit.exp b/gdb/testsuite/gdb.= threads/leader-exit.exp index df392c7b635..95811e975aa 100644 --- a/gdb/testsuite/gdb.threads/leader-exit.exp +++ b/gdb/testsuite/gdb.threads/leader-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 . =20 -if [target_info exists gdb,nointerrupts] { - verbose "Skipping leader-exit.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 # Exit of the thread group leader should not break GDB. =20 diff --git a/gdb/testsuite/gdb.threads/manythreads.exp b/gdb/testsuite/gdb.= threads/manythreads.exp index da3f66a810b..5a176519051 100644 --- a/gdb/testsuite/gdb.threads/manythreads.exp +++ b/gdb/testsuite/gdb.threads/manythreads.exp @@ -17,10 +17,7 @@ # This file was written by Jeff Johnston. (jjohnstn@redhat.com) =20 # This test requires sending ^C to interrupt the running target. -if [target_info exists gdb,nointerrupts] { - verbose "Skipping manythreads.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/multiple-step-overs.exp b/gdb/testsu= ite/gdb.threads/multiple-step-overs.exp index fffdb7464d9..5e8b0251d97 100644 --- a/gdb/testsuite/gdb.threads/multiple-step-overs.exp +++ b/gdb/testsuite/gdb.threads/multiple-step-overs.exp @@ -19,10 +19,7 @@ standard_testfile set executable ${testfile} =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable [list debug "incdir=3D${objdir}"]] !=3D "" } { diff --git a/gdb/testsuite/gdb.threads/names.exp b/gdb/testsuite/gdb.thread= s/names.exp index f90e4aa2f7b..5622e4e76c2 100644 --- a/gdb/testsuite/gdb.threads/names.exp +++ b/gdb/testsuite/gdb.threads/names.exp @@ -16,9 +16,7 @@ # Verify that thread name features work properly (e.g. they show up in info # threads). =20 -if [target_info exists gdb,no_thread_names] { - return -} +require {!target_info exists gdb,no_thread_names} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/non-stop-fair-events.exp b/gdb/tests= uite/gdb.threads/non-stop-fair-events.exp index 8ce5712f0c1..4b063f3e072 100644 --- a/gdb/testsuite/gdb.threads/non-stop-fair-events.exp +++ b/gdb/testsuite/gdb.threads/non-stop-fair-events.exp @@ -19,10 +19,7 @@ standard_testfile set executable ${testfile} =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 set options { "additional_flags=3D-DTIMEOUT=3D$timeout" debug pthreads } if {[prepare_for_testing "failed to prepare" $testfile $srcfile $options] = =3D=3D -1} { diff --git a/gdb/testsuite/gdb.threads/pthreads.exp b/gdb/testsuite/gdb.thr= eads/pthreads.exp index acd073cd5e9..41a7cb3800f 100644 --- a/gdb/testsuite/gdb.threads/pthreads.exp +++ b/gdb/testsuite/gdb.threads/pthreads.exp @@ -16,10 +16,7 @@ # This file was written by Fred Fish. (fnf@cygnus.com) =20 # This test requires sending ^C to interrupt the running target. -if [target_info exists gdb,nointerrupts] { - verbose "Skipping pthreads.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/schedlock.exp b/gdb/testsuite/gdb.th= reads/schedlock.exp index 08435015f14..3c60f6b3478 100644 --- a/gdb/testsuite/gdb.threads/schedlock.exp +++ b/gdb/testsuite/gdb.threads/schedlock.exp @@ -20,10 +20,7 @@ =20 # This test requires sending ^C to interrupt the running target. =20 -if [target_info exists gdb,nointerrupts] { - verbose "Skipping schedlock.exp because of nointerrupts." - return -} +require {!target_info exists gdb,nointerrupts} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp b/g= db/testsuite/gdb.threads/signal-command-handle-nopass.exp index ed03e7ae77a..a099dbbb974 100644 --- a/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp +++ b/gdb/testsuite/gdb.threads/signal-command-handle-nopass.exp @@ -20,10 +20,7 @@ =20 standard_testfile =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable { debug }] !=3D "" } { diff --git a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pend= ing.exp b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending= .exp index ac391ea77fd..0802e403b5d 100644 --- a/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp +++ b/gdb/testsuite/gdb.threads/signal-command-multiple-signals-pending.exp @@ -18,10 +18,7 @@ =20 standard_testfile =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable { debug }] !=3D "" } { diff --git a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp b/= gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp index fb4cbb0ec57..3407cfa0645 100644 --- a/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp +++ b/gdb/testsuite/gdb.threads/signal-delivered-right-thread.exp @@ -15,10 +15,7 @@ =20 standard_testfile =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable { debug }] !=3D "" } { diff --git a/gdb/testsuite/gdb.threads/signal-sigtrap.exp b/gdb/testsuite/g= db.threads/signal-sigtrap.exp index b452731f277..1f524511ee9 100644 --- a/gdb/testsuite/gdb.threads/signal-sigtrap.exp +++ b/gdb/testsuite/gdb.threads/signal-sigtrap.exp @@ -18,10 +18,7 @@ =20 standard_testfile =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 if {[build_executable "failed to prepare" $testfile $srcfile \ {debug pthreads}]} { diff --git a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-= thread.exp b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-= thread.exp index 65ecdcd5e33..7eba5bb7dca 100644 --- a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.= exp +++ b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.= exp @@ -25,10 +25,7 @@ require !gdb_debug_enabled standard_testfile set executable ${testfile} =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping ${testfile}.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable [list debug "incdir=3D${objdir}"]] !=3D "" } { diff --git a/gdb/testsuite/gdb.threads/sigthread.exp b/gdb/testsuite/gdb.th= reads/sigthread.exp index ce84357a6e5..5499c50e38f 100644 --- a/gdb/testsuite/gdb.threads/sigthread.exp +++ b/gdb/testsuite/gdb.threads/sigthread.exp @@ -16,6 +16,9 @@ =20 standard_testfile =20 +# This test requires sending ^C to interrupt the running target. +require {!target_info exists gdb,nointerrupts} + if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" \ executable { debug }] !=3D "" } { return -1 @@ -36,12 +39,6 @@ gdb_test_multiple "continue" "continue" { } } =20 -# This test requires sending ^C to interrupt the running target. -if [target_info exists gdb,nointerrupts] { - verbose "Skipping sigthread.exp because of nointerrupts." - return -} - # For this to work we must be sure to consume the "Continuing." # message first, or GDB's signal handler may not be in place. after 500 {send_gdb "\003"} diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/test= suite/gdb.threads/thread-unwindonsignal.exp index b3e3288ba69..68a99f66f1c 100644 --- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp +++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp @@ -20,15 +20,12 @@ set NR_THREADS 4 =20 standard_testfile interrupted-hand-call.c =20 -if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" ex= ecutable [list debug "additional_flags=3D-DNR_THREADS=3D$NR_THREADS"]] !=3D= "" } { - return -1 -} - # Some targets can't do function calls, so don't even bother with this # test. -if [target_info exists gdb,cannot_call_functions] { - unsupported "this target can not call functions" - return +require {!target_info exists gdb,cannot_call_functions} + +if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" ex= ecutable [list debug "additional_flags=3D-DNR_THREADS=3D$NR_THREADS"]] !=3D= "" } { + return -1 } =20 clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.trace/signal.exp b/gdb/testsuite/gdb.trace/s= ignal.exp index f64b7db2189..b02198e6247 100644 --- a/gdb/testsuite/gdb.trace/signal.exp +++ b/gdb/testsuite/gdb.trace/signal.exp @@ -28,10 +28,7 @@ =20 load_lib "trace-support.exp" =20 -if [target_info exists gdb,nosignals] { - verbose "Skipping signal.exp because of nosignals." - return -1 -} +require {!target_info exists gdb,nosignals} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.tui/completion.exp b/gdb/testsuite/gdb.tui/c= ompletion.exp index 97d0f806a81..0a959b4ff8b 100644 --- a/gdb/testsuite/gdb.tui/completion.exp +++ b/gdb/testsuite/gdb.tui/completion.exp @@ -19,9 +19,7 @@ tuiterm_env =20 clean_restart =20 -if {[target_info exists gdb,nointerrupts]} { - return -} +require {!target_info exists gdb,nointerrupts} =20 gdb_test_no_output "set max-completions unlimited"