From daaff5cc793acdd4f8667fca3b901647b4c34363 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 3 Jan 2017 18:45:28 +0000 Subject: [PATCH] Fix math/test-fenvinline for no-exceptions configurations. This patch fixes math/test-fenvinline.c to stop it failing in no-exceptions configurations (where some exception macros are defined but may not be supported at runtime). The relevant parts of the test are disabled in that case; some parts can still run (and the rounding mode tests are written in a way such that they work even if the rounding modes aren't supported). Tested for mips64 soft-float, and for x86_64 to make sure the tests still run when the exceptions are supported. * math/test-fenvinline.c (do_test): Disable tests of raised exceptions if !EXCEPTION_TESTS (FLOAT). --- ChangeLog | 5 +++++ math/test-fenvinline.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bb6eaa536..70b643542b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-01-03 Joseph Myers + + * math/test-fenvinline.c (do_test): Disable tests of raised + exceptions if !EXCEPTION_TESTS (FLOAT). + 2017-01-03 Adhemerval Zanella [BZ #19390] diff --git a/math/test-fenvinline.c b/math/test-fenvinline.c index 38964ef830..8fdfb38d13 100644 --- a/math/test-fenvinline.c +++ b/math/test-fenvinline.c @@ -326,8 +326,9 @@ do_test (void) /* raise all exceptions and test if all are raised */ feraiseexcept (FE_ALL_EXCEPT); - test_exceptions ("feraiseexcept (FE_ALL_EXCEPT) raises all exceptions", - ALL_EXC); + if (EXCEPTION_TESTS (float)) + test_exceptions ("feraiseexcept (FE_ALL_EXCEPT) raises all exceptions", + ALL_EXC); /* Same test, but using double as argument */ feclearexcept ((double)FE_ALL_EXCEPT); @@ -335,10 +336,12 @@ do_test (void) NO_EXC); feraiseexcept ((double)FE_ALL_EXCEPT); - test_exceptions ("feraiseexcept ((double)FE_ALL_EXCEPT) raises all exceptions", - ALL_EXC); + if (EXCEPTION_TESTS (float)) + test_exceptions ("feraiseexcept ((double)FE_ALL_EXCEPT) raises all exceptions", + ALL_EXC); - test_exceptionflag (); + if (EXCEPTION_TESTS (float)) + test_exceptionflag (); test_fesetround (); -- 2.43.5