From e5bf39c507a7806f0926a35a81b78b5cc5273c6a Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 14 Dec 2022 16:42:16 -0700 Subject: Use require !gdb_debug_enabled This changes some tests to use "require !gdb_debug_enabled". --- 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(-) (limited to 'gdb/testsuite') diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp index 00a4fe5..0330cfa 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 @@ # 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 standard_testfile diff --git a/gdb/testsuite/gdb.base/debug-expr.exp b/gdb/testsuite/gdb.base/debug-expr.exp index a2fbf74..c7e2afc 100644 --- a/gdb/testsuite/gdb.base/debug-expr.exp +++ b/gdb/testsuite/gdb.base/debug-expr.exp @@ -17,10 +17,7 @@ # 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 standard_testfile .c diff --git a/gdb/testsuite/gdb.base/foll-fork.exp b/gdb/testsuite/gdb.base/foll-fork.exp index 59a6649..51dfcce 100644 --- a/gdb/testsuite/gdb.base/foll-fork.exp +++ b/gdb/testsuite/gdb.base/foll-fork.exp @@ -15,10 +15,7 @@ # 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 standard_testfile diff --git a/gdb/testsuite/gdb.base/fork-print-inferior-events.exp b/gdb/testsuite/gdb.base/fork-print-inferior-events.exp index 1b0ff14..33ac172 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 # 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 standard_testfile diff --git a/gdb/testsuite/gdb.base/gdb-sigterm.exp b/gdb/testsuite/gdb.base/gdb-sigterm.exp index d239239..e9dc5f2 100644 --- a/gdb/testsuite/gdb.base/gdb-sigterm.exp +++ b/gdb/testsuite/gdb.base/gdb-sigterm.exp @@ -17,10 +17,7 @@ # 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 standard_testfile diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp index b4f0d1b..46d76b0 100644 --- a/gdb/testsuite/gdb.base/gdbinit-history.exp +++ b/gdb/testsuite/gdb.base/gdbinit-history.exp @@ -22,10 +22,7 @@ # local machine. # Do not run if gdb debug is enabled - it interferes with the command history. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled 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/osabi.exp index e9f7619..a412d93 100644 --- a/gdb/testsuite/gdb.base/osabi.exp +++ b/gdb/testsuite/gdb.base/osabi.exp @@ -17,10 +17,7 @@ # 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 # Test that choosing "set osabi none" really requests a gdbarch with no osabi. diff --git a/gdb/testsuite/gdb.base/page-logging.exp b/gdb/testsuite/gdb.base/page-logging.exp index a45c5d5..ec54ba1 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 . # Do not run if gdb debug is enabled as it will interfere with log redirect. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled gdb_start 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 1bf2e13..85976c2 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 @@ # 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 standard_testfile diff --git a/gdb/testsuite/gdb.base/style-logging.exp b/gdb/testsuite/gdb.base/style-logging.exp index 75b0708..dcf1357 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. # Do not run if gdb debug is enabled as it will interfere with log redirect. -if {[gdb_debug_enabled]} { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled 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.base/ui-redirect.exp index 2c9fc1a..c0ba4f1 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 . # Do not run if gdb debug is enabled as it will interfere with log redirect. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled 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.fortran/debug-expr.exp index 75324ac..2a45214 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 # 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 standard_testfile .f90 load_lib fortran.exp diff --git a/gdb/testsuite/gdb.gdb/unittest.exp b/gdb/testsuite/gdb.gdb/unittest.exp index c8a6846..ff53285 100644 --- a/gdb/testsuite/gdb.gdb/unittest.exp +++ b/gdb/testsuite/gdb.gdb/unittest.exp @@ -15,10 +15,7 @@ # 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 load_lib completion-support.exp diff --git a/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp b/gdb/testsuite/gdb.mi/new-ui-mi-sync.exp index e9a8539..07b316c 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. # Do not run if gdb debug is enabled as it doesn't work for separate-mi-tty. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.mi/user-selected-context-sync.exp b/gdb/testsuite/gdb.mi/user-selected-context-sync.exp index 55dab46..91ca9b1 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. # Do not run if gdb debug is enabled as it doesn't work for separate-mi-tty. -if [gdb_debug_enabled] { - untested "debug is enabled" - return 0 -} +require !gdb_debug_enabled load_lib mi-support.exp diff --git a/gdb/testsuite/gdb.threads/check-libthread-db.exp b/gdb/testsuite/gdb.threads/check-libthread-db.exp index c93706e..2324b7f 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] != "" || ![istarget *-linux*]} { # 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 standard_testfile 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 0bb26f3..65ecdcd 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 @@ # 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 standard_testfile set executable ${testfile} diff --git a/gdb/testsuite/gdb.threads/stepi-random-signal.exp b/gdb/testsuite/gdb.threads/stepi-random-signal.exp index 113e0f7..bccc319 100644 --- a/gdb/testsuite/gdb.threads/stepi-random-signal.exp +++ b/gdb/testsuite/gdb.threads/stepi-random-signal.exp @@ -15,10 +15,7 @@ # 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 standard_testfile set executable ${testfile} -- cgit v1.1