From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id 961463832E6A for ; Sat, 17 Dec 2022 00:09:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 961463832E6A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw13.mail.unifiedlayer.com (unknown [10.0.90.128]) by progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id 2D01A10048107 for ; Sat, 17 Dec 2022 00:08:46 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id 6KkwpyA1odq8T6Kkwp2RXP; Sat, 17 Dec 2022 00:08:46 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=bNfTnNyZ c=1 sm=1 tr=0 ts=639d088e a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=sHyYjHe8cH0A:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=mDV3o1hIAAAA:8 a=20KFwNOVAAAA:8 a=P15yweMmJqL30Q4g9HoA:9 a=_FVE-zBwftR9WsbkzFJk:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=0stTyYE7hymrP99I3AK9xvhsimfi2pxtWwiaAjeofLo=; b=Q/jFULDP1pBeZQgAUwbioScJEt GtAER92Roq1VJW8EOq95jJhSZ2kV5eCvpd2O9CE1aG2JOK8Q1aUMTCzHTknNIgIjiRHBbQ+91r2sz IT3NfBhwmc80hhJ2QKbZFrdje; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:58438 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1p6Kkv-002gw1-V3; Fri, 16 Dec 2022 17:08:46 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 32/46] Use require use_gdb_stub Date: Fri, 16 Dec 2022 17:08:04 -0700 Message-Id: <20221217000818.3729389-33-tom@tromey.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221217000818.3729389-1-tom@tromey.com> References: <20221217000818.3729389-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1p6Kkv-002gw1-V3 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:58438 X-Source-Auth: tom+tromey.com X-Email-Count: 33 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3028.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This changes some tests to use "require use_gdb_stub". --- 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 2d9b46a20a6..4a2b7b2ac0e 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 # 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 standard_ada_testfile first diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.exp index 868a08fbe4b..4f438833eb7 100644 --- a/gdb/testsuite/gdb.ada/start.exp +++ b/gdb/testsuite/gdb.ada/start.exp @@ -19,10 +19,7 @@ require !skip_ada_tests # 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 standard_ada_testfile dummy diff --git a/gdb/testsuite/gdb.base/args.exp b/gdb/testsuite/gdb.base/args.exp index bb99ac74ad0..f1e59b2b62c 100644 --- a/gdb/testsuite/gdb.base/args.exp +++ b/gdb/testsuite/gdb.base/args.exp @@ -22,9 +22,7 @@ if [target_info exists noargs] { # 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 standard_testfile diff --git a/gdb/testsuite/gdb.base/async-shell.exp b/gdb/testsuite/gdb.base/async-shell.exp index b66f70909ae..ec260542969 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 # The testfile uses "run". The real bug happened only for ![is_remote target]. -if [use_gdb_stub] { - return 0 -} +require !use_gdb_stub 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 a97a69c0a0b..2049dd4bb88 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 . # 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/gdb.base/attach-wait-input.exp index b4b19ac8592..1e3f9ad8294 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. # The test uses the "attach" command. -if [use_gdb_stub] { - return -} +require !use_gdb_stub standard_testfile diff --git a/gdb/testsuite/gdb.base/break-entry.exp b/gdb/testsuite/gdb.base/break-entry.exp index 2d943045588..f6775bfe037 100644 --- a/gdb/testsuite/gdb.base/break-entry.exp +++ b/gdb/testsuite/gdb.base/break-entry.exp @@ -27,10 +27,7 @@ standard_testfile start.c -if [use_gdb_stub] { - untested "skipping tests due to use_gdb_stub" - return -} +require !use_gdb_stub if { [prepare_for_testing "failed to prepare" ${testfile} $srcfile {additional_flags=-static}] } { return -1 diff --git a/gdb/testsuite/gdb.base/break-interp.exp b/gdb/testsuite/gdb.base/break-interp.exp index 99371f1f6a1..3ec47628256 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 . # 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 75a13378691..e40f1de1ca5 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 # Only run on native boards. -if { [use_gdb_stub] || [target_info gdb_protocol] == "extended-remote" } { +require !use_gdb_stub +if { [target_info gdb_protocol] == "extended-remote" } { return -1 } diff --git a/gdb/testsuite/gdb.base/dprintf-detach.exp b/gdb/testsuite/gdb.base/dprintf-detach.exp index 6c71c61cba8..bd3b8c633a3 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 # The test relies on "detach/attach". -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub standard_testfile set escapedbinfile [string_to_regexp ${binfile}] diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp index 88d421bc250..7fdd6d43809 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. # 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 # 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/nostdlib.exp index 6c31109ad68..535f72ff8ca 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. -if [use_gdb_stub] { - untested "skipping tests due to use_gdb_stub" - return -} +require !use_gdb_stub # 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 edda4524f02..d6561a7e61e 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 } -if [use_gdb_stub] { - return 0 -} +require !use_gdb_stub 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/gdb/testsuite/gdb.base/run-control-while-bg-execution.exp index 2f6dde06fa6..cddad2c178d 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. -if {[use_gdb_stub]} { - unsupported "test requires running" - return -} +require !use_gdb_stub standard_testfile diff --git a/gdb/testsuite/gdb.base/set-cwd.exp b/gdb/testsuite/gdb.base/set-cwd.exp index 172d603f734..4a66a75a21d 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 . -if { [use_gdb_stub] } { - untested "skipping tests due to use_gdb_stub" - return -} +require !use_gdb_stub standard_testfile diff --git a/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp b/gdb/testsuite/gdb.base/share-env-with-gdbserver.exp index 8b2a3038e00..290b1cf7335 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 . # This test doesn't make sense on native-gdbserver. -if { [use_gdb_stub] } { - untested "not supported" - return -} +require !use_gdb_stub standard_testfile diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp index 79e46865eba..eb20e35d27e 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. -if { [use_gdb_stub] } { - return 0 -} +require !use_gdb_stub # Library file. set libname "solib-display-lib" diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp index b97064911dd..80cc7f365b9 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 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 63b6ec006ca..4e77a23f196 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 . -if { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub standard_testfile .cc diff --git a/gdb/testsuite/gdb.base/start.exp b/gdb/testsuite/gdb.base/start.exp index a0c8c8c41c1..8560107b779 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 . -if { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub standard_testfile diff --git a/gdb/testsuite/gdb.base/startup-with-shell.exp b/gdb/testsuite/gdb.base/startup-with-shell.exp index e99bfe47ee3..c33704ef939 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 . # This test doesn't make sense on native-gdbserver. -if { [use_gdb_stub] } { - untested "not supported" - return -} +require !use_gdb_stub # 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/testenv.exp index 7f1e58fee31..c3d769a739d 100644 --- a/gdb/testsuite/gdb.base/testenv.exp +++ b/gdb/testsuite/gdb.base/testenv.exp @@ -20,9 +20,7 @@ # 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 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/watchpoint-hw.exp b/gdb/testsuite/gdb.base/watchpoint-hw.exp index 785f949efe9..09eaa341a54 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 . -if { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub require !skip_hw_watchpoint_tests diff --git a/gdb/testsuite/gdb.btrace/multi-inferior.exp b/gdb/testsuite/gdb.btrace/multi-inferior.exp index 1354ae10819..90ab76d0d24 100644 --- a/gdb/testsuite/gdb.btrace/multi-inferior.exp +++ b/gdb/testsuite/gdb.btrace/multi-inferior.exp @@ -24,10 +24,7 @@ require !skip_btrace_tests -if { [use_gdb_stub] } { - unsupported "test creates multiple inferiors" - return -1 -} +require !use_gdb_stub standard_testfile if [prepare_for_testing "failed to prepare" $testfile {} {debug}] { diff --git a/gdb/testsuite/gdb.dwarf2/main-subprogram.exp b/gdb/testsuite/gdb.dwarf2/main-subprogram.exp index ad714d2f29b..0ad0469e5f6 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 -if { [use_gdb_stub] } { - unsupported "test requires running" - return -} +require !use_gdb_stub standard_testfile .c -dw.S diff --git a/gdb/testsuite/gdb.mi/mi-exec-run.exp b/gdb/testsuite/gdb.mi/mi-exec-run.exp index 01f52e22578..d1b014574fa 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=mi" # 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 standard_testfile mi-start.c diff --git a/gdb/testsuite/gdb.mi/mi-start.exp b/gdb/testsuite/gdb.mi/mi-start.exp index 767ba2c19a6..322c2cced1f 100644 --- a/gdb/testsuite/gdb.mi/mi-start.exp +++ b/gdb/testsuite/gdb.mi/mi-start.exp @@ -19,10 +19,7 @@ set MIFLAGS "-i=mi" # 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 gdb_exit if [mi_gdb_start] { diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index 9eec083068b..1ff35229741 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 # 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 set compile_options "debug pthreads" if {[build_executable $testfile.exp $testfile ${srcfile} ${compile_options}] == -1} { diff --git a/gdb/testsuite/gdb.multi/attach-while-running.exp b/gdb/testsuite/gdb.multi/attach-while-running.exp index 276e1fdb661..a8890dca21f 100644 --- a/gdb/testsuite/gdb.multi/attach-while-running.exp +++ b/gdb/testsuite/gdb.multi/attach-while-running.exp @@ -36,10 +36,7 @@ standard_testfile -if [use_gdb_stub] { - unsupported "test requires running" - return -} +require !use_gdb_stub if { [build_executable "failed to prepare" ${testfile} ${srcfile}] } { return diff --git a/gdb/testsuite/gdb.multi/dummy-frame-restore.exp b/gdb/testsuite/gdb.multi/dummy-frame-restore.exp index 0cd1cf5a414..836740d61e2 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} # The plain remote target can't do multiple inferiors. -if [use_gdb_stub] { - return -} +require !use_gdb_stub 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/gdb.multi/multi-arch-exec.exp index 7899c223553..b1bffb03fd1 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" # The plain remote target can't do multiple inferiors. -if [use_gdb_stub] { - return -} +require !use_gdb_stub # 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.multi/multi-arch.exp index a15b0217a9e..0f6bf82b3f5 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" # The plain remote target can't do multiple inferiors. -if [use_gdb_stub] { - return -} +require !use_gdb_stub # 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.multi/multi-exit.exp index 752192fbc89..6e198783112 100644 --- a/gdb/testsuite/gdb.multi/multi-exit.exp +++ b/gdb/testsuite/gdb.multi/multi-exit.exp @@ -24,9 +24,7 @@ standard_testfile -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub if {[build_executable "failed to prepare" $testfile $srcfile]} { return -1 diff --git a/gdb/testsuite/gdb.multi/multi-kill.exp b/gdb/testsuite/gdb.multi/multi-kill.exp index 1474faf8dd0..8783fa0063e 100644 --- a/gdb/testsuite/gdb.multi/multi-kill.exp +++ b/gdb/testsuite/gdb.multi/multi-kill.exp @@ -24,9 +24,7 @@ standard_testfile -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub 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/testsuite/gdb.multi/run-only-second-inf.exp index b94689d0bfa..704a9b40556 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 @@ standard_testfile -if {[use_gdb_stub]} { - return 0 -} +require !use_gdb_stub if {[build_executable "failed to prepare" $testfile $srcfile {debug}]} { return -1 diff --git a/gdb/testsuite/gdb.multi/start-inferior-specific.exp b/gdb/testsuite/gdb.multi/start-inferior-specific.exp index 45e8e8e2cc5..d103a8643d2 100644 --- a/gdb/testsuite/gdb.multi/start-inferior-specific.exp +++ b/gdb/testsuite/gdb.multi/start-inferior-specific.exp @@ -25,9 +25,7 @@ standard_testfile .c -other.c -if { [use_gdb_stub] } { - return -} +require !use_gdb_stub 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 27474b19e36..910df46e51f 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" { # 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 # 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/tids.exp index 44face83860..d274bc15228 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 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {pthreads debug}] } { return -1 diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp index 121d1e8a660..00437c195ef 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -18,10 +18,7 @@ set executable ${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 # 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.python/py-events.exp index ce9342afaff..a06904bcbb3 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 . -if [use_gdb_stub] { - return 0 -} +require !use_gdb_stub load_lib gdb-python.exp diff --git a/gdb/testsuite/gdb.threads/attach-into-signal.exp b/gdb/testsuite/gdb.threads/attach-into-signal.exp index 96878d5e6a0..c2b8ffebf65 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 . # 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 } diff --git a/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp b/gdb/testsuite/gdb.threads/attach-slow-waitpid.exp index 93b1d88c0dc..aa9488af8a6 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. # 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 } diff --git a/gdb/testsuite/gdb.threads/attach-stopped.exp b/gdb/testsuite/gdb.threads/attach-stopped.exp index ef3617cc57d..320c304bb7a 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 . # 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 } diff --git a/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp b/gdb/testsuite/gdb.threads/vfork-multi-inferior.exp index 22a1476eaac..bca4d2572b4 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. -if [use_gdb_stub] { - unsupported "test uses multiple inferiors" - return -} +require !use_gdb_stub standard_testfile .c -sleep.c diff --git a/gdb/testsuite/gdb.tui/corefile-run.exp b/gdb/testsuite/gdb.tui/corefile-run.exp index 219ebadadae..b64ade1035c 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] } { } # Only run on native boards. -if { [use_gdb_stub] || [target_info gdb_protocol] == "extended-remote" } { +require !use_gdb_stub +if { [target_info gdb_protocol] == "extended-remote" } { untested "not supported" return } -- 2.38.1