6 files changed, 45 insertions, 24 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a57716d..569c7b6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-29  Michael Snyder  <msnyder@msnyder-server.eng.vmware.com>
+
+	* gdb.base/callfuncs.exp: Test for skip_float_tests.
+	* gdb.base/call-sc.exp: Ditto.
+	* gdb.base/finish.exp: Ditto.
+	* gdb.base/return.exp: Ditto.
+	* gdb.base/return2.exp: Ditto.
+
 2010-11-30  Doug Evans  <dje@google.com>
 
 	* lib/gdb.exp (gdb_test_sequence): Return result of gdb_expect_list.
diff --git a/gdb/testsuite/gdb.base/call-sc.exp b/gdb/testsuite/gdb.base/call-sc.exp
index 5abbd44..a357cd9 100644
--- a/gdb/testsuite/gdb.base/call-sc.exp
+++ b/gdb/testsuite/gdb.base/call-sc.exp
@@ -440,20 +440,22 @@ start_scalars_test tll
 test_scalar_calls
 test_scalar_returns
 
-# Approx size: 4, 8, ...
-start_scalars_test tf
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 8, 16, ...
-start_scalars_test td
-test_scalar_calls
-test_scalar_returns
-
-# Approx size: 16, 32, ...
-start_scalars_test tld
-test_scalar_calls
-test_scalar_returns
+if ![target_info exists gdb,skip_float_tests] {
+    # Approx size: 4, 8, ...
+    start_scalars_test tf
+    test_scalar_calls
+    test_scalar_returns
+
+    # Approx size: 8, 16, ...
+    start_scalars_test td
+    test_scalar_calls
+    test_scalar_returns
+
+    # Approx size: 16, 32, ...
+    start_scalars_test tld
+    test_scalar_calls
+    test_scalar_returns
+}
 
 # Approx size: 4, 8, ...
 start_scalars_test te
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index 613b5f0..0a9ac45 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -209,10 +209,14 @@ proc do_function_calls {} {
 	"call inferior func with struct - returns int"
     gdb_test "p t_structs_l(struct_val1)" "= 51" \
 	"call inferior func with struct - returns long"
-    gdb_test "p t_structs_f(struct_val1)" "= 2.12.*" \
-       	"call inferior func with struct - returns float"
-    gdb_test "p t_structs_d(struct_val1)" "= 9.87.*" \
-    	"call inferior func with struct - returns double"
+
+    if ![target_info exists gdb,skip_float_tests] {
+	gdb_test "p t_structs_f(struct_val1)" "= 2.12.*" \
+	    "call inferior func with struct - returns float"
+	gdb_test "p t_structs_d(struct_val1)" "= 9.87.*" \
+	    "call inferior func with struct - returns double"
+    }
+
     gdb_test "p t_structs_a(struct_val1)" "= (.unsigned char .. )?\"foo\"" \
     	"call inferior func with struct - returns char *"
 }
diff --git a/gdb/testsuite/gdb.base/finish.exp b/gdb/testsuite/gdb.base/finish.exp
index 83893b8..9c796ca 100644
--- a/gdb/testsuite/gdb.base/finish.exp
+++ b/gdb/testsuite/gdb.base/finish.exp
@@ -103,8 +103,10 @@ proc finish_tests { } {
     finish_1 "int"
     finish_1 "long"
     finish_1 "long_long"
-    finish_1 "float"
-    finish_1 "double"
+    if ![target_info exists gdb,skip_float_tests] {
+	finish_1 "float"
+	finish_1 "double"
+    }
     finish_abbreviation "fin"
 }
 
diff --git a/gdb/testsuite/gdb.base/return.exp b/gdb/testsuite/gdb.base/return.exp
index dcd66f8..47967d7 100644
--- a/gdb/testsuite/gdb.base/return.exp
+++ b/gdb/testsuite/gdb.base/return.exp
@@ -89,7 +89,10 @@ proc return_tests { } {
     # is not xfailed.
 
     setup_xfail "sparc-*-solaris2.3*" "sparc-*-solaris2.4*" "m6811-*-*"
-    gdb_test "p tmp3" ".* = 5.*" "correct value returned double test (known problem with sparc solaris)"
+    if ![target_info exists gdb,skip_float_tests] {
+	gdb_test "p tmp3" ".* = 5.*" \
+	    "correct value returned double test (known problem with sparc solaris)"
+    }
 }
 
 set prev_timeout $timeout
diff --git a/gdb/testsuite/gdb.base/return2.exp b/gdb/testsuite/gdb.base/return2.exp
index f3d69d4..c268c78 100644
--- a/gdb/testsuite/gdb.base/return2.exp
+++ b/gdb/testsuite/gdb.base/return2.exp
@@ -98,9 +98,11 @@ proc return2_tests { } {
     if { ! [istarget "m6811-*-*"] && ![istarget "h8300*-*"] } then {
         return_1 "long_long"
     }
-    return_1 "float"
-    if { ! [istarget "m6811-*-*"] } then {
-        return_1 "double"
+    if ![target_info exists gdb,skip_float_tests] {
+	return_1 "float"
+	if { ! [istarget "m6811-*-*"] } then {
+	    return_1 "double"
+	}
     }
 }