From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <tromey@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2126)
	id 007E93858D28; Wed, 25 Jan 2023 16:21:06 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 007E93858D28
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1674663667;
	bh=ip9ClJWMiT7oSSlHb0gH3qz37tg4qqz8jCIoKAlfh38=;
	h=From:To:Subject:Date:From;
	b=C4DfL+D4PV9IrDbZ9WxA8VtRoXIJJNfXWx0PVLRnDdumo5IYhixhxsQysj71Vi1w3
	 Pzhs4xj29eLNyEFkTHRDsTI5Cxd8dxHk2v3Svbf3Fxptbm7qJz9csaI/ynyxWXdhhZ
	 Y9nLPbhKlKlY1ZySuy0wfH2xuytALwl7fWREpdcU=
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Tom Tromey <tromey@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] Rename skip_float_test to allow form
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom Tromey <tom@tromey.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: c2b7bed6454a1253564715f7985a6abac5eb4cdc
X-Git-Newrev: 42abd7386e63a5637e46b0705896e0d86dd4e490
Message-Id: <20230125162107.007E93858D28@sourceware.org>
Date: Wed, 25 Jan 2023 16:21:06 +0000 (GMT)
List-Id: <gdb-cvs.sourceware.org>

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D42abd7386e63=
a5637e46b0705896e0d86dd4e490

commit 42abd7386e63a5637e46b0705896e0d86dd4e490
Author: Tom Tromey <tom@tromey.com>
Date:   Sat Jan 21 23:02:42 2023 -0700

    Rename skip_float_test to allow form
   =20
    This renames skip_float_test to allow_float_test and updates its users
    to use require.

Diff:
---
 gdb/testsuite/gdb.arch/arm-neon.exp                  |  5 +----
 gdb/testsuite/gdb.arch/riscv-info-fcsr.exp           |  5 +----
 gdb/testsuite/gdb.base/call-ar-st.exp                | 20 ++++++++++------=
----
 gdb/testsuite/gdb.base/call-rt-st.exp                |  6 +++---
 gdb/testsuite/gdb.base/call-sc.exp                   |  4 ++--
 gdb/testsuite/gdb.base/callfuncs.exp                 |  8 ++++----
 gdb/testsuite/gdb.base/finish.exp                    |  6 +++---
 gdb/testsuite/gdb.base/funcargs.exp                  |  6 +++---
 .../gdb.base/infcall-nested-structs.exp.tcl          |  2 +-
 gdb/testsuite/gdb.base/return-nodebug.exp            |  4 ++--
 gdb/testsuite/gdb.base/return.exp                    |  6 +++---
 gdb/testsuite/gdb.base/return2.exp                   |  6 +++---
 gdb/testsuite/gdb.base/structs.exp                   |  8 ++++----
 gdb/testsuite/gdb.base/varargs.exp                   |  4 ++--
 gdb/testsuite/lib/gdb.exp                            | 18 +++++++++-------=
--
 15 files changed, 51 insertions(+), 57 deletions(-)

diff --git a/gdb/testsuite/gdb.arch/arm-neon.exp b/gdb/testsuite/gdb.arch/a=
rm-neon.exp
index 409623e8c6c..54720e891e3 100644
--- a/gdb/testsuite/gdb.arch/arm-neon.exp
+++ b/gdb/testsuite/gdb.arch/arm-neon.exp
@@ -20,10 +20,7 @@ if {![istarget "aarch64*-*-*"] && ![istarget "arm*-*-*"]=
} {
     return
 }
