From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id E54403858004; Fri, 13 Jan 2023 20:37:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E54403858004 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642223; bh=0Xxx3z0iKqIIifQnPA+vUe9hAALVKYQFFfIpU21y4oA=; h=From:To:Subject:Date:From; b=N/OeiXXse8P0yUevjHOyjZmVxjOTaZoQYpoX1L9+XjKE1om5cwFPiEjZvHXf7WVfy mbBwNvuDf0YRjRf2BkSOPpoguN/H/I5AR8hsmdtZEy2K1hJkx+T6i+44bqRlxPdnuz kCeJGjHDooqMeI+sia4AuHtEBKhvQnHcRuk17BQk= 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 !gdb_debug_enabled X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 402c7447615b8099756e68d8d6d0d1627133a863 X-Git-Newrev: e5bf39c507a7806f0926a35a81b78b5cc5273c6a Message-Id: <20230113203703.E54403858004@sourceware.org> Date: Fri, 13 Jan 2023 20:37:03 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3De5bf39c507a7= 806f0926a35a81b78b5cc5273c6a commit e5bf39c507a7806f0926a35a81b78b5cc5273c6a Author: Tom Tromey Date: Wed Dec 14 16:42:16 2022 -0700 Use require !gdb_debug_enabled =20 This changes some tests to use "require !gdb_debug_enabled". Diff: --- gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp | 5 += ---- gdb/testsuite/gdb.base/debug-expr.exp | 5 += ---- gdb/testsuite/gdb.base/foll-fork.exp | 5 += ---- gdb/testsuite/gdb.base/fork-print-inferior-events.exp | 5 += ---- gdb/testsuite/gdb.base/gdb-sigterm.exp | 5 += ---- gdb/testsuite/gdb.base/gdbinit-history.exp | 5 += ---- gdb/testsuite/gdb.base/osabi.exp | 5 += ---- gdb/testsuite/gdb.base/page-logging.exp | 5 += ---- gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp | 5 += ---- gdb/testsuite/gdb.base/style-logging.exp | 5 += ---- gdb/testsuite/gdb.base/ui-redirect.exp | 5 += ---- gdb/testsuite/gdb.fortran/debug-expr.exp | 5 += ---- gdb/testsuite/gdb.gdb/unittest.exp | 5 += ---- gdb/testsuite/gdb.mi/new-ui-mi-sync.exp | 5 += ---- gdb/testsuite/gdb.mi/user-selected-context-sync.exp | 5 += ---- gdb/testsuite/gdb.threads/check-libthread-db.exp | 5 += ---- .../gdb.threads/signal-while-stepping-over-bp-other-thread.exp | 4 += --- gdb/testsuite/gdb.threads/stepi-random-signal.exp | 5 += ---- 18 files changed, 18 insertions(+), 71 deletions(-) diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/tests= uite/gdb.base/breakpoint-in-ro-region.exp index 00a4fe5af5b..0330cfa345a 100644 --- a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp +++ b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp @@ -17,10 +17,7 @@ =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base= /debug-expr.exp index a2fbf7470b1..c7e2afce5a0 100644 --- a/gdb/testsuite/gdb.base/debug-expr.exp +++ b/gdb/testsuite/gdb.base/debug-expr.exp @@ -17,10 +17,7 @@ =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile .c =20 diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/= foll-fork.exp index 59a664952c3..51dfcce7ff5 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -15,10 +15,7 @@ =20 # Test relies on checking follow-fork output. Do not run if gdb debug is # enabled as it will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/te= stsuite/gdb.base/fork-print-inferior-events.exp index 1b0ff149b31..33ac172c53b 100644 --- a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp +++ b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp @@ -24,10 +24,7 @@ require !use_gdb_stub =20 # Test relies on checking follow-fork output. Do not run if gdb debug is # enabled as it will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/gdb-sigterm.exp b/gdb/testsuite/gdb.bas= e/gdb-sigterm.exp index d2392394aaf..e9dc5f2ea27 100644 --- a/gdb/testsuite/gdb.base/gdb-sigterm.exp +++ b/gdb/testsuite/gdb.base/gdb-sigterm.exp @@ -17,10 +17,7 @@ =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb= .base/gdbinit-history.exp index b4f0d1b6eef..46d76b0e239 100644 --- a/gdb/testsuite/gdb.base/gdbinit-history.exp +++ b/gdb/testsuite/gdb.base/gdbinit-history.exp @@ -22,10 +22,7 @@ # local machine. =20 # Do not run if gdb debug is enabled - it interferes with the command hist= ory. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 if { [is_remote host] } { unsupported "can't set environment variables on remote host" diff --git a/gdb/testsuite/gdb.base/osabi.exp b/gdb/testsuite/gdb.base/osab= i.exp index e9f761902b5..a412d932f7d 100644 --- a/gdb/testsuite/gdb.base/osabi.exp +++ b/gdb/testsuite/gdb.base/osabi.exp @@ -17,10 +17,7 @@ =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 # Test that choosing "set osabi none" really requests a gdbarch with no os= abi. =20 diff --git a/gdb/testsuite/gdb.base/page-logging.exp b/gdb/testsuite/gdb.ba= se/page-logging.exp index a45c5d5c902..ec54ba12c65 100644 --- a/gdb/testsuite/gdb.base/page-logging.exp +++ b/gdb/testsuite/gdb.base/page-logging.exp @@ -14,10 +14,7 @@ # along with this program. If not, see . =20 # Do not run if gdb debug is enabled as it will interfere with log redirec= t. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 gdb_start =20 diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp b/gdb/testsuite= /gdb.base/sss-bp-on-user-bp-2.exp index 1bf2e139326..85976c211dd 100644 --- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp +++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp @@ -33,10 +33,7 @@ =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.base/style-logging.exp b/gdb/testsuite/gdb.b= ase/style-logging.exp index 75b07086d36..dcf13575a17 100644 --- a/gdb/testsuite/gdb.base/style-logging.exp +++ b/gdb/testsuite/gdb.base/style-logging.exp @@ -16,10 +16,7 @@ # Test that logging does not style. =20 # Do not run if gdb debug is enabled as it will interfere with log redirec= t. -if {[gdb_debug_enabled]} { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 if {[is_remote host]} { untested "does not work on remote host" diff --git a/gdb/testsuite/gdb.base/ui-redirect.exp b/gdb/testsuite/gdb.bas= e/ui-redirect.exp index 2c9fc1aec77..c0ba4f11809 100644 --- a/gdb/testsuite/gdb.base/ui-redirect.exp +++ b/gdb/testsuite/gdb.base/ui-redirect.exp @@ -14,10 +14,7 @@ # along with this program. If not, see . =20 # Do not run if gdb debug is enabled as it will interfere with log redirec= t. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 if { [prepare_for_testing "failed to prepare" ui-redirect start.c] } { return -1 diff --git a/gdb/testsuite/gdb.fortran/debug-expr.exp b/gdb/testsuite/gdb.f= ortran/debug-expr.exp index 75324ac4607..2a45214d89f 100644 --- a/gdb/testsuite/gdb.fortran/debug-expr.exp +++ b/gdb/testsuite/gdb.fortran/debug-expr.exp @@ -19,10 +19,7 @@ require !skip_fortran_tests =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/uni= ttest.exp index c8a68469767..ff532856e40 100644 --- a/gdb/testsuite/gdb.gdb/unittest.exp +++ b/gdb/testsuite/gdb.gdb/unittest.exp @@ -15,10 +15,7 @@ =20 # Do not run if gdb debug is enabled as maintenance output will be # redirected to the log files. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 load_lib completion-support.exp =20 diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi= /new-ui-mi-sync.exp index e9a85394130..07b316c8ce9 100644 --- a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp +++ b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp @@ -21,10 +21,7 @@ # stops again. See PR gdb/20418. =20 # Do not run if gdb debug is enabled as it doesn't work for separate-mi-tt= y. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 load_lib mi-support.exp =20 diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/test= suite/gdb.mi/user-selected-context-sync.exp index 55dab46fba8..91ca9b16bf8 100644 --- a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp +++ b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp @@ -30,10 +30,7 @@ # are using all-stop, or running, if we are using non-stop. =20 # Do not run if gdb debug is enabled as it doesn't work for separate-mi-tt= y. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 load_lib mi-support.exp =20 diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsui= te/gdb.threads/check-libthread-db.exp index c93706e3818..2324b7f27e6 100644 --- a/gdb/testsuite/gdb.threads/check-libthread-db.exp +++ b/gdb/testsuite/gdb.threads/check-libthread-db.exp @@ -20,10 +20,7 @@ if {[target_info gdb_protocol] !=3D "" || ![istarget *-l= inux*]} { =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile =20 diff --git a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-= thread.exp b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-= thread.exp index 0bb26f36cbb..65ecdcd5e33 100644 --- a/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.= exp +++ b/gdb/testsuite/gdb.threads/signal-while-stepping-over-bp-other-thread.= exp @@ -20,9 +20,7 @@ =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - return -} +require !gdb_debug_enabled =20 standard_testfile set executable ${testfile} diff --git a/gdb/testsuite/gdb.threads/stepi-random-signal.exp b/gdb/testsu= ite/gdb.threads/stepi-random-signal.exp index 113e0f737ee..bccc319b6f5 100644 --- a/gdb/testsuite/gdb.threads/stepi-random-signal.exp +++ b/gdb/testsuite/gdb.threads/stepi-random-signal.exp @@ -15,10 +15,7 @@ =20 # Test relies on checking gdb debug output. Do not run if gdb debug is # enabled as any debug will be redirected to the log. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled =20 standard_testfile set executable ${testfile}