From caab91aebbcfba6d9df7008adcc50e39fe8ef6b7 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Wed, 14 Dec 2022 09:39:54 -0700
Subject: [PATCH] Use require !skip_ifunc_tests

This changes some tests to use "require !skip_ifunc_tests".
---
 gdb/testsuite/gdb.base/gnu-ifunc.exp        | 6 +-----
 gdb/testsuite/gdb.compile/compile-ifunc.exp | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.base/gnu-ifunc.exp b/gdb/testsuite/gdb.base/gnu-ifunc.exp
index fd5eaa1233b..967d1e053e7 100644
--- a/gdb/testsuite/gdb.base/gnu-ifunc.exp
+++ b/gdb/testsuite/gdb.base/gnu-ifunc.exp
@@ -13,11 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-require !skip_shlib_tests
-
-if {[skip_ifunc_tests]} {
-    return 0
-}
+require !skip_shlib_tests !skip_ifunc_tests
 
 standard_testfile .c
 set staticexecutable ${testfile}-static
diff --git a/gdb/testsuite/gdb.compile/compile-ifunc.exp b/gdb/testsuite/gdb.compile/compile-ifunc.exp
index 866207635c1..bfbe65a503b 100644
--- a/gdb/testsuite/gdb.compile/compile-ifunc.exp
+++ b/gdb/testsuite/gdb.compile/compile-ifunc.exp
@@ -15,9 +15,7 @@
 
 load_lib compile-support.exp
 
-if {[skip_ifunc_tests]} {
-    return 0
-}
+require !skip_ifunc_tests
 
 standard_testfile
 
-- 
2.30.2