=20
-if { [gdb_skip_float_test] } {
-    verbose "Skipping ${gdb_test_file_name}."
-    return
-}
+require allow_float_test
=20
 standard_testfile
 if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} {debu=
g quiet}] } {
diff --git a/gdb/testsuite/gdb.arch/riscv-info-fcsr.exp b/gdb/testsuite/gdb=
.arch/riscv-info-fcsr.exp
index 94b7279336f..d8e88994266 100644
--- a/gdb/testsuite/gdb.arch/riscv-info-fcsr.exp
+++ b/gdb/testsuite/gdb.arch/riscv-info-fcsr.exp
@@ -21,10 +21,7 @@ if {![istarget "riscv*-*-*"]} {
     return
 }
=20
-if { [gdb_skip_float_test] } {
-    untested "no floating point support"
-    return
-}
+require allow_float_test
=20
 standard_testfile
=20
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base=
/call-ar-st.exp
index c86a5c38a78..37b817ae279 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -29,7 +29,7 @@ if [target_info exists gdb,cannot_call_functions] {
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile debug]} {
     return -1
@@ -61,7 +61,7 @@ gdb_test continue \
=20
=20
 #call print_double_array(double_array)
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "print print_double_array(double_array)"] } {
=20
     gdb_test_stdio "print print_double_array(double_array)" \
@@ -122,7 +122,7 @@ gdb_test "tbreak $stop_line" \
 	"Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
 	"tbreakpoint at tbreak3"
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "continuing to tbreak3"] } {
=20
     gdb_test_stdio "continue" \
@@ -175,7 +175,7 @@ if ![gdb_skip_stdio_test "next over print_int_array in =
print_all_arrays"] {
 }
=20
 #call print_double_array(array_d)
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "print print_double_array(array_d)"] } {
=20
     gdb_test_stdio "print print_double_array(array_d)" \
@@ -193,7 +193,7 @@ gdb_test "tbreak $stop_line" \
 "Temporary breakpoint.* file .*$srcfile, line $stop_line.*" \
 "tbreakpoint at tbreak4"
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "continuing to tbreak4"] } {
=20
     gdb_test_stdio "continue" \
@@ -312,7 +312,7 @@ if ![gdb_skip_stdio_test "continuing to tbreak6"] {
 #                         *flags, *flags_combo, *three_char, *five_char,=20
 #                         *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "print print_small_structs(...)"] } {
     gdb_test_stdio "print print_small_structs(*struct1, *struct2, *struct3=
, *struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo,=
 *d1, *d2, *d3, *f1, *f2, *f3)" \
 	[multi_line \
@@ -375,7 +375,7 @@ gdb_test "print compute_with_small_structs(20)" \
 #call print_ten_doubles(123.456, 123.456, -0.12, -1.23, 343434.8, 89.098, =

 #                       3.14, -5678.12345, -0.11111111, 216.97065)
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "print print_ten_doubles(...)"]} {
     gdb_test_stdio "print print_ten_doubles(123.456, 123.456, -0.12, -1.23=
, 343434.8, 89.098, 3.14, -5678.12345, -0.11111111, 216.97065)" \
 	[multi_line \
@@ -403,7 +403,7 @@ gdb_test "tbreak print_long_arg_list" \
 # The short match case below handles cases where a buffer
 # overflows or something, and expect can't deal with the full
 # line.  Perhaps a more elegant solution exists... -sts 1999-08-17
