From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id AC6CD3858425; Fri, 13 Jan 2023 20:36:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC6CD3858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642208; bh=t+csvu2yjI7kFCJymkWCPnY0+AKrcOLiCfoHd4aHalk=; h=From:To:Subject:Date:From; b=TgNzXHOsrUnjli3amTK0G62fGz4BhlDFJsXuUJzFAyZt++VATtItoHqv7tCSTDc9W 4E4VQopnffVvAfDCTyMRoEQCpnPasriPA87dkZQY/MQ0QCZQCuf+F+Ypm2AjW4Mvs2 7E5xfzPisFP5c0w0b2tdfA7QXfXu1JsbWVvs8sP0= 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 !skip_gdbserver_tests X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 604f757b6dae76205253d5434083a7416d6c3630 X-Git-Newrev: ba16d4d85f053d8a533b0c40218f4d681f6eebd5 Message-Id: <20230113203648.AC6CD3858425@sourceware.org> Date: Fri, 13 Jan 2023 20:36:48 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dba16d4d85f05= 3d8a533b0c40218f4d681f6eebd5 commit ba16d4d85f053d8a533b0c40218f4d681f6eebd5 Author: Tom Tromey Date: Wed Dec 14 10:09:38 2022 -0700 Use require !skip_gdbserver_tests =20 This changes some tests to use "require !skip_gdbserver_tests". Diff: --- gdb/testsuite/gdb.btrace/reconnect.exp | 5 +---- gdb/testsuite/gdb.mi/mi-file-transfer.exp | 4 +--- gdb/testsuite/gdb.multi/attach-no-multi-process.exp | 4 +--- gdb/testsuite/gdb.python/py-send-packet.exp | 4 +--- gdb/testsuite/gdb.server/abspath.exp | 4 +--- gdb/testsuite/gdb.server/attach-flag.exp | 4 +--- gdb/testsuite/gdb.server/bkpt-other-inferior.exp | 4 +--- gdb/testsuite/gdb.server/connect-stopped-target.exp | 4 +--- gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp | 4 +--- gdb/testsuite/gdb.server/connect-without-multi-process.exp | 4 +--- gdb/testsuite/gdb.server/exit-multiple-threads.exp | 5 +---- gdb/testsuite/gdb.server/ext-attach.exp | 4 +--- gdb/testsuite/gdb.server/ext-restart.exp | 4 +--- gdb/testsuite/gdb.server/ext-run.exp | 4 +--- gdb/testsuite/gdb.server/ext-wrapper.exp | 4 +--- gdb/testsuite/gdb.server/file-transfer.exp | 4 +--- gdb/testsuite/gdb.server/monitor-exit-quit.exp | 4 +--- gdb/testsuite/gdb.server/multi-ui-errors.exp | 4 +--- gdb/testsuite/gdb.server/no-thread-db.exp | 4 +--- gdb/testsuite/gdb.server/non-existing-program.exp | 4 +--- gdb/testsuite/gdb.server/reconnect-ctrl-c.exp | 5 +---- gdb/testsuite/gdb.server/run-without-local-binary.exp | 4 +--- gdb/testsuite/gdb.server/server-connect.exp | 4 +--- gdb/testsuite/gdb.server/server-kill-python.exp | 4 +--- gdb/testsuite/gdb.server/server-kill.exp | 4 +--- gdb/testsuite/gdb.server/server-mon.exp | 4 +--- gdb/testsuite/gdb.server/server-pipe.exp | 4 +--- gdb/testsuite/gdb.server/server-run.exp | 4 +--- gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp | 5 +---- gdb/testsuite/gdb.server/stop-reply-no-thread.exp | 5 +---- gdb/testsuite/gdb.server/sysroot.exp | 5 +---- gdb/testsuite/gdb.server/twice-connect.exp | 4 +--- gdb/testsuite/gdb.server/unittest.exp | 4 +--- gdb/testsuite/gdb.server/wrapper.exp | 4 +--- 34 files changed, 34 insertions(+), 108 deletions(-) diff --git a/gdb/testsuite/gdb.btrace/reconnect.exp b/gdb/testsuite/gdb.btr= ace/reconnect.exp index 868cf1f0680..548aa16ed29 100644 --- a/gdb/testsuite/gdb.btrace/reconnect.exp +++ b/gdb/testsuite/gdb.btrace/reconnect.exp @@ -20,10 +20,7 @@ load_lib gdbserver-support.exp =20 require !skip_btrace_tests -if { [skip_gdbserver_tests] } { - unsupported "target does not support gdbserver" - return -1 -} +require !skip_gdbserver_tests =20 standard_testfile if [prepare_for_testing "failed to prepare" $testfile $srcfile] { diff --git a/gdb/testsuite/gdb.mi/mi-file-transfer.exp b/gdb/testsuite/gdb.= mi/mi-file-transfer.exp index ec914d18043..71aa2f83cc0 100644 --- a/gdb/testsuite/gdb.mi/mi-file-transfer.exp +++ b/gdb/testsuite/gdb.mi/mi-file-transfer.exp @@ -20,9 +20,7 @@ load_lib gdbserver-support.exp load_lib mi-support.exp set MIFLAGS "-i=3Dmi" =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 standard_testfile basics.c =20 diff --git a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp b/gdb/test= suite/gdb.multi/attach-no-multi-process.exp index 882ab69e14d..50b04ad6761 100644 --- a/gdb/testsuite/gdb.multi/attach-no-multi-process.exp +++ b/gdb/testsuite/gdb.multi/attach-no-multi-process.exp @@ -22,9 +22,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 require can_spawn_for_attach =20 diff --git a/gdb/testsuite/gdb.python/py-send-packet.exp b/gdb/testsuite/gd= b.python/py-send-packet.exp index baec66d5b0c..c6305ed6291 100644 --- a/gdb/testsuite/gdb.python/py-send-packet.exp +++ b/gdb/testsuite/gdb.python/py-send-packet.exp @@ -24,9 +24,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if {[skip_gdbserver_tests]} { - return 0 -} +require !skip_gdbserver_tests =20 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile}] } { return -1 diff --git a/gdb/testsuite/gdb.server/abspath.exp b/gdb/testsuite/gdb.serve= r/abspath.exp index ddfd7221273..58d9b39efc1 100644 --- a/gdb/testsuite/gdb.server/abspath.exp +++ b/gdb/testsuite/gdb.server/abspath.exp @@ -22,9 +22,7 @@ load_lib gdbserver-support.exp =20 standard_testfile normal.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 # 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 diff --git a/gdb/testsuite/gdb.server/attach-flag.exp b/gdb/testsuite/gdb.s= erver/attach-flag.exp index ea4c87ee077..bb6f3673e4e 100644 --- a/gdb/testsuite/gdb.server/attach-flag.exp +++ b/gdb/testsuite/gdb.server/attach-flag.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 require can_spawn_for_attach =20 diff --git a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp b/gdb/testsui= te/gdb.server/bkpt-other-inferior.exp index e52139fc27d..fe561d8e924 100644 --- a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp +++ b/gdb/testsuite/gdb.server/bkpt-other-inferior.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile server.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if { [prepare_for_testing "failed to prepare" ${binfile} "${srcfile}" \ {debug pthreads}] } { diff --git a/gdb/testsuite/gdb.server/connect-stopped-target.exp b/gdb/test= suite/gdb.server/connect-stopped-target.exp index dade80134ff..ed193f8599c 100644 --- a/gdb/testsuite/gdb.server/connect-stopped-target.exp +++ b/gdb/testsuite/gdb.server/connect-stopped-target.exp @@ -20,9 +20,7 @@ load_lib gdbserver-support.exp load_lib prelink-support.exp =20 -if {[skip_gdbserver_tests]} { - return -} +require !skip_gdbserver_tests =20 standard_testfile set executable ${testfile} diff --git a/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp b/gdb= /testsuite/gdb.server/connect-with-no-symbol-file.exp index b0804445f7a..159f82f6c3b 100644 --- a/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp +++ b/gdb/testsuite/gdb.server/connect-with-no-symbol-file.exp @@ -25,9 +25,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if { [build_executable "failed to prepare" $testfile $srcfile debug] } { return -1 diff --git a/gdb/testsuite/gdb.server/connect-without-multi-process.exp b/g= db/testsuite/gdb.server/connect-without-multi-process.exp index 816d367baa6..831ccd6f876 100644 --- a/gdb/testsuite/gdb.server/connect-without-multi-process.exp +++ b/gdb/testsuite/gdb.server/connect-without-multi-process.exp @@ -18,9 +18,7 @@ =20 load_lib gdbserver-support.exp =20 -if {[skip_gdbserver_tests]} { - return -} +require !skip_gdbserver_tests =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.server/exit-multiple-threads.exp b/gdb/tests= uite/gdb.server/exit-multiple-threads.exp index d53651e115b..88c4df11ccd 100644 --- a/gdb/testsuite/gdb.server/exit-multiple-threads.exp +++ b/gdb/testsuite/gdb.server/exit-multiple-threads.exp @@ -25,10 +25,7 @@ =20 load_lib gdbserver-support.exp =20 -if { [skip_gdbserver_tests] } { - verbose "skipping gdbserver tests" - return -1 -} +require !skip_gdbserver_tests =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.se= rver/ext-attach.exp index 62296d091fa..81b324d4c5f 100644 --- a/gdb/testsuite/gdb.server/ext-attach.exp +++ b/gdb/testsuite/gdb.server/ext-attach.exp @@ -22,9 +22,7 @@ load_lib trace-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 require can_spawn_for_attach =20 diff --git a/gdb/testsuite/gdb.server/ext-restart.exp b/gdb/testsuite/gdb.s= erver/ext-restart.exp index 0d133ca2993..df26c91fa25 100644 --- a/gdb/testsuite/gdb.server/ext-restart.exp +++ b/gdb/testsuite/gdb.server/ext-restart.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile server.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =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/ext-run.exp b/gdb/testsuite/gdb.serve= r/ext-run.exp index bfc68673540..7cfd2bf717f 100644 --- a/gdb/testsuite/gdb.server/ext-run.exp +++ b/gdb/testsuite/gdb.server/ext-run.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile server.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if {[build_executable $testfile.exp $testfile $srcfile debug] =3D=3D -1} { return -1 diff --git a/gdb/testsuite/gdb.server/ext-wrapper.exp b/gdb/testsuite/gdb.s= erver/ext-wrapper.exp index 98aa889edcd..4f150cfc0a5 100644 --- a/gdb/testsuite/gdb.server/ext-wrapper.exp +++ b/gdb/testsuite/gdb.server/ext-wrapper.exp @@ -19,9 +19,7 @@ load_lib gdbserver-support.exp =20 standard_testfile wrapper.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if {[build_executable $testfile.exp $testfile $srcfile debug] =3D=3D -1} { return -1 diff --git a/gdb/testsuite/gdb.server/file-transfer.exp b/gdb/testsuite/gdb= .server/file-transfer.exp index ea9298f3a23..cd98ffee90d 100644 --- a/gdb/testsuite/gdb.server/file-transfer.exp +++ b/gdb/testsuite/gdb.server/file-transfer.exp @@ -20,9 +20,7 @@ load_lib gdbserver-support.exp =20 standard_testfile server.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} { return -1 diff --git a/gdb/testsuite/gdb.server/monitor-exit-quit.exp b/gdb/testsuite= /gdb.server/monitor-exit-quit.exp index 8fa41e3f07f..88eb2e483b9 100644 --- a/gdb/testsuite/gdb.server/monitor-exit-quit.exp +++ b/gdb/testsuite/gdb.server/monitor-exit-quit.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile server.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if {[build_executable $testfile.exp $testfile $srcfile debug] =3D=3D -1} { return -1 diff --git a/gdb/testsuite/gdb.server/multi-ui-errors.exp b/gdb/testsuite/g= db.server/multi-ui-errors.exp index e5aad88f140..95a08c9bca6 100644 --- a/gdb/testsuite/gdb.server/multi-ui-errors.exp +++ b/gdb/testsuite/gdb.server/multi-ui-errors.exp @@ -24,9 +24,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if {[skip_gdbserver_tests]} { - return 0 -} +require !skip_gdbserver_tests =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/no-thread-db.exp b/gdb/testsuite/gdb.= server/no-thread-db.exp index d0b43f9cf79..0e2fbae80be 100644 --- a/gdb/testsuite/gdb.server/no-thread-db.exp +++ b/gdb/testsuite/gdb.server/no-thread-db.exp @@ -25,9 +25,7 @@ load_lib gdbserver-support.exp standard_testfile set unresolvable_thread_db_path "/foo/bar" =20 -if {[skip_gdbserver_tests]} { - return 0 -} +require !skip_gdbserver_tests =20 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" ex= ecutable {debug}] !=3D "" } { return -1 diff --git a/gdb/testsuite/gdb.server/non-existing-program.exp b/gdb/testsu= ite/gdb.server/non-existing-program.exp index d4fceeab88a..60ca0a43dfb 100644 --- a/gdb/testsuite/gdb.server/non-existing-program.exp +++ b/gdb/testsuite/gdb.server/non-existing-program.exp @@ -22,9 +22,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 set gdbserver [find_gdbserver] if { $gdbserver =3D=3D "" } { diff --git a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp b/gdb/testsuite/= gdb.server/reconnect-ctrl-c.exp index f316609b609..42707692c4b 100644 --- a/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp +++ b/gdb/testsuite/gdb.server/reconnect-ctrl-c.exp @@ -19,10 +19,7 @@ =20 load_lib gdbserver-support.exp =20 -if { [skip_gdbserver_tests] } { - verbose "skipping gdbserver tests" - return -1 -} +require !skip_gdbserver_tests =20 if [target_info exists gdb,nointerrupts] { verbose "Skipping reconnect-ctrl-c.exp because of nointerrupts." diff --git a/gdb/testsuite/gdb.server/run-without-local-binary.exp b/gdb/te= stsuite/gdb.server/run-without-local-binary.exp index 21682a58c77..4f3f0d9af4e 100644 --- a/gdb/testsuite/gdb.server/run-without-local-binary.exp +++ b/gdb/testsuite/gdb.server/run-without-local-binary.exp @@ -15,9 +15,7 @@ =20 load_lib gdbserver-support.exp =20 -if {[skip_gdbserver_tests]} { - return -} +require !skip_gdbserver_tests =20 standard_testfile normal.c =20 diff --git a/gdb/testsuite/gdb.server/server-connect.exp b/gdb/testsuite/gd= b.server/server-connect.exp index a6d469e54d5..76570f34232 100644 --- a/gdb/testsuite/gdb.server/server-connect.exp +++ b/gdb/testsuite/gdb.server/server-connect.exp @@ -22,9 +22,7 @@ load_lib gdbserver-support.exp =20 standard_testfile normal.c =20 -if {[skip_gdbserver_tests]} { - return 0 -} +require !skip_gdbserver_tests =20 # We want to have control over where we start gdbserver. if { [is_remote target] } { diff --git a/gdb/testsuite/gdb.server/server-kill-python.exp b/gdb/testsuit= e/gdb.server/server-kill-python.exp index dbf52189915..1eb9e2e51c5 100644 --- a/gdb/testsuite/gdb.server/server-kill-python.exp +++ b/gdb/testsuite/gdb.server/server-kill-python.exp @@ -23,9 +23,7 @@ load_lib gdbserver-support.exp =20 standard_testfile multi-ui-errors.c =20 -if {[skip_gdbserver_tests]} { - return 0 -} +require !skip_gdbserver_tests =20 # Gdb needs to be running for skip_python_tests, but exit once we're done, # we'll start a custom gdb after this. diff --git a/gdb/testsuite/gdb.server/server-kill.exp b/gdb/testsuite/gdb.s= erver/server-kill.exp index f59e11a43b5..04b7f62561a 100644 --- a/gdb/testsuite/gdb.server/server-kill.exp +++ b/gdb/testsuite/gdb.server/server-kill.exp @@ -22,9 +22,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if {[skip_gdbserver_tests]} { - return 0 -} +require !skip_gdbserver_tests =20 if { [build_executable "failed to prepare" ${testfile}] } { return -1 diff --git a/gdb/testsuite/gdb.server/server-mon.exp b/gdb/testsuite/gdb.se= rver/server-mon.exp index b9ae0083a36..4b728cb8038 100644 --- a/gdb/testsuite/gdb.server/server-mon.exp +++ b/gdb/testsuite/gdb.server/server-mon.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile server.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =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 662ff0a39c7..2038ca9140d 100644 --- a/gdb/testsuite/gdb.server/server-pipe.exp +++ b/gdb/testsuite/gdb.server/server-pipe.exp @@ -32,9 +32,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 set gdbserver [find_gdbserver] if { $gdbserver =3D=3D "" } { diff --git a/gdb/testsuite/gdb.server/server-run.exp b/gdb/testsuite/gdb.se= rver/server-run.exp index 522719dc6a5..55b40057f91 100644 --- a/gdb/testsuite/gdb.server/server-run.exp +++ b/gdb/testsuite/gdb.server/server-run.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile server.c =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if {[build_executable $testfile.exp $testfile $srcfile debug] =3D=3D -1} { return -1 diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp b/gdb/= testsuite/gdb.server/stop-reply-no-thread-multi.exp index 8ea8344ad00..066f2a1b736 100644 --- a/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp +++ b/gdb/testsuite/gdb.server/stop-reply-no-thread-multi.exp @@ -30,10 +30,7 @@ =20 load_lib gdbserver-support.exp =20 -if { [skip_gdbserver_tests] } { - verbose "skipping gdbserver tests" - return -1 -} +require !skip_gdbserver_tests =20 standard_testfile if { [build_executable "failed to prepare" $testfile $srcfile {debug pthre= ads}] =3D=3D -1 } { diff --git a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp b/gdb/testsu= ite/gdb.server/stop-reply-no-thread.exp index 685ef17bd3d..134ab6a9c29 100644 --- a/gdb/testsuite/gdb.server/stop-reply-no-thread.exp +++ b/gdb/testsuite/gdb.server/stop-reply-no-thread.exp @@ -22,10 +22,7 @@ =20 load_lib gdbserver-support.exp =20 -if { [skip_gdbserver_tests] } { - verbose "skipping gdbserver tests" - return -1 -} +require !skip_gdbserver_tests =20 standard_testfile if { [build_executable "failed to prepare" $testfile $srcfile] =3D=3D -1 }= { diff --git a/gdb/testsuite/gdb.server/sysroot.exp b/gdb/testsuite/gdb.serve= r/sysroot.exp index 0c7e97c11d8..9845a7a8333 100644 --- a/gdb/testsuite/gdb.server/sysroot.exp +++ b/gdb/testsuite/gdb.server/sysroot.exp @@ -20,10 +20,7 @@ =20 load_lib gdbserver-support.exp =20 -if { [skip_gdbserver_tests] } { - verbose "skipping gdbserver tests" - return -1 -} +require !skip_gdbserver_tests =20 standard_testfile if {[build_executable "failed to prepare" $testfile $srcfile "additional_f= lags=3D--no-builtin"] =3D=3D -1} { diff --git a/gdb/testsuite/gdb.server/twice-connect.exp b/gdb/testsuite/gdb= .server/twice-connect.exp index adaef53d2ec..a8318c0de4a 100644 --- a/gdb/testsuite/gdb.server/twice-connect.exp +++ b/gdb/testsuite/gdb.server/twice-connect.exp @@ -19,9 +19,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if { [build_executable "failed to prepare" $::testfile $::srcfile \ {debug}] } { diff --git a/gdb/testsuite/gdb.server/unittest.exp b/gdb/testsuite/gdb.serv= er/unittest.exp index 4fc134ddd83..f727892fdc8 100644 --- a/gdb/testsuite/gdb.server/unittest.exp +++ b/gdb/testsuite/gdb.server/unittest.exp @@ -19,9 +19,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 global server_spawn_id =20 diff --git a/gdb/testsuite/gdb.server/wrapper.exp b/gdb/testsuite/gdb.serve= r/wrapper.exp index e85609bdeca..caaa4f69afb 100644 --- a/gdb/testsuite/gdb.server/wrapper.exp +++ b/gdb/testsuite/gdb.server/wrapper.exp @@ -21,9 +21,7 @@ load_lib gdbserver-support.exp =20 standard_testfile =20 -if { [skip_gdbserver_tests] } { - return 0 -} +require !skip_gdbserver_tests =20 if { [istarget *-*-mingw*] || [istarget *-*-cygwin*] } {