From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 784B7385417F; Fri, 13 Jan 2023 20:36:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 784B7385417F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642193; bh=WSrwE6NofG4gYnt54Yb28hRqABFZaV3Jd5IGpOQlEio=; h=From:To:Subject:Date:From; b=MeVz2Ba2196xLueoau6FfQP+WddRXki/2WoYzUT7QNKLlSUUMSaQlE4YAQjmtzD5b OSKSHaWL8iua+TdUhPwio4P1TeNyP91IztfJz+VJ02s0eXiJaiv7/oE6cCl1mM4HBk pyeijIJ7KRXee4Gkbs33Ml/l4CsXpWheXB1QKecU= 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 !use_gdb_stub X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 1b1f4ab760127c31d520811e2858277bb7f651e2 X-Git-Newrev: 8ce7423fda0c4b148cc0a48c68ba103476f3f5b7 Message-Id: <20230113203633.784B7385417F@sourceware.org> Date: Fri, 13 Jan 2023 20:36:33 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D8ce7423fda0c= 4b148cc0a48c68ba103476f3f5b7 commit 8ce7423fda0c4b148cc0a48c68ba103476f3f5b7 Author: Tom Tromey Date: Wed Dec 14 10:02:49 2022 -0700 Use require !use_gdb_stub =20 This changes some tests to use "require !use_gdb_stub". Diff: --- gdb/testsuite/gdb.ada/exec_changed.exp | 5 +---- gdb/testsuite/gdb.ada/start.exp | 5 +---- gdb/testsuite/gdb.base/args.exp | 4 +--- gdb/testsuite/gdb.base/async-shell.exp | 4 +--- gdb/testsuite/gdb.base/attach-pie-misread.exp | 3 ++- gdb/testsuite/gdb.base/attach-wait-input.exp | 4 +--- gdb/testsuite/gdb.base/break-entry.exp | 5 +---- gdb/testsuite/gdb.base/break-interp.exp | 3 ++- gdb/testsuite/gdb.base/cached-source-file.exp | 3 ++- gdb/testsuite/gdb.base/dprintf-detach.exp | 4 +--- gdb/testsuite/gdb.base/fork-print-inferior-events.exp | 5 +---- gdb/testsuite/gdb.base/nostdlib.exp | 5 +---- gdb/testsuite/gdb.base/reread-readsym.exp | 4 +--- gdb/testsuite/gdb.base/run-control-while-bg-execution.exp | 5 +---- gdb/testsuite/gdb.base/set-cwd.exp | 5 +---- gdb/testsuite/gdb.base/share-env-with-gdbserver.exp | 5 +---- gdb/testsuite/gdb.base/solib-display.exp | 4 +--- gdb/testsuite/gdb.base/solib-nodir.exp | 4 +--- gdb/testsuite/gdb.base/start-cpp.exp | 5 +---- gdb/testsuite/gdb.base/start.exp | 5 +---- gdb/testsuite/gdb.base/startup-with-shell.exp | 5 +---- gdb/testsuite/gdb.base/testenv.exp | 4 +--- gdb/testsuite/gdb.base/watchpoint-hw.exp | 5 +---- gdb/testsuite/gdb.btrace/multi-inferior.exp | 5 +---- gdb/testsuite/gdb.dwarf2/main-subprogram.exp | 5 +---- gdb/testsuite/gdb.mi/mi-exec-run.exp | 5 +---- gdb/testsuite/gdb.mi/mi-start.exp | 5 +---- gdb/testsuite/gdb.mi/user-selected-context-sync.exp | 5 +---- gdb/testsuite/gdb.multi/attach-while-running.exp | 5 +---- gdb/testsuite/gdb.multi/dummy-frame-restore.exp | 4 +--- gdb/testsuite/gdb.multi/multi-arch-exec.exp | 4 +--- gdb/testsuite/gdb.multi/multi-arch.exp | 4 +--- gdb/testsuite/gdb.multi/multi-exit.exp | 4 +--- gdb/testsuite/gdb.multi/multi-kill.exp | 4 +--- gdb/testsuite/gdb.multi/run-only-second-inf.exp | 4 +--- gdb/testsuite/gdb.multi/start-inferior-specific.exp | 4 +--- gdb/testsuite/gdb.multi/tids-gid-reset.exp | 5 +---- gdb/testsuite/gdb.multi/tids.exp | 5 +---- gdb/testsuite/gdb.multi/watchpoint-multi.exp | 5 +---- gdb/testsuite/gdb.python/py-events.exp | 4 +--- gdb/testsuite/gdb.threads/attach-into-signal.exp | 4 ++-- gdb/testsuite/gdb.threads/attach-slow-waitpid.exp | 4 ++-- gdb/testsuite/gdb.threads/attach-stopped.exp | 4 ++-- gdb/testsuite/gdb.threads/vfork-multi-inferior.exp | 5 +---- gdb/testsuite/gdb.tui/corefile-run.exp | 3 ++- 45 files changed, 52 insertions(+), 146 deletions(-) diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada= /exec_changed.exp index 9ccc46a98d7..1580077bb77 100644 --- a/gdb/testsuite/gdb.ada/exec_changed.exp +++ b/gdb/testsuite/gdb.ada/exec_changed.exp @@ -19,10 +19,7 @@ require !skip_ada_tests =20 # This testcase verifies the behavior of the `start' command, which # does not work when we use the gdb stub... -if [use_gdb_stub] { - untested "skipping tests due to use_gdb_stub" - return -} +require !use_gdb_stub =20 standard_ada_testfile first =20 diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.= exp index 08a61212487..212d837f05f 100644 --- a/gdb/testsuite/gdb.ada/start.exp +++ b/gdb/testsuite/gdb.ada/start.exp @@ -19,10 +19,7 @@ require !skip_ada_tests =20 # This testcase verifies the behavior of the `start' command, which # does not work when we use the gdb stub... -if [use_gdb_stub] { - untested "skipping test due to gdb stub" - return -} +require !use_gdb_stub =20 standard_ada_testfile dummy =20 diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.= exp index 6c19c7a1d61..17890745208 100644 --- a/gdb/testsuite/gdb.base/args.exp +++ b/gdb/testsuite/gdb.base/args.exp @@ -22,9 +22,7 @@ if [target_info exists noargs] { =20 # This test requires starting new inferior processes, skip it if the target # board is a stub. -if [use_gdb_stub] { - return -} +require !use_gdb_stub =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/async-shell.exp b/gdb/testsuite/gdb.bas= e/async-shell.exp index e79fe143455..fb56d2602b1 100644 --- a/gdb/testsuite/gdb.base/async-shell.exp +++ b/gdb/testsuite/gdb.base/async-shell.exp @@ -18,9 +18,7 @@ standard_testfile require support_displaced_stepping =20 # The testfile uses "run". The real bug happened only for ![is_remote tar= get]. -if [use_gdb_stub] { - return 0 -} +require !use_gdb_stub =20 save_vars { GDBFLAGS } { set GDBFLAGS "$GDBFLAGS -ex \"set non-stop on\"" diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/= gdb.base/attach-pie-misread.exp index f89c5faee88..cd96a6ea76a 100644 --- a/gdb/testsuite/gdb.base/attach-pie-misread.exp +++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp @@ -14,7 +14,8 @@ # along with this program. If not, see . =20 # This test only works on GNU/Linux. -if { ![isnative] || [is_remote host] || [use_gdb_stub] +require !use_gdb_stub +if { ![isnative] || [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { return } diff --git a/gdb/testsuite/gdb.base/attach-wait-input.exp b/gdb/testsuite/g= db.base/attach-wait-input.exp index b3f7c6eba53..72895416bab 100644 --- a/gdb/testsuite/gdb.base/attach-wait-input.exp +++ b/gdb/testsuite/gdb.base/attach-wait-input.exp @@ -29,9 +29,7 @@ # simpler to do, so we test with both editing on and off. =20 # The test uses the "attach" command. -if [use_gdb_stub] { - return -} +require !use_gdb_stub =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.bas= e/break-entry.exp index 9eec5f1a646..779c3246fc9 100644 --- a/gdb/testsuite/gdb.base/break-entry.exp +++ b/gdb/testsuite/gdb.base/break-entry.exp @@ -27,10 +27,7 @@ =20 standard_testfile start.c =20 -if [use_gdb_stub] { - untested "skipping tests due to use_gdb_stub" - return -} +require !use_gdb_stub =20 if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {additi= onal_flags=3D-static}] } { return -1 diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.ba= se/break-interp.exp index ece5fec1cea..02a5685802e 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -14,7 +14,8 @@ # along with this program. If not, see . =20 # This test only works on GNU/Linux. -if { ![isnative] || [is_remote host] || [use_gdb_stub] +require !use_gdb_stub +if { ![isnative] || [is_remote host] || ![istarget *-linux*] || [skip_shlib_tests]} { return } diff --git a/gdb/testsuite/gdb.base/cached-source-file.exp b/gdb/testsuite/= gdb.base/cached-source-file.exp index 4cacbbd01dd..d30b97d9ee5 100644 --- a/gdb/testsuite/gdb.base/cached-source-file.exp +++ b/gdb/testsuite/gdb.base/cached-source-file.exp @@ -24,7 +24,8 @@ standard_testfile =20 # Only run on native boards. -if { [use_gdb_stub] || [target_info gdb_protocol] =3D=3D "extended-remote"= } { +require !use_gdb_stub +if { [target_info gdb_protocol] =3D=3D "extended-remote" } { return -1 } =20 diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.= base/dprintf-detach.exp index 2eb5795721d..c71e4e054fd 100644 --- a/gdb/testsuite/gdb.base/dprintf-detach.exp +++ b/gdb/testsuite/gdb.base/dprintf-detach.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 # The test relies on "detach/attach". -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub =20 standard_testfile set escapedbinfile [string_to_regexp ${binfile}] diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/te= stsuite/gdb.base/fork-print-inferior-events.exp index 313ec615c51..1b0ff149b31 100644 --- a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp +++ b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp @@ -20,10 +20,7 @@ # 'set detach-on-fork [on,off]' are the correct ones. =20 # This test relies on "run", so it cannot run on target remote stubs. -if { [use_gdb_stub] } { - untested "not supported on target remote stubs" - return -} +require !use_gdb_stub =20 # Test relies on checking follow-fork output. Do not run if gdb debug is # enabled as it will be redirected to the log. diff --git a/gdb/testsuite/gdb.base/nostdlib.exp b/gdb/testsuite/gdb.base/n= ostdlib.exp index aa088b19ea9..b893b87fccb 100644 --- a/gdb/testsuite/gdb.base/nostdlib.exp +++ b/gdb/testsuite/gdb.base/nostdlib.exp @@ -18,10 +18,7 @@ standard_testfile .c # If we're using a stub, breakpoints at the entry point will not trigger. # See also the comment in break-entry.exp. =20 -if [use_gdb_stub] { - untested "skipping tests due to use_gdb_stub" - return -} +require !use_gdb_stub =20 # default_target_compile would otherwise add "-lm" making the testcase # dependent on whether the system libraries are already prelinked. diff --git a/gdb/testsuite/gdb.base/reread-readsym.exp b/gdb/testsuite/gdb.= base/reread-readsym.exp index 6ebbf2c5e44..fac5131bfe3 100644 --- a/gdb/testsuite/gdb.base/reread-readsym.exp +++ b/gdb/testsuite/gdb.base/reread-readsym.exp @@ -38,9 +38,7 @@ proc generate_cmd_file {gdbfile binfile} { close $ofd } =20 -if [use_gdb_stub] { - return 0 -} +require !use_gdb_stub =20 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 diff --git a/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp b/gd= b/testsuite/gdb.base/run-control-while-bg-execution.exp index 26e4e90f749..15231b0cdb6 100644 --- a/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp +++ b/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp @@ -21,10 +21,7 @@ # again. The test was expanded to test various combinations of # run-control-related actions done with an inferior running in background. =20 -if {[use_gdb_stub]} { - unsupported "test requires running" - return -} +require !use_gdb_stub =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/set-cwd.exp b/gdb/testsuite/gdb.base/se= t-cwd.exp index 55c3e3f4752..e954c7e18c8 100644 --- a/gdb/testsuite/gdb.base/set-cwd.exp +++ b/gdb/testsuite/gdb.base/set-cwd.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 { [use_gdb_stub] } { - untested "skipping tests due to use_gdb_stub" - return -} +require !use_gdb_stub =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp b/gdb/test= suite/gdb.base/share-env-with-gdbserver.exp index 24d9de1389e..2490d55a0f2 100644 --- a/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp +++ b/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp @@ -16,10 +16,7 @@ # along with this program. If not, see . =20 # This test doesn't make sense on native-gdbserver. -if { [use_gdb_stub] } { - untested "not supported" - return -} +require !use_gdb_stub =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.b= ase/solib-display.exp index d75b6f89df3..96bddc147ca 100644 --- a/gdb/testsuite/gdb.base/solib-display.exp +++ b/gdb/testsuite/gdb.base/solib-display.exp @@ -43,9 +43,7 @@ require !skip_shlib_tests # This is because the initial stop is done before the shared libraries are # loaded. =20 -if { [use_gdb_stub] } { - return 0 -} +require !use_gdb_stub =20 # Library file. set libname "solib-display-lib" diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.bas= e/solib-nodir.exp index 62075cb3235..a8b205a5d68 100644 --- a/gdb/testsuite/gdb.base/solib-nodir.exp +++ b/gdb/testsuite/gdb.base/solib-nodir.exp @@ -23,9 +23,7 @@ if [is_remote target] { # We need to be able to influence the target's environment and working # directory. Can't do that if when we connect the inferior is already # running. -if [use_gdb_stub] { - return -} +require !use_gdb_stub =20 set testfile "solib-nodir" # Arbitrary file, possibly not containing main, even an empty one. diff --git a/gdb/testsuite/gdb.base/start-cpp.exp b/gdb/testsuite/gdb.base/= start-cpp.exp index 80b5eea4ec2..ad5595e88f8 100644 --- a/gdb/testsuite/gdb.base/start-cpp.exp +++ b/gdb/testsuite/gdb.base/start-cpp.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 { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub =20 standard_testfile .cc =20 diff --git a/gdb/testsuite/gdb.base/start.exp b/gdb/testsuite/gdb.base/star= t.exp index b27c46c4d8f..84130c97fa7 100644 --- a/gdb/testsuite/gdb.base/start.exp +++ b/gdb/testsuite/gdb.base/start.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 { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/startup-with-shell.exp b/gdb/testsuite/= gdb.base/startup-with-shell.exp index 2f893184d21..b1f868b520a 100644 --- a/gdb/testsuite/gdb.base/startup-with-shell.exp +++ b/gdb/testsuite/gdb.base/startup-with-shell.exp @@ -16,10 +16,7 @@ # along with this program. If not, see . =20 # This test doesn't make sense on native-gdbserver. -if { [use_gdb_stub] } { - untested "not supported" - return -} +require !use_gdb_stub =20 # There's no easy way to set environment variables on remote targets # (via dejagnu) yet. diff --git a/gdb/testsuite/gdb.base/testenv.exp b/gdb/testsuite/gdb.base/te= stenv.exp index 6bfffd60091..017fa87e51b 100644 --- a/gdb/testsuite/gdb.base/testenv.exp +++ b/gdb/testsuite/gdb.base/testenv.exp @@ -20,9 +20,7 @@ =20 # Can't pass environment variables to the inferior if when we connect, # the inferior is already running. -if [use_gdb_stub] { - return -} +require !use_gdb_stub =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.b= ase/watchpoint-hw.exp index 63ab8ffe1bb..4b32215344a 100644 --- a/gdb/testsuite/gdb.base/watchpoint-hw.exp +++ b/gdb/testsuite/gdb.base/watchpoint-hw.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 { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub =20 require !skip_hw_watchpoint_tests =20 diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gd= b.btrace/multi-inferior.exp index 727161e4dbd..bbc03daaccc 100644 --- a/gdb/testsuite/gdb.btrace/multi-inferior.exp +++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp @@ -24,10 +24,7 @@ =20 require !skip_btrace_tests =20 -if { [use_gdb_stub] } { - unsupported "test creates multiple inferiors" - return -1 -} +require !use_gdb_stub =20 standard_testfile if [prepare_for_testing "failed to prepare" $testfile {} {debug}] { diff --git a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp b/gdb/testsuite/g= db.dwarf2/main-subprogram.exp index d52250c9328..23f02df8513 100644 --- a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp +++ b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp @@ -17,10 +17,7 @@ load_lib dwarf.exp # This test can only be run on targets which support DWARF-4 and use gas. require dwarf2_support =20 -if { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub =20 standard_testfile .c -dw.S =20 diff --git a/gdb/testsuite/gdb.mi/mi-exec-run.exp b/gdb/testsuite/gdb.mi/mi= -exec-run.exp index 5a25653bb9d..e3e6d9d6a21 100644 --- a/gdb/testsuite/gdb.mi/mi-exec-run.exp +++ b/gdb/testsuite/gdb.mi/mi-exec-run.exp @@ -28,10 +28,7 @@ set MIFLAGS "-i=3Dmi" =20 # The purpose of this testcase is to test the -exec-run command. If we # cannot use it, then there is no point in running this testcase. -if [use_gdb_stub] { - untested "cannot use -exec-run command" - return -1 -} +require !use_gdb_stub =20 standard_testfile mi-start.c =20 diff --git a/gdb/testsuite/gdb.mi/mi-start.exp b/gdb/testsuite/gdb.mi/mi-st= art.exp index fe5b37f60f8..b7e81a30486 100644 --- a/gdb/testsuite/gdb.mi/mi-start.exp +++ b/gdb/testsuite/gdb.mi/mi-start.exp @@ -19,10 +19,7 @@ set MIFLAGS "-i=3Dmi" # The purpose of this testcase is to test the --start option of # the -exec-run command. If we cannot use the -exec-run command, # then there is no point in running this testcase... -if [use_gdb_stub] { - untested "cannot use -exec-run command" - return -1 -} +require !use_gdb_stub =20 gdb_exit if [mi_gdb_start] { diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/test= suite/gdb.mi/user-selected-context-sync.exp index 252f307c268..55dab46fba8 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -41,10 +41,7 @@ standard_testfile =20 # Multiple inferiors are needed, therefore only native gdb and extended # gdbserver modes are supported. -if [use_gdb_stub] { - untested "using gdb stub" - return -} +require !use_gdb_stub =20 set compile_options "debug pthreads" if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options= }] =3D=3D -1} { diff --git a/gdb/testsuite/gdb.multi/attach-while-running.exp b/gdb/testsui= te/gdb.multi/attach-while-running.exp index d3e0d462413..3a0e27b26ba 100644 --- a/gdb/testsuite/gdb.multi/attach-while-running.exp +++ b/gdb/testsuite/gdb.multi/attach-while-running.exp @@ -36,10 +36,7 @@ =20 standard_testfile =20 -if [use_gdb_stub] { - unsupported "test requires running" - return -} +require !use_gdb_stub =20 if { [build_executable "failed to prepare" ${testfile} ${srcfile}] } { return diff --git a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp b/gdb/testsuit= e/gdb.multi/dummy-frame-restore.exp index 1974cc19e41..380010d19f0 100644 --- a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp +++ b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp @@ -17,9 +17,7 @@ standard_testfile .c set executable ${testfile} =20 # The plain remote target can't do multiple inferiors. -if [use_gdb_stub] { - return -} +require !use_gdb_stub =20 if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} { return -1 diff --git a/gdb/testsuite/gdb.multi/multi-arch-exec.exp b/gdb/testsuite/gd= b.multi/multi-arch-exec.exp index 1ed2514c4d4..85d0cce327c 100644 --- a/gdb/testsuite/gdb.multi/multi-arch-exec.exp +++ b/gdb/testsuite/gdb.multi/multi-arch-exec.exp @@ -19,9 +19,7 @@ set testfile "multi-arch-exec" =20 # The plain remote target can't do multiple inferiors. -if [use_gdb_stub] { - return -} +require !use_gdb_stub =20 # The 64-bit compile may succeed for i386-linux, but gdb won't be able # to load the file. diff --git a/gdb/testsuite/gdb.multi/multi-arch.exp b/gdb/testsuite/gdb.mul= ti/multi-arch.exp index 5943d490262..f2c8a282a61 100644 --- a/gdb/testsuite/gdb.multi/multi-arch.exp +++ b/gdb/testsuite/gdb.multi/multi-arch.exp @@ -19,9 +19,7 @@ set testfile "multi-arch" =20 # The plain remote target can't do multiple inferiors. -if [use_gdb_stub] { - return -} +require !use_gdb_stub =20 # The 64-bit compile may succeed for i386-linux, but gdb won't be able # to load the file. diff --git a/gdb/testsuite/gdb.multi/multi-exit.exp b/gdb/testsuite/gdb.mul= ti/multi-exit.exp index f35eab78df6..4597a0e82fd 100644 --- a/gdb/testsuite/gdb.multi/multi-exit.exp +++ b/gdb/testsuite/gdb.multi/multi-exit.exp @@ -24,9 +24,7 @@ =20 standard_testfile =20 -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub =20 if {[build_executable "failed to prepare" $testfile $srcfile]} { return -1 diff --git a/gdb/testsuite/gdb.multi/multi-kill.exp b/gdb/testsuite/gdb.mul= ti/multi-kill.exp index 72dd22392ec..a6c3e633784 100644 --- a/gdb/testsuite/gdb.multi/multi-kill.exp +++ b/gdb/testsuite/gdb.multi/multi-kill.exp @@ -24,9 +24,7 @@ =20 standard_testfile =20 -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub =20 if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} { return -1 diff --git a/gdb/testsuite/gdb.multi/run-only-second-inf.exp b/gdb/testsuit= e/gdb.multi/run-only-second-inf.exp index 7796c9731a2..3e3046988f2 100644 --- a/gdb/testsuite/gdb.multi/run-only-second-inf.exp +++ b/gdb/testsuite/gdb.multi/run-only-second-inf.exp @@ -20,9 +20,7 @@ =20 standard_testfile =20 -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub =20 if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} { return -1 diff --git a/gdb/testsuite/gdb.multi/start-inferior-specific.exp b/gdb/test= suite/gdb.multi/start-inferior-specific.exp index 4823a94c21c..8641341d73e 100644 --- a/gdb/testsuite/gdb.multi/start-inferior-specific.exp +++ b/gdb/testsuite/gdb.multi/start-inferior-specific.exp @@ -25,9 +25,7 @@ =20 standard_testfile .c -other.c =20 -if { [use_gdb_stub] } { - return -} +require !use_gdb_stub =20 set srcfile_other ${srcfile2} set binfile_other ${binfile}-other diff --git a/gdb/testsuite/gdb.multi/tids-gid-reset.exp b/gdb/testsuite/gdb= .multi/tids-gid-reset.exp index 0f662627eaf..a57d0143116 100644 --- a/gdb/testsuite/gdb.multi/tids-gid-reset.exp +++ b/gdb/testsuite/gdb.multi/tids-gid-reset.exp @@ -52,10 +52,7 @@ with_test_prefix "single-inferior" { =20 # For the following tests, multiple inferiors are needed, therefore # non-extended gdbserver is not supported. -if [use_gdb_stub] { - untested "using gdb stub" - return -} +require !use_gdb_stub =20 # Test with multiple inferiors. This time, since we restart inferior # 1 while inferior 2 still has threads, then the new thread 1.1 should diff --git a/gdb/testsuite/gdb.multi/tids.exp b/gdb/testsuite/gdb.multi/tid= s.exp index 68ba24b0e5c..ff48d422c9b 100644 --- a/gdb/testsuite/gdb.multi/tids.exp +++ b/gdb/testsuite/gdb.multi/tids.exp @@ -22,10 +22,7 @@ standard_testfile # Multiple inferiors are needed, therefore both native and extended # gdbserver modes are supported. Only non-extended gdbserver is not # supported. -if [use_gdb_stub] { - untested "using gdb stub" - return -} +require !use_gdb_stub =20 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {pthr= eads debug}] } { return -1 diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/g= db.multi/watchpoint-multi.exp index 8df68b382e1..e29e0675d8e 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -18,10 +18,7 @@ set executable ${testfile} =20 # Multiple inferiors are needed, therefore both native and extended gdbser= ver # modes are supported. Only non-extended gdbserver is not supported. -if [use_gdb_stub] { - untested "using gdb stub" - return -} +require !use_gdb_stub =20 # 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. diff --git a/gdb/testsuite/gdb.python/py-events.exp b/gdb/testsuite/gdb.pyt= hon/py-events.exp index 8c1a2d29b75..109f8c1ca4e 100644 --- a/gdb/testsuite/gdb.python/py-events.exp +++ b/gdb/testsuite/gdb.python/py-events.exp @@ -13,9 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -if [use_gdb_stub] { - return 0 -} +require !use_gdb_stub =20 load_lib gdb-python.exp =20 diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsui= te/gdb.threads/attach-into-signal.exp index 2c85793e11a..c778d31719c 100644 --- a/gdb/testsuite/gdb.threads/attach-into-signal.exp +++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp @@ -17,8 +17,8 @@ # This file was created by Jan Kratochvil . =20 # This test only works on Linux -if { ![isnative] || [is_remote host] || [use_gdb_stub] - || ![istarget *-linux*] } { +require !use_gdb_stub +if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { return } =20 diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsu= ite/gdb.threads/attach-slow-waitpid.exp index b13abe7039e..823614e5ba3 100644 --- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp +++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp @@ -37,8 +37,8 @@ # during the attach phase. =20 # This test only works on Linux -if { ![isnative] || [is_remote host] || [use_gdb_stub] - || ![istarget *-linux*] } { +require !use_gdb_stub +if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { return } =20 diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/g= db.threads/attach-stopped.exp index 51391acae39..3904d4c087b 100644 --- a/gdb/testsuite/gdb.threads/attach-stopped.exp +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp @@ -18,8 +18,8 @@ # This file was updated by Jan Kratochvil . =20 # This test only works on Linux -if { ![isnative] || [is_remote host] || [use_gdb_stub] - || ![istarget *-linux*] } { +require !use_gdb_stub +if { ![isnative] || [is_remote host] || ![istarget *-linux*] } { return } =20 diff --git a/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp b/gdb/tests= uite/gdb.threads/vfork-multi-inferior.exp index 1c98578b69a..5f48966f78d 100644 --- a/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp +++ b/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp @@ -25,10 +25,7 @@ # To catch the bug, this test verifies that we can hit a breakpoint after a # vfork call, while a second inferior runs in the background. =20 -if [use_gdb_stub] { - unsupported "test uses multiple inferiors" - return -} +require !use_gdb_stub =20 standard_testfile .c -sleep.c =20 diff --git a/gdb/testsuite/gdb.tui/corefile-run.exp b/gdb/testsuite/gdb.tui= /corefile-run.exp index cdde4de18eb..02606ee286d 100644 --- a/gdb/testsuite/gdb.tui/corefile-run.exp +++ b/gdb/testsuite/gdb.tui/corefile-run.exp @@ -29,7 +29,8 @@ if { [prepare_for_testing "failed to prepare" $testfile $= srcfile debug] } { } =20 # Only run on native boards. -if { [use_gdb_stub] || [target_info gdb_protocol] =3D=3D "extended-remote"= } { +require !use_gdb_stub +if { [target_info gdb_protocol] =3D=3D "extended-remote" } { untested "not supported" return }