diff mbox series

[v2,38/79] Use require gdb_debug_enabled

Message ID	20230112030052.3306113-39-tom@tromey.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6DB4C38493D3 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH v2 38/79] Use require gdb_debug_enabled Date: Wed, 11 Jan 2023 20:00:11 -0700 Message-Id: <20230112030052.3306113-39-tom@tromey.com> In-Reply-To: <20230112030052.3306113-1-tom@tromey.com> References: <20230112030052.3306113-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Rewrite "require" test procedure and use it more often \| [v2,00/79] Rewrite "require" test procedure and use it more often [v2,01/79] Don't use ensure_gdb_index with require [v2,02/79] Change 'require' to accept a list of predicates [v2,03/79] Use unsupported in 'require' [v2,04/79] Use require supports_reverse [v2,05/79] Use require supports_process_record [v2,06/79] Use require dwarf2_support [v2,07/79] Use require is_x86_like_target [v2,08/79] Use require skip_cplus_tests [v2,09/79] Use require skip_shlib_tests [v2,10/79] Use require skip_dlmopen_tests [v2,11/79] Use require skip_stl_tests [v2,12/79] Use require skip_rust_tests [v2,13/79] Use require skip_fortran_tests [v2,14/79] Use require skip_ada_tests [v2,15/79] Use require skip_go_tests [v2,16/79] Use require skip_d_tests [v2,17/79] Use require skip_ctf_tests [v2,18/79] Use require skip_hw_watchpoint_tests [v2,19/79] Use require skip_ifunc_tests [v2,20/79] Use require skip_aarch64_sve_tests [v2,21/79] Use require skip_btrace_pt_tests [v2,22/79] Use require skip_btrace_tests [v2,23/79] Use require skip_avx_* [v2,24/79] Use require support_displaced_stepping [v2,25/79] Use require is_aarch64_target [v2,26/79] Use require is_aarch32_target [v2,27/79] Use require is_amd64_regs_target [v2,28/79] Use require is_elf_target [v2,29/79] Use require can_single_step_to_signal_handler [v2,30/79] Use require supports_get_siginfo_type [v2,31/79] Use require support_go_compile [v2,32/79] Use require use_gdb_stub [v2,33/79] Use require can_spawn_for_attach [v2,34/79] Use require isnative [v2,35/79] Use require skip_gdbserver_tests [v2,36/79] Use require skip_shlib_tests [v2,37/79] Use require is_c_compiler_gcc [v2,38/79] Use require gdb_debug_enabled [v2,39/79] Use require gdb_skip_xml_test [v2,40/79] Use require gdb_trace_common_supports_arch [v2,41/79] Use require skip_perf_tests [v2,42/79] Use require skip_opencl_tests [v2,43/79] Use require target_can_use_run_cmd [v2,44/79] Use require using_fission [v2,45/79] Use require skip_debuginfod_tests [v2,46/79] Use require gnat_runtime_has_debug_info [v2,47/79] Rewrite skip_python_tests [v2,48/79] Remove mi_skip_python_tests [v2,49/79] Fix latent bug in default_prompt_gdb_start [v2,50/79] Use "require" for Python tests [v2,51/79] Rename to allow_xml_test [v2,52/79] Rename to allow_aarch64_sve_tests [v2,53/79] Rename to allow_ada_tests [v2,54/79] Rename to allow_avx512bf16_tests [v2,55/79] Rename to allow_avx512fp16_tests [v2,56/79] Rename to allow_btrace_pt_tests [v2,57/79] Rename to allow_btrace_tests [v2,58/79] Rename to allow_cplus_tests and allow_stl_tests [v2,59/79] Rename to allow_ctf_tests [v2,60/79] Rename to allow_debuginfod_tests [v2,61/79] Rename to allow_dlmopen_tests [v2,62/79] Rename to allow_d_tests [v2,63/79] Rename to allow_fortran_tests [v2,64/79] Rename to allow_gdbserver_tests [v2,65/79] Rename to allow_go_tests [v2,66/79] Rename to allow_hw_watchpoint_access_tests [v2,67/79] Rename to allow_hw_watchpoint_multi_tests [v2,68/79] Rename to allow_hw_watchpoint_tests [v2,69/79] Rename to allow_ifunc_tests [v2,70/79] Rename to allow_opencl_tests [v2,71/79] Rename to allow_perf_tests [v2,72/79] Rename to allow_python_tests [v2,73/79] Rename to allow_rust_tests [v2,74/79] Rename to allow_shlib_tests [v2,75/79] Rename to allow_tsx_tests [v2,76/79] Rename to allow_hw_breakpoint_tests [v2,77/79] Rename to allow_guile_tests [v2,78/79] Rename to allow_tui_tests [v2,79/79] Consolidate calls to require

Commit Message

Tom Tromey Jan. 12, 2023, 3 a.m. UTC

  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 +----
 .../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 mbox series

Patch

diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/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 @@ 
 
 # 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 a2fbf7470b1..c7e2afce5a0 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 59a664952c3..51dfcce7ff5 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 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
 
 # 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 d2392394aaf..e9dc5f2ea27 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 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.
 
 # 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 e9f761902b5..a412d932f7d 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 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 <http://www.gnu.org/licenses/>.
 
 # 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 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 @@ 
 
 # 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 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.
 
 # 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 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 <http://www.gnu.org/licenses/>.
 
 # 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 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
 
 # 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 c8a68469767..ff532856e40 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 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.
 
 # 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 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.
 
 # 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 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] != "" || ![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 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 @@ 
 
 # 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 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 @@ 
 
 # 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}