diff mbox series

[05/27] Minor "require" fixups

Message ID	20230125224614.1006886-6-tom@tromey.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E7993858C62 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 05/27] Minor "require" fixups Date: Wed, 25 Jan 2023 15:45:52 -0700 Message-Id: <20230125224614.1006886-6-tom@tromey.com> In-Reply-To: <20230125224614.1006886-1-tom@tromey.com> References: <20230125224614.1006886-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	Many small testsuite cleanups \| [00/27] Many small testsuite cleanups [01/27] Use ordinary calling convention for clean_restart [02/27] Use clean_restart in gdb.dlang [03/27] Eliminate spurious returns from the test suite [04/27] Remove some dead code in gdb.fortran/info-types.exp [05/27] Minor "require" fixups [06/27] Remove unnecessary call to standard_testfile [07/27] Start gdb after building executable in mi-basics.exp [08/27] Use mi_clean_restart more [09/27] Use clean_restart in gdb.pascal [10/27] Use clean_restart in gdb.linespec [11/27] Use clean_restart in gdb.opencl [12/27] Use clean_restart in gdb.trace [13/27] Use clean_restart in gdb.objc [14/27] Use clean_restart in gdb.threads [15/27] Use clean_restart in gdb.guile [16/27] Use clean_restart in gdb.arch [17/27] Use clean_restart in gdb.reverse [18/27] Use clean_restart in gdb.dwarf2 [19/27] Use clean_restart in gdb.ada [20/27] Use clean_restart in gdb.fortran [21/27] Use clean_restart in gdb.stabs [22/27] Use clean_restart in gdb.go [23/27] Use clean_restart in gdb.perf [24/27] Use clean_restart in gdb.disasm [25/27] Use clean_restart in gdb.cp [26/27] Use clean_restart in gdb.python [27/27] Use clean_restart in gdb.base

Commit Message

Tom Tromey Jan. 25, 2023, 10:45 p.m. UTC

  I found a couple of spots that could use "require", and one spot where
hoisting the "require" closer to the top of the file made it more
clear.
---
 gdb/testsuite/gdb.btrace/enable.exp                   | 5 +----
 gdb/testsuite/gdb.mi/list-thread-groups-available.exp | 3 +--
 gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp        | 5 ++---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/gdb/testsuite/gdb.btrace/enable.exp b/gdb/testsuite/gdb.btrace/enable.exp
index 6a30d7d9187..bedff46ddb6 100644
--- a/gdb/testsuite/gdb.btrace/enable.exp
+++ b/gdb/testsuite/gdb.btrace/enable.exp
@@ -76,10 +76,7 @@  gdb_exit
 # skip the rerun test when using gdbserver
 # otherwise rerun twice, target should be automatically disabled
 load_lib gdbserver-support.exp
-if {![allow_gdbserver_tests]} {
-    unsupported "target does not support gdbserver"
-    return 0
-}
+require allow_gdbserver_tests
 clean_restart $testfile
 if ![runto_main] {
     return -1
diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
index 27224b5f96f..3ab2cab850c 100644
--- a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
+++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
@@ -22,6 +22,7 @@  standard_testfile
 
 # Support for XML is needed to run this test.
 require allow_xml_test
+require can_spawn_for_attach
 
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested "failed to compile"
@@ -32,8 +33,6 @@  if [mi_gdb_start] {
     return
 }
 
-require can_spawn_for_attach
-
 set string_re {(?:[^\\"]|\\.)*}
 
 set id_re "id=\"$decimal\""
diff --git a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
index 4657509e84c..109f4f18235 100644
--- a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
@@ -28,9 +28,8 @@  if [info exists COMPILE] {
     # make check RUNTESTFLAGS="gdb.mi/mi2-amd64-entry-value.exp COMPILE=1"
     set srcfile ${testfile}.c
     lappend opts debug optimize=-O2
-} elseif { ![istarget x86_64-*-* ] || ![is_lp64_target] } {
-    verbose "Skipping mi2-amd64-entry-value."
-    return
+} else {
+    require {istarget x86_64-*-*} is_lp64_target
 }
 
 set executable ${testfile}