aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/gdb.base/annotate-symlink.exp7
-rw-r--r--gdb/testsuite/gdb.base/argv0-symlink.exp5
-rw-r--r--gdb/testsuite/gdb.base/attach-pie-misread.exp5
-rw-r--r--gdb/testsuite/gdb.base/auto-load.exp4
-rw-r--r--gdb/testsuite/gdb.base/break-interp.exp5
-rw-r--r--gdb/testsuite/gdb.base/bt-on-fatal-signal.exp5
-rw-r--r--gdb/testsuite/gdb.base/fullname.exp9
-rw-r--r--gdb/testsuite/gdb.base/fullpath-expand.exp7
-rw-r--r--gdb/testsuite/gdb.base/gdbhistsize-history.exp6
-rw-r--r--gdb/testsuite/gdb.base/gdbinit-history.exp9
-rw-r--r--gdb/testsuite/gdb.base/info-fun.exp4
-rw-r--r--gdb/testsuite/gdb.base/libsegfault.exp5
-rw-r--r--gdb/testsuite/gdb.base/macro-source-path.exp4
-rw-r--r--gdb/testsuite/gdb.base/prelink.exp4
-rw-r--r--gdb/testsuite/gdb.base/realname-expand.exp7
-rw-r--r--gdb/testsuite/gdb.base/skip-solib.exp5
-rw-r--r--gdb/testsuite/gdb.base/solib-corrupted.exp8
-rw-r--r--gdb/testsuite/gdb.base/solib-nodir.exp4
-rw-r--r--gdb/testsuite/gdb.base/solib-search.exp5
-rw-r--r--gdb/testsuite/gdb.base/startup-with-shell.exp5
-rw-r--r--gdb/testsuite/gdb.base/style-logging.exp5
-rw-r--r--gdb/testsuite/gdb.base/valgrind-bt.exp5
-rw-r--r--gdb/testsuite/gdb.base/valgrind-disp-step.exp5
-rw-r--r--gdb/testsuite/gdb.base/valgrind-infcall-2.exp5
-rw-r--r--gdb/testsuite/gdb.base/valgrind-infcall.exp5
-rw-r--r--gdb/testsuite/gdb.base/warning.exp5
-rw-r--r--gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp6
-rw-r--r--gdb/testsuite/gdb.dwarf2/dwzbuildid.exp4
-rw-r--r--gdb/testsuite/gdb.dwarf2/dwznolink.exp4
-rw-r--r--gdb/testsuite/gdb.dwarf2/fission-base.exp4
-rw-r--r--gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp4
-rw-r--r--gdb/testsuite/gdb.dwarf2/fission-loclists.exp4
-rw-r--r--gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp4
-rw-r--r--gdb/testsuite/gdb.dwarf2/fission-reread.exp4
-rw-r--r--gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp4
-rw-r--r--gdb/testsuite/gdb.linespec/macro-relative.exp7
-rw-r--r--gdb/testsuite/gdb.python/py-pp-maint.exp5
-rw-r--r--gdb/testsuite/gdb.server/abspath.exp4
-rw-r--r--gdb/testsuite/gdb.server/server-connect.exp4
-rw-r--r--gdb/testsuite/gdb.server/server-pipe.exp4
-rw-r--r--gdb/testsuite/gdb.threads/attach-into-signal.exp5
-rw-r--r--gdb/testsuite/gdb.threads/attach-slow-waitpid.exp5
-rw-r--r--gdb/testsuite/gdb.threads/attach-stopped.exp5
43 files changed, 64 insertions, 156 deletions
diff --git a/gdb/testsuite/gdb.base/annotate-symlink.exp b/gdb/testsuite/gdb.base/annotate-symlink.exp
index a0f8ed9..7341240 100644
--- a/gdb/testsuite/gdb.base/annotate-symlink.exp
+++ b/gdb/testsuite/gdb.base/annotate-symlink.exp
@@ -15,10 +15,9 @@
standard_testfile realname-expand.c realname-expand-real.c
-if [is_remote host] {
- unsupported "compiling on a remote host does not support a filename with directory."
- return 0
-}
+# Compiling on a remote host does not support a filename with
+# directory.
+require {!is_remote host}
set srcdirabs [file join [pwd] $srcdir]
set srcfilelink [standard_output_file realname-expand-link.c]
diff --git a/gdb/testsuite/gdb.base/argv0-symlink.exp b/gdb/testsuite/gdb.base/argv0-symlink.exp
index b321a24..57b348b 100644
--- a/gdb/testsuite/gdb.base/argv0-symlink.exp
+++ b/gdb/testsuite/gdb.base/argv0-symlink.exp
@@ -22,10 +22,7 @@
require isnative
-if { [is_remote host] } {
- unsupported "argv0-symlink.exp not supported on remote host"
- return -1
-}
+require {!is_remote host}
standard_testfile
diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/gdb.base/attach-pie-misread.exp
index 96f0242..484bd48 100644
--- a/gdb/testsuite/gdb.base/attach-pie-misread.exp
+++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp
@@ -15,9 +15,8 @@
# This test only works on GNU/Linux.
require !use_gdb_stub isnative allow_shlib_tests
-if { [is_remote host] || ![istarget *-linux*] } {
- return
-}
+require {!is_remote host}
+require {istarget *-linux*}
load_lib prelink-support.exp
diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/auto-load.exp
index 23cf72a..02ce046 100644
--- a/gdb/testsuite/gdb.base/auto-load.exp
+++ b/gdb/testsuite/gdb.base/auto-load.exp
@@ -15,9 +15,7 @@
standard_testfile
-if [is_remote host] {
- return 0
-}
+require {!is_remote host}
set targetdir "${binfile}.dir"
set sourcescript "${srcdir}/${subdir}/${testfile}-script"
diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp
index 9652b32..6061c73 100644
--- a/gdb/testsuite/gdb.base/break-interp.exp
+++ b/gdb/testsuite/gdb.base/break-interp.exp
@@ -15,9 +15,8 @@
# This test only works on GNU/Linux.
require !use_gdb_stub isnative allow_shlib_tests
-if { [is_remote host] || ![istarget *-linux*] } {
- return
-}
+require {!is_remote host}
+require {istarget *-linux*}
load_lib prelink-support.exp
diff --git a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
index 128db75..d0364cc 100644
--- a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
+++ b/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp
@@ -23,10 +23,7 @@ standard_testfile
# remote host (will the signal go to GDB, or the program that
# established the connection to the remote host?), so just skip this
# test for remote host setups.
-if {[is_remote host]} {
- untested $testfile
- return -1
-}
+require {!is_remote host}
if {[prepare_for_testing "failed to prepare" $testfile $srcfile]} {
return -1
diff --git a/gdb/testsuite/gdb.base/fullname.exp b/gdb/testsuite/gdb.base/fullname.exp
index 19da89e..51ccb01 100644
--- a/gdb/testsuite/gdb.base/fullname.exp
+++ b/gdb/testsuite/gdb.base/fullname.exp
@@ -18,12 +18,9 @@
standard_testfile
-# We rely on being able to copy things around.
-
-if { [is_remote host] } {
- untested "setting breakpoints by full path"
- return -1
-}
+# We rely on being able to copy things around and being able to set
+# breakpoints by full path.
+require {!is_remote host}
# Create a temporary file in the build directory. Use a different
# filename in case ${srcdir} == ${objdir}.
diff --git a/gdb/testsuite/gdb.base/fullpath-expand.exp b/gdb/testsuite/gdb.base/fullpath-expand.exp
index aee23fe..285d0be 100644
--- a/gdb/testsuite/gdb.base/fullpath-expand.exp
+++ b/gdb/testsuite/gdb.base/fullpath-expand.exp
@@ -15,10 +15,9 @@
standard_testfile .c fullpath-expand-func.c
-if [is_remote host] {
- unsupported "compiling on a remote host does not support a filename with directory."
- return 0
-}
+# Compiling on a remote host does not support a filename with
+# directory.
+require {!is_remote host}
if { [file pathtype $objdir] != "absolute" } {
untested "objdir $objdir is not absolute"
diff --git a/gdb/testsuite/gdb.base/gdbhistsize-history.exp b/gdb/testsuite/gdb.base/gdbhistsize-history.exp
index d3e4a05..59fd2d0 100644
--- a/gdb/testsuite/gdb.base/gdbhistsize-history.exp
+++ b/gdb/testsuite/gdb.base/gdbhistsize-history.exp
@@ -20,11 +20,7 @@
# We cannot expect remote hosts to see environment variables set on the
# local machine.
-
-if { [is_remote host] } {
- unsupported "can't set environment variables on remote host"
- return -1
-}
+require {!is_remote host}
# Check that the history size is properly set to SIZE when the environment
# variable ENV_VAR is set to GDBHISTSIZE.
diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp
index 46d76b0..4c73293 100644
--- a/gdb/testsuite/gdb.base/gdbinit-history.exp
+++ b/gdb/testsuite/gdb.base/gdbinit-history.exp
@@ -18,16 +18,13 @@
# Test the setting of "history size" via $HOME/.gdbinit
# This test depends on being able to set $HOME and $GDBHISTSIZE.
-# We cannot expect remote hosts to see environment variables set on the
-# local machine.
# Do not run if gdb debug is enabled - it interferes with the command history.
require !gdb_debug_enabled
-if { [is_remote host] } {
- unsupported "can't set environment variables on remote host"
- return -1
-}
+# We cannot expect remote hosts to see environment variables set on the
+# local machine.
+require {!is_remote host}
# Check that the history size is properly set to SIZE when reading the .gdbinit
# file located in HOME with the environment variable GDBHISTSIZE optionally
diff --git a/gdb/testsuite/gdb.base/info-fun.exp b/gdb/testsuite/gdb.base/info-fun.exp
index 683c732..c14d87b 100644
--- a/gdb/testsuite/gdb.base/info-fun.exp
+++ b/gdb/testsuite/gdb.base/info-fun.exp
@@ -13,9 +13,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
require allow_shlib_tests
-if { [is_remote target] } {
- return 0
-}
+require {!is_remote target}
# Library file.
set libname "info-fun-solib"
diff --git a/gdb/testsuite/gdb.base/libsegfault.exp b/gdb/testsuite/gdb.base/libsegfault.exp
index 9a98399..7862c96 100644
--- a/gdb/testsuite/gdb.base/libsegfault.exp
+++ b/gdb/testsuite/gdb.base/libsegfault.exp
@@ -22,10 +22,7 @@
# We cannot expect remote hosts to see environment variables set on
# the local machine.
-if { [is_remote host] } {
- unsupported "can't set environment variables on remote host"
- return -1
-}
+require {!is_remote host}
# Spawn GDB with LIB preloaded with LD_PRELOAD. CMDLINE_OPTS are
# command line options passed to GDB.
diff --git a/gdb/testsuite/gdb.base/macro-source-path.exp b/gdb/testsuite/gdb.base/macro-source-path.exp
index d46e93b..2d6eaeb 100644
--- a/gdb/testsuite/gdb.base/macro-source-path.exp
+++ b/gdb/testsuite/gdb.base/macro-source-path.exp
@@ -23,9 +23,7 @@ standard_testfile
# If the host is remote, source files are uploaded to the host and compiled
# there, but without the directory structure we expect, making the test
# pointless. Skip the test in that case.
-if { [is_remote host] } {
- return
-}
+require {!is_remote host}
# Copy the source file at these locations in the output directory ($out):
#
diff --git a/gdb/testsuite/gdb.base/prelink.exp b/gdb/testsuite/gdb.base/prelink.exp
index 6945a92..12837b9 100644
--- a/gdb/testsuite/gdb.base/prelink.exp
+++ b/gdb/testsuite/gdb.base/prelink.exp
@@ -20,9 +20,7 @@
require isnative allow_shlib_tests is_c_compiler_gcc
-if { [is_remote host] } {
- return
-}
+require {!is_remote host}
load_lib prelink-support.exp
diff --git a/gdb/testsuite/gdb.base/realname-expand.exp b/gdb/testsuite/gdb.base/realname-expand.exp
index ade6fe2..74dc725 100644
--- a/gdb/testsuite/gdb.base/realname-expand.exp
+++ b/gdb/testsuite/gdb.base/realname-expand.exp
@@ -15,10 +15,9 @@
standard_testfile .c realname-expand-real.c
-if [is_remote host] {
- unsupported "compiling on a remote host does not support a filename with directory."
- return 0
-}
+# Compiling on a remote host does not support a filename with
+# directory.
+require {!is_remote host}
set srcdirabs [file join [pwd] $srcdir]
set srcfilelink [standard_output_file realname-expand-link.c]
diff --git a/gdb/testsuite/gdb.base/skip-solib.exp b/gdb/testsuite/gdb.base/skip-solib.exp
index e04bec9..3cdb455 100644
--- a/gdb/testsuite/gdb.base/skip-solib.exp
+++ b/gdb/testsuite/gdb.base/skip-solib.exp
@@ -21,9 +21,8 @@
# This only works on GNU/Linux.
require isnative allow_shlib_tests
-if { [is_remote host] || ![istarget *-linux*] } {
- return
-}
+require {!is_remote host}
+require {istarget *-linux*}
set test "skip-solib"
set srcfile_main "${test}-main.c"
diff --git a/gdb/testsuite/gdb.base/solib-corrupted.exp b/gdb/testsuite/gdb.base/solib-corrupted.exp
index 644c8ec..e778711 100644
--- a/gdb/testsuite/gdb.base/solib-corrupted.exp
+++ b/gdb/testsuite/gdb.base/solib-corrupted.exp
@@ -15,11 +15,9 @@
require allow_shlib_tests
-if {[is_remote target]} {
- # gdbserver prints the warning message but expect is parsing only the GDB
- # output, not the gdbserver output.
- return 0
-}
+# gdbserver prints the warning message but expect is parsing only the GDB
+# output, not the gdbserver output.
+require {!is_remote target}
set testfile "solib-corrupted"
set srcfile start.c
diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp
index dd07249..1530d80 100644
--- a/gdb/testsuite/gdb.base/solib-nodir.exp
+++ b/gdb/testsuite/gdb.base/solib-nodir.exp
@@ -16,9 +16,7 @@
require allow_shlib_tests
# The testcase assumes the target can access the OBJDIR.
-if [is_remote target] {
- return
-}
+require {!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
diff --git a/gdb/testsuite/gdb.base/solib-search.exp b/gdb/testsuite/gdb.base/solib-search.exp
index 5e9e3d4..1d678ef 100644
--- a/gdb/testsuite/gdb.base/solib-search.exp
+++ b/gdb/testsuite/gdb.base/solib-search.exp
@@ -17,10 +17,7 @@
# is properly reset when the path is changed.
require allow_shlib_tests
-if {[is_remote target]} {
- untested "skipping remote target and shared library tests"
- return -1
-}
+require {!is_remote target}
# Build "wrong" and "right" versions of the libraries in separate directories.
set wrong_lib_subdir "solib-search-wrong"
diff --git a/gdb/testsuite/gdb.base/startup-with-shell.exp b/gdb/testsuite/gdb.base/startup-with-shell.exp
index b1f868b..51b1e4f 100644
--- a/gdb/testsuite/gdb.base/startup-with-shell.exp
+++ b/gdb/testsuite/gdb.base/startup-with-shell.exp
@@ -20,10 +20,7 @@ require !use_gdb_stub
# There's no easy way to set environment variables on remote targets
# (via dejagnu) yet.
-if { [is_remote target] } {
- untested "remote board"
- return
-}
+require {!is_remote target}
standard_testfile
diff --git a/gdb/testsuite/gdb.base/style-logging.exp b/gdb/testsuite/gdb.base/style-logging.exp
index dcf1357..a156c39 100644
--- a/gdb/testsuite/gdb.base/style-logging.exp
+++ b/gdb/testsuite/gdb.base/style-logging.exp
@@ -18,10 +18,7 @@
# Do not run if gdb debug is enabled as it will interfere with log redirect.
require !gdb_debug_enabled
-if {[is_remote host]} {
- untested "does not work on remote host"
- return 0
-}
+require {!is_remote host}
standard_testfile style.c
diff --git a/gdb/testsuite/gdb.base/valgrind-bt.exp b/gdb/testsuite/gdb.base/valgrind-bt.exp
index da0261e..6849a34 100644
--- a/gdb/testsuite/gdb.base/valgrind-bt.exp
+++ b/gdb/testsuite/gdb.base/valgrind-bt.exp
@@ -18,10 +18,7 @@ require allow_xml_test
load_lib valgrind.exp
-if [is_remote target] {
- # The test always runs locally.
- return 0
-}
+require {!is_remote target}
standard_testfile .c
if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
diff --git a/gdb/testsuite/gdb.base/valgrind-disp-step.exp b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
index 3fb4341..1033ac8 100644
--- a/gdb/testsuite/gdb.base/valgrind-disp-step.exp
+++ b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
@@ -23,10 +23,7 @@ require allow_xml_test
load_lib valgrind.exp
-if [is_remote target] {
- # The test always runs locally.
- return 0
-}
+require {!is_remote target}
standard_testfile .c
if {[build_executable "failed to build" $testfile $srcfile {debug}] == -1} {
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall-2.exp b/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
index 6ed6ecd..aa8f472 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
@@ -34,10 +34,7 @@ require allow_xml_test
load_lib valgrind.exp
-if [is_remote target] {
- # The test always runs locally.
- return 0
-}
+require {!is_remote target}
standard_testfile .c
if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp
index bcaca02..0126773 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp
@@ -18,10 +18,7 @@ require allow_xml_test
load_lib valgrind.exp
-if [is_remote target] {
- # The test always runs locally.
- return 0
-}
+require {!is_remote target}
standard_testfile .c
if {[build_executable $testfile.exp $testfile $srcfile {debug}] == -1} {
diff --git a/gdb/testsuite/gdb.base/warning.exp b/gdb/testsuite/gdb.base/warning.exp
index 50e680b..e58bde5 100644
--- a/gdb/testsuite/gdb.base/warning.exp
+++ b/gdb/testsuite/gdb.base/warning.exp
@@ -15,10 +15,7 @@
# Test that an early warning does not cause a crash.
-if {[is_remote host]} {
- unsupported "warning.exp can only run on local host"
- return
-}
+require {!is_remote host}
set tname [standard_temp_file warning]
set fd [open $tname w]
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
index 2f37d4d..a6beba4 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp
@@ -19,10 +19,8 @@ require dwarf2_support
# This test has hard-wired assumptions that host and build filenames are
# the same, and assumes POSIX pathname syntax.
-if { [is_remote host] || [ishost *-*-mingw*] } {
- unsupported "can only run on local host"
- return 0
-}
+require {!is_remote host}
+require {!ishost *-*-mingw*}
# Find length of addresses in bytes.
if {[is_64_target]} {
diff --git a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp
index 48fc619..1b9ba8d 100644
--- a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp
@@ -19,9 +19,7 @@ load_lib dwarf.exp
require dwarf2_support
# No remote host testing either.
-if {[is_remote host]} {
- return 0
-}
+require {!is_remote host}
# Lots of source files since we test a few cases and make new files
diff --git a/gdb/testsuite/gdb.dwarf2/dwznolink.exp b/gdb/testsuite/gdb.dwarf2/dwznolink.exp
index a03bff2..d0bfa6b 100644
--- a/gdb/testsuite/gdb.dwarf2/dwznolink.exp
+++ b/gdb/testsuite/gdb.dwarf2/dwznolink.exp
@@ -19,9 +19,7 @@ load_lib dwarf.exp
require dwarf2_support
# No remote host testing either.
-if {[is_remote host]} {
- return 0
-}
+require {!is_remote host}
standard_testfile main.c dwznolink.S
diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.exp b/gdb/testsuite/gdb.dwarf2/fission-base.exp
index c3338c2..b654de4 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-base.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-base.exp
@@ -16,9 +16,7 @@
load_lib dwarf.exp
# We run objcopy locally to split out the .dwo file.
-if [is_remote host] {
- return 0
-}
+require {!is_remote host}
# This test can only be run on targets which support DWARF-2 and use gas.
require dwarf2_support
diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
index c13450d..a6fb3e8 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp
@@ -21,9 +21,7 @@
load_lib dwarf.exp
# We run objcopy locally to split out the .dwo file.
-if [is_remote host] {
- return 0
-}
+require {!is_remote host}
# This test can only be run on targets which support DWARF-2 and use gas.
require dwarf2_support
diff --git a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
index 31c7bca..d906eeb 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-loclists.exp
@@ -16,9 +16,7 @@
load_lib dwarf.exp
# We run objcopy locally to split out the .dwo file.
-if [is_remote host] {
- return 0
-}
+require {!is_remote host}
# This test can only be run on targets which support DWARF-2 and use gas.
require dwarf2_support
diff --git a/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp b/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp
index 7bdf627..0a2a079 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp
@@ -19,9 +19,7 @@
load_lib dwarf.exp
# We run objcopy locally to split out the .dwo file.
-if [is_remote host] {
- return 0
-}
+require {!is_remote host}
# This test can only be run on targets which support DWARF-2 and use gas.
require dwarf2_support
diff --git a/gdb/testsuite/gdb.dwarf2/fission-reread.exp b/gdb/testsuite/gdb.dwarf2/fission-reread.exp
index 0ef2b13..01e9ead 100644
--- a/gdb/testsuite/gdb.dwarf2/fission-reread.exp
+++ b/gdb/testsuite/gdb.dwarf2/fission-reread.exp
@@ -16,9 +16,7 @@
load_lib dwarf.exp
# We run objcopy locally to split out the .dwo file.
-if [is_remote host] {
- return 0
-}
+require {!is_remote host}
# This test can only be run on targets which support DWARF-2 and use gas.
require dwarf2_support
diff --git a/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp b/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp
index 871a1867..538004e 100644
--- a/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp
+++ b/gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp
@@ -21,9 +21,7 @@ load_lib dwarf.exp
require dwarf2_support
# No remote host testing either.
-if {[is_remote host]} {
- return 0
-}
+require {!is_remote host}
standard_testfile main.c no-gnu-debuglink.S
diff --git a/gdb/testsuite/gdb.linespec/macro-relative.exp b/gdb/testsuite/gdb.linespec/macro-relative.exp
index 4115943..4e79ecf 100644
--- a/gdb/testsuite/gdb.linespec/macro-relative.exp
+++ b/gdb/testsuite/gdb.linespec/macro-relative.exp
@@ -18,10 +18,9 @@ standard_testfile
# Fission doesn't support macros yet. Bug 15954.
require !using_fission
-if [is_remote host] {
- unsupported "compiling on a remote host does not support a filename with directory."
- return 0
-}
+# Compiling on a remote host does not support a filename with
+# directory.
+require {!is_remote host}
set opts {debug additional_flags=-I. macros}
diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.python/py-pp-maint.exp
index 5e5b803..dc5a1a6 100644
--- a/gdb/testsuite/gdb.python/py-pp-maint.exp
+++ b/gdb/testsuite/gdb.python/py-pp-maint.exp
@@ -16,10 +16,7 @@
# This file is part of the GDB testsuite. It tests Python-based
# pretty-printing for the CLI.
-if [is_remote host] {
- untested "py-pp-maint.exp can only be run locally"
- return -1
-}
+require {!is_remote host}
load_lib gdb-python.exp
diff --git a/gdb/testsuite/gdb.server/abspath.exp b/gdb/testsuite/gdb.server/abspath.exp
index 46657c6..f58d962 100644
--- a/gdb/testsuite/gdb.server/abspath.exp
+++ b/gdb/testsuite/gdb.server/abspath.exp
@@ -27,9 +27,7 @@ require allow_gdbserver_tests
# Because we're relying on being able to change our CWD before
# executing gdbserver, we just run if we're not testing with a remote
# target.
-if { [is_remote target] } {
- return 0
-}
+require {!is_remote target}
save_vars { GDBFLAGS } {
# If GDB and GDBserver are both running locally, set the sysroot to avoid
diff --git a/gdb/testsuite/gdb.server/server-connect.exp b/gdb/testsuite/gdb.server/server-connect.exp
index 6c4c969..1f5b9a2 100644
--- a/gdb/testsuite/gdb.server/server-connect.exp
+++ b/gdb/testsuite/gdb.server/server-connect.exp
@@ -25,9 +25,7 @@ standard_testfile normal.c
require allow_gdbserver_tests
# We want to have control over where we start gdbserver.
-if { [is_remote target] } {
- return 0
-}
+require {!is_remote target}
if { [prepare_for_testing "failed to prepare" $testfile $srcfile debug] } {
return -1
diff --git a/gdb/testsuite/gdb.server/server-pipe.exp b/gdb/testsuite/gdb.server/server-pipe.exp
index 48b79fe..e4ad0ce 100644
--- a/gdb/testsuite/gdb.server/server-pipe.exp
+++ b/gdb/testsuite/gdb.server/server-pipe.exp
@@ -24,9 +24,7 @@
# This test relies on starting gdbserver using the pipe syntax. Not
# sure how well this will run if part of this test is being run
# elsewhere.
-if { [is_remote target] || [is_remote host] } {
- return 0
-}
+require {!is_remote target} {!is_remote host}
load_lib gdbserver-support.exp
diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp
index 4a5caaa..e5cc1f9 100644
--- a/gdb/testsuite/gdb.threads/attach-into-signal.exp
+++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp
@@ -18,9 +18,8 @@
# This test only works on Linux
require !use_gdb_stub isnative
-if { [is_remote host] || ![istarget *-linux*] } {
- return
-}
+require {!is_remote host}
+require {istarget *-linux*}
standard_testfile
set executable_nothr ${testfile}-nothr
diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
index 7512a67..85db583 100644
--- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
+++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp
@@ -38,9 +38,8 @@
# This test only works on Linux
require !use_gdb_stub isnative
-if { [is_remote host] || ![istarget *-linux*] } {
- return
-}
+require {!is_remote host}
+require {istarget *-linux*}
standard_testfile
diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp
index 35b31af..25d63b3 100644
--- a/gdb/testsuite/gdb.threads/attach-stopped.exp
+++ b/gdb/testsuite/gdb.threads/attach-stopped.exp
@@ -19,9 +19,8 @@
# This test only works on Linux
require !use_gdb_stub isnative
-if { [is_remote host] || ![istarget *-linux*] } {
- return
-}
+require {!is_remote host}
+require {istarget *-linux*}
standard_testfile
set escapedbinfile [string_to_regexp $binfile]