From eacd228909680afd71ba4e36e64b147c402b6802 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Wed, 25 Jan 2023 09:43:03 -0700
Subject: [PATCH] Minor "require" fixups

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 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

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\""
-- 
2.30.2