From d426f7b4198dc3278feb6ccbe0537e6029da78e7 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Thu, 2 Dec 2010 21:34:14 +0000 Subject: [PATCH] 2010-11-29 Michael Snyder * 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. --- gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.base/call-sc.exp | 30 +++++++++++++++------------- gdb/testsuite/gdb.base/callfuncs.exp | 12 +++++++---- gdb/testsuite/gdb.base/finish.exp | 6 ++++-- gdb/testsuite/gdb.base/return.exp | 5 ++++- gdb/testsuite/gdb.base/return2.exp | 8 +++++--- 6 files changed, 45 insertions(+), 24 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index a57716de77c..569c7b63a40 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-11-29 Michael Snyder + + * 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 * 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 5abbd4436e5..a357cd97126 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 613b5f0d818..0a9ac45adec 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 83893b8c828..9c796ca75db 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 dcd66f895cf..47967d76181 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 f3d69d407e2..c268c78a86c 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" + } } } -- 2.30.2