From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 705113858D28; Wed, 25 Jan 2023 16:21:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 705113858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674663697; bh=9HNxN1ZXSYZ2P0IKvCE8SIJZHaGnLRkldXBUjB87KXU=; h=From:To:Subject:Date:From; b=vV2Mslng5zw08ES9AmFeWtuxon6Am3mloivXkTISb+vrUu7G0lTuegQ5CemUbkEdK 9QHajixhceKk9ilx7/qzY44y3T5gBIRlhzv6rg8S5r5H2hh6CYeFASxoY2tyam4tjk qKzeRYEZvlKI5fbp7jWIUsUz+QMkz831yKFuHwz0= 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 is_remote X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: e0a8643d2cea10858f30a8378f6cab4472dee0f9 X-Git-Newrev: 52c0551e9ac03a54e282f9e17d3291c1c8848a7b Message-Id: <20230125162137.705113858D28@sourceware.org> Date: Wed, 25 Jan 2023 16:21:37 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D52c0551e9ac0= 3a54e282f9e17d3291c1c8848a7b commit 52c0551e9ac03a54e282f9e17d3291c1c8848a7b Author: Tom Tromey Date: Sun Jan 22 13:38:26 2023 -0700 Use require with is_remote =20 This changes some tests to use require with 'is_remote', rather than an explicit test. This adds uniformity helps clean up more spots where a test might exit early without any notification. Diff: --- gdb/testsuite/gdb.base/annotate-symlink.exp | 7 +++---- gdb/testsuite/gdb.base/argv0-symlink.exp | 5 +---- gdb/testsuite/gdb.base/attach-pie-misread.exp | 5 ++--- gdb/testsuite/gdb.base/auto-load.exp | 4 +--- gdb/testsuite/gdb.base/break-interp.exp | 5 ++--- gdb/testsuite/gdb.base/bt-on-fatal-signal.exp | 5 +---- gdb/testsuite/gdb.base/fullname.exp | 9 +++------ gdb/testsuite/gdb.base/fullpath-expand.exp | 7 +++---- gdb/testsuite/gdb.base/gdbhistsize-history.exp | 6 +----- gdb/testsuite/gdb.base/gdbinit-history.exp | 9 +++------ gdb/testsuite/gdb.base/info-fun.exp | 4 +--- gdb/testsuite/gdb.base/libsegfault.exp | 5 +---- gdb/testsuite/gdb.base/macro-source-path.exp | 4 +--- gdb/testsuite/gdb.base/prelink.exp | 4 +--- gdb/testsuite/gdb.base/realname-expand.exp | 7 +++---- gdb/testsuite/gdb.base/skip-solib.exp | 5 ++--- gdb/testsuite/gdb.base/solib-corrupted.exp | 8 +++----- gdb/testsuite/gdb.base/solib-nodir.exp | 4 +--- gdb/testsuite/gdb.base/solib-search.exp | 5 +---- gdb/testsuite/gdb.base/startup-with-shell.exp | 5 +---- gdb/testsuite/gdb.base/style-logging.exp | 5 +---- gdb/testsuite/gdb.base/valgrind-bt.exp | 5 +---- gdb/testsuite/gdb.base/valgrind-disp-step.exp | 5 +---- gdb/testsuite/gdb.base/valgrind-infcall-2.exp | 5 +---- gdb/testsuite/gdb.base/valgrind-infcall.exp | 5 +---- gdb/testsuite/gdb.base/warning.exp | 5 +---- gdb/testsuite/gdb.dwarf2/dw2-dir-file-name.exp | 6 ++---- gdb/testsuite/gdb.dwarf2/dwzbuildid.exp | 4 +--- gdb/testsuite/gdb.dwarf2/dwznolink.exp | 4 +--- gdb/testsuite/gdb.dwarf2/fission-base.exp | 4 +--- gdb/testsuite/gdb.dwarf2/fission-loclists-pie.exp | 4 +--- gdb/testsuite/gdb.dwarf2/fission-loclists.exp | 4 +--- gdb/testsuite/gdb.dwarf2/fission-multi-cu.exp | 4 +--- gdb/testsuite/gdb.dwarf2/fission-reread.exp | 4 +--- gdb/testsuite/gdb.dwarf2/no-gnu-debuglink.exp | 4 +--- gdb/testsuite/gdb.linespec/macro-relative.exp | 7 +++---- gdb/testsuite/gdb.python/py-pp-maint.exp | 5 +---- gdb/testsuite/gdb.server/abspath.exp | 4 +--- gdb/testsuite/gdb.server/server-connect.exp | 4 +--- gdb/testsuite/gdb.server/server-pipe.exp | 4 +--- gdb/testsuite/gdb.threads/attach-into-signal.exp | 5 ++--- gdb/testsuite/gdb.threads/attach-slow-waitpid.exp | 5 ++--- gdb/testsuite/gdb.threads/attach-stopped.exp | 5 ++--- 43 files changed, 64 insertions(+), 156 deletions(-) diff --git a/gdb/testsuite/gdb.base/annotate-symlink.exp b/gdb/testsuite/gd= b.base/annotate-symlink.exp index a0f8ed9eabc..73412406792 100644 --- a/gdb/testsuite/gdb.base/annotate-symlink.exp +++ b/gdb/testsuite/gdb.base/annotate-symlink.exp @@ -15,10 +15,9 @@ =20 standard_testfile realname-expand.c realname-expand-real.c =20 -if [is_remote host] { - unsupported "compiling on a remote host does not support a filename wi= th directory." - return 0 -} +# Compiling on a remote host does not support a filename with +# directory. +require {!is_remote host} =20 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.b= ase/argv0-symlink.exp index b321a244221..57b348b36bb 100644 --- a/gdb/testsuite/gdb.base/argv0-symlink.exp +++ b/gdb/testsuite/gdb.base/argv0-symlink.exp @@ -22,10 +22,7 @@ =20 require isnative =20 -if { [is_remote host] } { - unsupported "argv0-symlink.exp not supported on remote host" - return -1 -} +require {!is_remote host} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/attach-pie-misread.exp b/gdb/testsuite/= gdb.base/attach-pie-misread.exp index 96f02429abd..484bd487a3b 100644 --- a/gdb/testsuite/gdb.base/attach-pie-misread.exp +++ b/gdb/testsuite/gdb.base/attach-pie-misread.exp @@ -15,9 +15,8 @@ =20 # 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*} =20 load_lib prelink-support.exp =20 diff --git a/gdb/testsuite/gdb.base/auto-load.exp b/gdb/testsuite/gdb.base/= auto-load.exp index 23cf72a942f..02ce0467730 100644 --- a/gdb/testsuite/gdb.base/auto-load.exp +++ b/gdb/testsuite/gdb.base/auto-load.exp @@ -15,9 +15,7 @@ =20 standard_testfile =20 -if [is_remote host] { - return 0 -} +require {!is_remote host} =20 set targetdir "${binfile}.dir" set sourcescript "${srcdir}/${subdir}/${testfile}-script" diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.ba= se/break-interp.exp index 9652b32b632..6061c739d05 100644 --- a/gdb/testsuite/gdb.base/break-interp.exp +++ b/gdb/testsuite/gdb.base/break-interp.exp @@ -15,9 +15,8 @@ =20 # 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*} =20 load_lib prelink-support.exp =20 diff --git a/gdb/testsuite/gdb.base/bt-on-fatal-signal.exp b/gdb/testsuite/= gdb.base/bt-on-fatal-signal.exp index 128db758284..d0364cc6b89 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} =20 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/f= ullname.exp index 19da89eae45..51ccb012688 100644 --- a/gdb/testsuite/gdb.base/fullname.exp +++ b/gdb/testsuite/gdb.base/fullname.exp @@ -18,12 +18,9 @@ =20 standard_testfile =20 -# 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} =20 # Create a temporary file in the build directory. Use a different # filename in case ${srcdir} =3D=3D ${objdir}. diff --git a/gdb/testsuite/gdb.base/fullpath-expand.exp b/gdb/testsuite/gdb= .base/fullpath-expand.exp index aee23fe0fea..285d0be08ec 100644 --- a/gdb/testsuite/gdb.base/fullpath-expand.exp +++ b/gdb/testsuite/gdb.base/fullpath-expand.exp @@ -15,10 +15,9 @@ =20 standard_testfile .c fullpath-expand-func.c =20 -if [is_remote host] { - unsupported "compiling on a remote host does not support a filename wi= th directory." - return 0 -} +# Compiling on a remote host does not support a filename with +# directory. +require {!is_remote host} =20 if { [file pathtype $objdir] !=3D "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 d3e4a052c6b..59fd2d0c143 100644 --- a/gdb/testsuite/gdb.base/gdbhistsize-history.exp +++ b/gdb/testsuite/gdb.base/gdbhistsize-history.exp @@ -20,11 +20,7 @@ =20 # 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} =20 # 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 46d76b0e239..4c73293627c 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 =20 # 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. =20 # Do not run if gdb debug is enabled - it interferes with the command hist= ory. require !gdb_debug_enabled =20 -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} =20 # Check that the history size is properly set to SIZE when reading the .gd= binit # 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/i= nfo-fun.exp index 683c732e671..c14d87b8cc7 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 . =20 require allow_shlib_tests -if { [is_remote target] } { - return 0 -} +require {!is_remote target} =20 # Library file. set libname "info-fun-solib" diff --git a/gdb/testsuite/gdb.base/libsegfault.exp b/gdb/testsuite/gdb.bas= e/libsegfault.exp index 9a983992ea0..7862c9600fe 100644 --- a/gdb/testsuite/gdb.base/libsegfault.exp +++ b/gdb/testsuite/gdb.base/libsegfault.exp @@ -22,10 +22,7 @@ =20 # 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} =20 # 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/g= db.base/macro-source-path.exp index d46e93bb5c1..2d6eaeb6c65 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} =20 # 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/pr= elink.exp index 6945a923194..12837b95255 100644 --- a/gdb/testsuite/gdb.base/prelink.exp +++ b/gdb/testsuite/gdb.base/prelink.exp @@ -20,9 +20,7 @@ =20 =20 require isnative allow_shlib_tests is_c_compiler_gcc -if { [is_remote host] } { - return -} +require {!is_remote host} =20 load_lib prelink-support.exp =20 diff --git a/gdb/testsuite/gdb.base/realname-expand.exp b/gdb/testsuite/gdb= .base/realname-expand.exp index ade6fe22c52..74dc725a4d0 100644 --- a/gdb/testsuite/gdb.base/realname-expand.exp +++ b/gdb/testsuite/gdb.base/realname-expand.exp @@ -15,10 +15,9 @@ =20 standard_testfile .c realname-expand-real.c =20 -if [is_remote host] { - unsupported "compiling on a remote host does not support a filename wi= th directory." - return 0 -} +# Compiling on a remote host does not support a filename with +# directory. +require {!is_remote host} =20 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 e04bec9c504..3cdb455bb59 100644 --- a/gdb/testsuite/gdb.base/skip-solib.exp +++ b/gdb/testsuite/gdb.base/skip-solib.exp @@ -21,9 +21,8 @@ =20 # 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*} =20 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 644c8ece11f..e778711a9d6 100644 --- a/gdb/testsuite/gdb.base/solib-corrupted.exp +++ b/gdb/testsuite/gdb.base/solib-corrupted.exp @@ -15,11 +15,9 @@ =20 require allow_shlib_tests =20 -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} =20 set testfile "solib-corrupted" set srcfile start.c diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.bas= e/solib-nodir.exp index dd0724909ad..1530d80d694 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 =20 # The testcase assumes the target can access the OBJDIR. -if [is_remote target] { - return -} +require {!is_remote target} =20 # 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.ba= se/solib-search.exp index 5e9e3d43ee0..1d678efc2d5 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. =20 require allow_shlib_tests -if {[is_remote target]} { - untested "skipping remote target and shared library tests" - return -1 -} +require {!is_remote target} =20 # Build "wrong" and "right" versions of the libraries in separate director= ies. 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 b1f868b520a..51b1e4fa922 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 =20 # 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} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/style-logging.exp b/gdb/testsuite/gdb.b= ase/style-logging.exp index dcf13575a17..a156c39146f 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 redirec= t. require !gdb_debug_enabled =20 -if {[is_remote host]} { - untested "does not work on remote host" - return 0 -} +require {!is_remote host} =20 standard_testfile style.c =20 diff --git a/gdb/testsuite/gdb.base/valgrind-bt.exp b/gdb/testsuite/gdb.bas= e/valgrind-bt.exp index da0261eabe6..6849a344ee3 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 =20 load_lib valgrind.exp =20 -if [is_remote target] { - # The test always runs locally. - return 0 -} +require {!is_remote target} =20 standard_testfile .c if {[build_executable $testfile.exp $testfile $srcfile {debug}] =3D=3D -1}= { diff --git a/gdb/testsuite/gdb.base/valgrind-disp-step.exp b/gdb/testsuite/= gdb.base/valgrind-disp-step.exp index 3fb4341d2c7..1033ac8c6a7 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 =20 load_lib valgrind.exp =20 -if [is_remote target] { - # The test always runs locally. - return 0 -} +require {!is_remote target} =20 standard_testfile .c if {[build_executable "failed to build" $testfile $srcfile {debug}] =3D=3D= -1} { diff --git a/gdb/testsuite/gdb.base/valgrind-infcall-2.exp b/gdb/testsuite/= gdb.base/valgrind-infcall-2.exp index 6ed6ecd1d42..aa8f472cdb5 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 =20 load_lib valgrind.exp =20 -if [is_remote target] { - # The test always runs locally. - return 0 -} +require {!is_remote target} =20 standard_testfile .c if {[build_executable $testfile.exp $testfile $srcfile {debug}] =3D=3D -1}= { diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gd= b.base/valgrind-infcall.exp index bcaca02c900..01267734409 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 =20 load_lib valgrind.exp =20 -if [is_remote target] { - # The test always runs locally. - return 0 -} +require {!is_remote target} =20 standard_testfile .c if {[build_executable $testfile.exp $testfile $srcfile {debug}] =3D=3D -1}= { diff --git a/gdb/testsuite/gdb.base/warning.exp b/gdb/testsuite/gdb.base/wa= rning.exp index 50e680b920d..e58bde537f1 100644 --- a/gdb/testsuite/gdb.base/warning.exp +++ b/gdb/testsuite/gdb.base/warning.exp @@ -15,10 +15,7 @@ =20 # Test that an early warning does not cause a crash. =20 -if {[is_remote host]} { - unsupported "warning.exp can only run on local host" - return -} +require {!is_remote host} =20 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 2f37d4d7955..a6beba443c4 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 =20 # 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*} =20 # Find length of addresses in bytes. if {[is_64_target]} { diff --git a/gdb/testsuite/gdb.dwarf2/dwzbuildid.exp b/gdb/testsuite/gdb.dw= arf2/dwzbuildid.exp index 48fc619f869..1b9ba8da092 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 =20 # No remote host testing either. -if {[is_remote host]} { - return 0 -} +require {!is_remote host} =20 =20 # 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.dwa= rf2/dwznolink.exp index a03bff29068..d0bfa6b57f7 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 =20 # No remote host testing either. -if {[is_remote host]} { - return 0 -} +require {!is_remote host} =20 standard_testfile main.c dwznolink.S =20 diff --git a/gdb/testsuite/gdb.dwarf2/fission-base.exp b/gdb/testsuite/gdb.= dwarf2/fission-base.exp index c3338c2951d..b654de40fcb 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 =20 # We run objcopy locally to split out the .dwo file. -if [is_remote host] { - return 0 -} +require {!is_remote host} =20 # 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/testsu= ite/gdb.dwarf2/fission-loclists-pie.exp index c13450da03d..a6fb3e875a8 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 =20 # We run objcopy locally to split out the .dwo file. -if [is_remote host] { - return 0 -} +require {!is_remote host} =20 # 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 31c7bcafbaf..d906eeb69cc 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 =20 # We run objcopy locally to split out the .dwo file. -if [is_remote host] { - return 0 -} +require {!is_remote host} =20 # 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 7bdf6271f5a..0a2a079e82b 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 =20 # We run objcopy locally to split out the .dwo file. -if [is_remote host] { - return 0 -} +require {!is_remote host} =20 # 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/gd= b.dwarf2/fission-reread.exp index 0ef2b134ea0..01e9eada575 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 =20 # We run objcopy locally to split out the .dwo file. -if [is_remote host] { - return 0 -} +require {!is_remote host} =20 # 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 871a1867308..538004ec95a 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 =20 # No remote host testing either. -if {[is_remote host]} { - return 0 -} +require {!is_remote host} =20 standard_testfile main.c no-gnu-debuglink.S =20 diff --git a/gdb/testsuite/gdb.linespec/macro-relative.exp b/gdb/testsuite/= gdb.linespec/macro-relative.exp index 41159431ddc..4e79ecfc8b4 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 =20 -if [is_remote host] { - unsupported "compiling on a remote host does not support a filename wi= th directory." - return 0 -} +# Compiling on a remote host does not support a filename with +# directory. +require {!is_remote host} =20 set opts {debug additional_flags=3D-I. macros} =20 diff --git a/gdb/testsuite/gdb.python/py-pp-maint.exp b/gdb/testsuite/gdb.p= ython/py-pp-maint.exp index 5e5b8030d20..dc5a1a68955 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. =20 -if [is_remote host] { - untested "py-pp-maint.exp can only be run locally" - return -1 -} +require {!is_remote host} =20 load_lib gdb-python.exp =20 diff --git a/gdb/testsuite/gdb.server/abspath.exp b/gdb/testsuite/gdb.serve= r/abspath.exp index 46657c65e8f..f58d96257c2 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} =20 save_vars { GDBFLAGS } { # If GDB and GDBserver are both running locally, set the sysroot to av= oid diff --git a/gdb/testsuite/gdb.server/server-connect.exp b/gdb/testsuite/gd= b.server/server-connect.exp index 6c4c969c30d..1f5b9a27cf4 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 =20 # We want to have control over where we start gdbserver. -if { [is_remote target] } { - return 0 -} +require {!is_remote target} =20 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.s= erver/server-pipe.exp index 48b79fe723c..e4ad0ce7854 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} =20 load_lib gdbserver-support.exp =20 diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsui= te/gdb.threads/attach-into-signal.exp index 4a5caaa2e85..e5cc1f9b9bb 100644 --- a/gdb/testsuite/gdb.threads/attach-into-signal.exp +++ b/gdb/testsuite/gdb.threads/attach-into-signal.exp @@ -18,9 +18,8 @@ =20 # 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*} =20 standard_testfile set executable_nothr ${testfile}-nothr diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsu= ite/gdb.threads/attach-slow-waitpid.exp index 7512a672890..85db583b0de 100644 --- a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp +++ b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp @@ -38,9 +38,8 @@ =20 # 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*} =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/g= db.threads/attach-stopped.exp index 35b31afafaf..25d63b37090 100644 --- a/gdb/testsuite/gdb.threads/attach-stopped.exp +++ b/gdb/testsuite/gdb.threads/attach-stopped.exp @@ -19,9 +19,8 @@ =20 # 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*} =20 standard_testfile set escapedbinfile [string_to_regexp $binfile]