-if {!$skip_float_test} {
+if {$allow_float_test} {
     gdb_test_multiple "continue" "step into print_long_arg_list" {
 	-re ".*print_long_arg_list \\(a=3D22.25, b=3D33.375, c=3D0, d=3D-25, e=3D=
100, f=3D2345, struct1=3D\{value =3D 6, head =3D 0\}, struct2=3D\{value =3D=
 10, head =3D 0\}, struct3=3D\{value =3D 12, head =3D 0\}, struct4=3D\{valu=
e =3D 14, head =3D 0\}, flags=3D\{alpha =3D 1, beta =3D 0, gamma =3D 1, del=
ta =3D 0, epsilon =3D 1, omega =3D 0\}, flags_combo=3D\{alpha =3D 1, beta =
=3D 0, ch1 =3D 121 \'y\', gamma =3D 1, delta =3D 0, ch2 =3D 110 \'n\', epsi=
lon =3D 1, omega =3D 0\}, three_char=3D\{ch1 =3D 97 \'a\', ch2 =3D 98 \'b\'=
, ch3 =3D 99 \'c\'\}, five_char=3D\{ch1 =3D 108 \'l\', ch2 =3D 109 \'m\', c=
h3 =3D 110 \'n\', ch4 =3D 111 \'o\', ch5 =3D 112 \'p\'\}, int_char_combo=3D=
\{int1 =3D 123, ch1 =3D 122 \'z\'\}, d1=3D\{double1 =3D 10.5\}, d2=3D\{doub=
le1 =3D -3.375\}, d3=3D\{double1 =3D 675.09375\}, f1=3D\{float1 =3D 45.2340=
012, float2 =3D 43.5999985\}, f2=3D\{float1 =3D 78.0100021, float2 =3D 122.=
099998\}, f3=3D\{float1 =3D -1232.34497, float2 =3D -199.210007\}\\) at .*$=
{srcfile}:$stop_line\[\r\n\]+$stop_line\[ \t\]+printf\\(\"double :.*\", a\\=
);.*$gdb_prompt $" {
 	    pass "step into print_long_arg_list"
@@ -425,7 +425,7 @@ set ws "\[\n\r\t \]+"
 #                         flags_combo, three_char, five_char, int_char_com=
bo,=20
 #                         d1, d2, d3, f1, f2, f3)
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "print_small_structs from print_long_arg_list"] =
} {
=20
     # On 32-bit SPARC, some of the args are passed by ref, others by
@@ -526,7 +526,7 @@ gdb_test continue "Continuing\\..*main \\(\\) at .*$src=
file:$stop_line\[\r\n\t \
=20
 #call print_long_arg_list(a, b, c, d, e, f, *struct1, *struct2, *struct3, =
*struct4, *flags, *flags_combo, *three_char, *five_char, *int_char_combo, *=
d1, *d2, *d3, *f1, *f2, *f3)
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
     ![gdb_skip_stdio_test "print print_long_arg_list"] } {
=20
     gdb_test_stdio "print print_long_arg_list(a, b, c, d, e, f, *struct1, =
*struct2, *struct3, *struct4, *flags, *flags_combo, *three_char, *five_char=
, *int_char_combo, *d1, *d2, *d3, *f1, *f2, *f3)" \
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base=
/call-rt-st.exp
index 14d5014e9cf..16ecb9288b7 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -35,7 +35,7 @@ if [target_info exists gdb,cannot_call_functions] {
     return
 }
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 # Start with a fresh gdb.
=20
@@ -120,14 +120,14 @@ if ![gdb_skip_stdio_test "print print_one_large_struc=
t(...)"] {
 	".\[0-9\]+ =3D \\{next_index =3D \\{1, 2, 3, 4, 5, 6, 7, 8, 9, 10\\}, val=
ues =3D \\{4, 6, 8, 10, 12, 14, 16, 18, 20, 22\\}, head =3D 0\\}"
 }
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
         ![gdb_skip_stdio_test "print print_one_double(*d1)"] } {
     print_struct_call "print_one_double(*d1)" \
 	".*Contents of one_double_t:\[ \r\n\]+1\\.111110\[ \r\n\]+" \
 	".\[0-9\]+ =3D \\{double1 =3D 1\\.111\[0-9\]*\\}"
 }
=20
-if {!$skip_float_test && \
+if {$allow_float_test && \
         ![gdb_skip_stdio_test "print print_two_floats(*f3)"] } {
     print_struct_call "print_two_floats(*f3)" \
 	".*Contents of two_floats_t:\[ \r\n\]+-2\\.345000\[ \t]+1\\.000000\[ \r\n=
\]+" \
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/ca=
ll-sc.exp
index 3d4ac06dab1..dc78308d42e 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -29,7 +29,7 @@ if [target_info exists gdb,cannot_call_functions] {
=20
 standard_testfile .c
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 # Compile a variant of scalars.c using TYPE to specify the type of the
 # parameter and return-type.  Run the compiled program up to "main".
@@ -425,7 +425,7 @@ test tl
 # Approx size: 8, 16, ...
 test tll
=20
-if {!$skip_float_test} {
+if {$allow_float_test} {
     # Approx size: 4, 8, ...
     test tf
=20
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/=
callfuncs.exp
index df67c772e41..9bbf108ac0e 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -32,7 +32,7 @@ if [target_info exists gdb,cannot_call_functions] {
     return
 }
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 # FIXME:  Before calling this proc, we should probably verify that
 # we can call inferior functions and get a valid integral value
@@ -42,7 +42,7 @@ set skip_float_test [gdb_skip_float_test]
 # (computed in the inferior) is 1 for true and 0 for false.
=20
 proc do_function_calls {prototypes} {
-    global gdb_prompt skip_float_test
+    global gdb_prompt allow_float_test
=20
     # We need to up this because this can be really slow on some boards.
     set timeout 60
@@ -75,7 +75,7 @@ proc do_function_calls {prototypes} {
     gdb_test "p t_long_values(789,long_val2)" " =3D 1"
     gdb_test "p t_long_values(long_val1,-321)" " =3D 1"
=20
-    if {!$skip_float_test} {
+    if {$allow_float_test} {
 	gdb_test "p t_float_values(0.0,0.0)" " =3D 0"
=20
 	# These next four tests fail on the mn10300.
@@ -217,7 +217,7 @@ proc do_function_calls {prototypes} {
     gdb_test "p t_structs_l(struct_val1)" "=3D 51" \
 	"call inferior func with struct - returns long"
=20
-    if {!$skip_float_test} {
+    if {$allow_float_test} {
 	gdb_test "p t_structs_f(struct_val1)" "=3D 2.12.*" \
 	    "call inferior func with struct - returns float"
 	gdb_test "p t_structs_d(struct_val1)" "=3D 9.87.*" \
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/fin=
ish.exp
index 9e6961b4016..fa0fb8ba3bb 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -15,7 +15,7 @@
=20
 # This file was written by Michael Snyder (msnyder@redhat.com)
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 # re-use the program from the "return2" test.
 if { [prepare_for_testing "failed to prepare" finish return2.c] } {
@@ -100,7 +100,7 @@ proc finish_no_print {} {
 }
=20
 proc finish_tests { } {
-    global gdb_prompt skip_float_test
+    global gdb_prompt allow_float_test
=20
     if {![runto_main]} {
 	return -1
@@ -112,7 +112,7 @@ proc finish_tests { } {
     finish_1 "int"
     finish_1 "long"
     finish_1 "long_long"
-    if {!$skip_float_test} {
+    if {$allow_float_test} {
 	finish_1 "float"
 	finish_1 "double"
     }
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/f=
uncargs.exp
index 3edc082fafa..860d411685d 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -25,7 +25,7 @@ if [support_complex_tests] {
     lappend compile_flags "additional_flags=3D-DTEST_COMPLEX"
 }
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 if {[prepare_for_testing "failed to prepare" $testfile $srcfile $compile_f=
lags]} {
     return -1
@@ -1078,7 +1078,7 @@ gdb_test_no_output "set print frame-arguments all"
=20
 integral_args
 unsigned_integral_args
-if {!$skip_float_test} {
+if {$allow_float_test} {
   float_and_integral_args
 }
=20
@@ -1088,7 +1088,7 @@ if [support_complex_tests] {
=20
     complex_integral_args
=20
-    if {!$skip_float_test} {
+    if {$allow_float_test} {
 	complex_float_integral_args
     }
 }
diff --git a/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl b/gdb/te=
stsuite/gdb.base/infcall-nested-structs.exp.tcl
index 95411077e81..d9d2fa519d2 100644
--- a/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl
+++ b/gdb/testsuite/gdb.base/infcall-nested-structs.exp.tcl
@@ -167,7 +167,7 @@ if [support_complex_tests] {
     }
 }
=20
-if ![gdb_skip_float_test] {
+if {[allow_float_test]} {
     foreach ta $float_types {
 	start_gdb_and_run_tests $lang $ta
     }
diff --git a/gdb/testsuite/gdb.base/return-nodebug.exp b/gdb/testsuite/gdb.=
base/return-nodebug.exp
index 3c09e0512fb..daee0b8e3fe 100644
--- a/gdb/testsuite/gdb.base/return-nodebug.exp
+++ b/gdb/testsuite/gdb.base/return-nodebug.exp
@@ -13,7 +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/>.
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 proc do_test {type} {
     set typenospace [string map {{ } -} $type]
@@ -49,7 +49,7 @@ proc do_test {type} {
 }
=20
 foreach type {{signed char} {short} {int} {long} {long long} {float} {doub=
le}} {
-    if { $skip_float_test && ($type =3D=3D "float" || $type =3D=3D "double=
") } {
+    if { !$allow_float_test && ($type =3D=3D "float" || $type =3D=3D "doub=
le") } {
 	continue
     }
     set typenospace_dash \
diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/ret=
urn.exp
index 11e1923d660..fb4096e71e6 100644
--- a/gdb/testsuite/gdb.base/return.exp
+++ b/gdb/testsuite/gdb.base/return.exp
@@ -19,10 +19,10 @@ if { [prepare_for_testing "failed to prepare" "return"]=
 } {
     return -1
 }
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 proc return_tests { } {
-    global gdb_prompt skip_float_test
+    global gdb_prompt allow_float_test
=20
=20
     if {![runto func1]} { return 0 }
@@ -90,7 +90,7 @@ proc return_tests { } {
     # is not xfailed.
=20
     setup_xfail "sparc-*-solaris2.3*" "sparc-*-solaris2.4*" "m6811-*-*"
-    if {!$skip_float_test} {
+    if {$allow_float_test} {
 	gdb_test "p tmp3" ".* =3D 5.*" \
 	    "correct value returned double test (known problem with sparc solaris=
)"
     }
diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/re=
turn2.exp
index a65f2ac20fe..6361a6a9dd5 100644
--- a/gdb/testsuite/gdb.base/return2.exp
+++ b/gdb/testsuite/gdb.base/return2.exp
@@ -23,7 +23,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${bi=
nfile}" executable {deb
      return -1
 }
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 proc return_1 { type } {
     global gdb_prompt
@@ -79,7 +79,7 @@ proc return_void { } {
 }
=20
 proc return2_tests { } {
-    global gdb_prompt skip_float_test
+    global gdb_prompt allow_float_test
=20
     if {![runto_main]} {
 	return -1
@@ -93,7 +93,7 @@ proc return2_tests { } {
     if {![istarget "m6811-*-*"] && ![istarget "h8300*-*"]} {
         return_1 "long_long"
     }
-    if {!$skip_float_test} {
+    if {$allow_float_test} {
 	return_1 "float"
 	if {![istarget "m6811-*-*"]} {
 	    return_1 "double"
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/st=
ructs.exp
index ca6e80e8287..31b58cf8bdf 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -29,7 +29,7 @@ standard_testfile .c
 # Regex matching any value of `char' type like: a =3D 65 'A'
 set anychar_re {-?[0-9]{1,3} '(.|\\([0-7]{3}|[a-z]|\\|'))'}
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 # Compile a variant of structs.c using TYPES to specify the type of
 # the first N struct elements (the remaining elements take the type of
@@ -539,7 +539,7 @@ test { tl } {1 3} {1 2}
 # Approx size: 8, 16, ...
 test { tll } {1 2} {1}
=20
-if { !$skip_float_test } {
+if { $allow_float_test } {
     # Approx size: 4, 8, ...
     test { tf } {1 3} {1 2}
=20
@@ -562,7 +562,7 @@ test { tl tc } {2 6} {2}
 # Approx size: 8+1=3D9, 10, ...
 test { tll tc } {2} {}
=20
-if { !$skip_float_test } {
+if { $allow_float_test } {
     # Approx size: 4+1=3D5, 6, ...
     test { tf tc } {2 6} {2}
=20
@@ -585,7 +585,7 @@ test { tc tl } {2 4} {2}
 # Approx size: (1+7)+8=3D16, 24, ...
 test { tc tll } {2} {}
=20
-if { !$skip_float_test } {
+if { $allow_float_test } {
     # Approx size: (1+3)+4=3D8, 12, ...
     test { tc tf } {2 4} {}
=20
diff --git a/gdb/testsuite/gdb.base/varargs.exp b/gdb/testsuite/gdb.base/va=
rargs.exp
index cca7d6ae5cd..f205a715f39 100644
--- a/gdb/testsuite/gdb.base/varargs.exp
+++ b/gdb/testsuite/gdb.base/varargs.exp
@@ -31,7 +31,7 @@
=20
 standard_testfile .c
=20
-set skip_float_test [gdb_skip_float_test]
+set allow_float_test [allow_float_test]
=20
 set additional_flags {debug}
 if [support_complex_tests] {
@@ -81,7 +81,7 @@ gdb_test_stdio "print find_max2(3,1,2,3)" \
     ".\[0-9\]+ =3D 3" \
     "print find_max2(3,1,2,3)"
=20
-if {!$skip_float_test} {
+if {$allow_float_test} {
     gdb_test_stdio "print find_max_double(5,1.0,17.0,2.0,3.0,4.0)" \
 	"find_max\\(.*\\) returns 17\\.000000\[ \r\n\]+" \
 	".\[0-9\]+ =3D 17" \
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 4346c858579..2c53ebe7774 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3167,7 +3167,7 @@ proc with_read1_timeout_factor { factor body } {
=20
 gdb_caching_proc support_complex_tests {
=20
-    if { [gdb_skip_float_test] } {
+    if { ![allow_float_test] } {
 	# If floating point is not supported, _Complex is not
 	# supported.
 	return 0
@@ -6846,13 +6846,13 @@ proc exec_is_pie { executable } {
     return 0
 }
=20
-# Return true if a test should be skipped due to lack of floating
+# Return false if a test should be skipped due to lack of floating
 # point support or GDB can't fetch the contents from floating point
 # registers.
=20
-gdb_caching_proc gdb_skip_float_test {
+gdb_caching_proc allow_float_test {
     if [target_info exists gdb,skip_float_tests] {
-	return 1
+	return 0
     }
=20
     # There is an ARM kernel ptrace bug that hardware VFP registers
@@ -6901,13 +6901,13 @@ gdb_caching_proc gdb_skip_float_test {
=20
 	if {![string match "" $lines]} {
 	    verbose "testfile compilation failed, returning 1" 2
-	    return 0
+	    return 1
 	}
=20
 	# No error message, compilation succeeded so now run it via gdb.
 	# Run the test up to 5 times to detect whether ptrace can
 	# correctly update VFP registers or not.
-	set skip_vfp_test 0
+	set allow_vfp_test 1
 	for {set i 0} {$i < 5} {incr i} {
 	    global gdb_prompt srcdir subdir
=20
@@ -6931,7 +6931,7 @@ gdb_caching_proc gdb_skip_float_test {
 		-re "exited normally.*$gdb_prompt $" {
 		    # However, the exit code is 0.  That means something
 		    # wrong in setting VFP registers.
-		    set skip_vfp_test 1
+		    set allow_vfp_test 0
 		    break
 		}
 	    }
@@ -6940,9 +6940,9 @@ gdb_caching_proc gdb_skip_float_test {
 	gdb_exit
 	remote_file build delete $exe
=20
-	return $skip_vfp_test
+	return $allow_vfp_test
     }
-    return 0
+    return 1
 }
=20
 # Print a message and return true if a test should be skipped