diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | math/libm-test-driver.c | 17 | ||||
| -rw-r--r-- | math/test-double-finite.c | 2 | ||||
| -rw-r--r-- | math/test-double-vlen2.h | 2 | ||||
| -rw-r--r-- | math/test-double-vlen4.h | 2 | ||||
| -rw-r--r-- | math/test-double-vlen8.h | 2 | ||||
| -rw-r--r-- | math/test-double.c | 2 | ||||
| -rw-r--r-- | math/test-float-finite.c | 2 | ||||
| -rw-r--r-- | math/test-float-vlen16.h | 2 | ||||
| -rw-r--r-- | math/test-float-vlen4.h | 2 | ||||
| -rw-r--r-- | math/test-float-vlen8.h | 2 | ||||
| -rw-r--r-- | math/test-float.c | 2 | ||||
| -rw-r--r-- | math/test-idouble.c | 2 | ||||
| -rw-r--r-- | math/test-ifloat.c | 2 | ||||
| -rw-r--r-- | math/test-ildouble.c | 2 | ||||
| -rw-r--r-- | math/test-ldouble-finite.c | 2 | ||||
| -rw-r--r-- | math/test-ldouble.c | 2 |
17 files changed, 38 insertions, 31 deletions
@@ -1,5 +1,27 @@ 2017-02-06 Joseph Myers <joseph@codesourcery.com> + * math/libm-test-driver.c (STRX): New macro. + (STR): Likewise. + (STR_FLOAT): Likewise. + (STR_VEC_LEN): Likewise. + (TEST_MSG): Likewise. Define here instead of expecting to be + defined by including file. + * math/test-double-finite.c (TEST_MSG): Remove macro. + * math/test-double-vlen2.h (TEST_MSG): Likewise. + * math/test-double-vlen4.h (TEST_MSG): Likewise. + * math/test-double-vlen8.h (TEST_MSG): Likewise. + * math/test-double.c (TEST_MSG): Likewise. + * math/test-float-finite.c (TEST_MSG): Likewise. + * math/test-float-vlen16.h (TEST_MSG): Likewise. + * math/test-float-vlen4.h (TEST_MSG): Likewise. + * math/test-float-vlen8.h (TEST_MSG): Likewise. + * math/test-float.c (TEST_MSG): Likewise. + * math/test-idouble.c (TEST_MSG): Likewise. + * math/test-ifloat.c (TEST_MSG): Likewise. + * math/test-ildouble.c (TEST_MSG): Likewise. + * math/test-ldouble-finite.c (TEST_MSG): Likewise. + * math/test-ldouble.c (TEST_MSG): Likewise. + * math/libm-test.inc: Move all tests of individual functions to libm-test-*.inc and #include libm-test-*.c files. (acos_test_data): Remove. diff --git a/math/libm-test-driver.c b/math/libm-test-driver.c index 1227d52..ea890ba 100644 --- a/math/libm-test-driver.c +++ b/math/libm-test-driver.c @@ -25,7 +25,6 @@ FUNC(function): converts general function name (like cos) to name with correct suffix (e.g. cosl or cosf) FLOAT: floating point type to test - - TEST_MSG: informal message to be displayed chooses one of the parameters as delta for testing equality PREFIX A macro which defines the prefix for common macros for the @@ -108,6 +107,22 @@ arrays. */ #include "libm-test-ulps.h" +#define STRX(x) #x +#define STR(x) STRX (x) +#define STR_FLOAT STR (FLOAT) +#define STR_VEC_LEN STR (VEC_LEN) + +/* Informal description of the functions being tested. */ +#if TEST_MATHVEC +# define TEST_MSG "testing " STR_FLOAT " (vector length " STR_VEC_LEN ")\n" +#elif TEST_INLINE +# define TEST_MSG "testing " STR_FLOAT " (inline functions)\n" +#elif TEST_FINITE +# define TEST_MSG "testing " STR_FLOAT " (finite-math-only)\n" +#else +# define TEST_MSG "testing " STR_FLOAT " (without inline functions)\n" +#endif + /* Allow platforms without all rounding modes to test properly, assuming they provide an __FE_UNDEFINED in <bits/fenv.h> which causes fesetround() to return failure. */ diff --git a/math/test-double-finite.c b/math/test-double-finite.c index 6de894a..c181925 100644 --- a/math/test-double-finite.c +++ b/math/test-double-finite.c @@ -20,6 +20,4 @@ #include "test-math-no-inline.h" #include "test-math-scalar.h" -#define TEST_MSG "testing double (finite-math-only)\n" - #include "libm-test.c" diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h index c913878..58d029a 100644 --- a/math/test-double-vlen2.h +++ b/math/test-double-vlen2.h @@ -20,8 +20,6 @@ #include "test-math-no-inline.h" #include "test-math-vector.h" -#define TEST_MSG "testing double vector math (without inline functions)\n" - #define EXCEPTION_TESTS_double 0 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) diff --git a/math/test-double-vlen4.h b/math/test-double-vlen4.h index 5346613..5ebcd13 100644 --- a/math/test-double-vlen4.h +++ b/math/test-double-vlen4.h @@ -20,8 +20,6 @@ #include "test-math-no-inline.h" #include "test-math-vector.h" -#define TEST_MSG "testing double vector math (without inline functions)\n" - #define EXCEPTION_TESTS_double 0 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) diff --git a/math/test-double-vlen8.h b/math/test-double-vlen8.h index e91c256..8d9049e 100644 --- a/math/test-double-vlen8.h +++ b/math/test-double-vlen8.h @@ -20,8 +20,6 @@ #include "test-math-no-inline.h" #include "test-math-vector.h" -#define TEST_MSG "testing double vector math (without inline functions)\n" - #define EXCEPTION_TESTS_double 0 #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) diff --git a/math/test-double.c b/math/test-double.c index d81632e..3672370 100644 --- a/math/test-double.c +++ b/math/test-double.c @@ -22,6 +22,4 @@ #include "test-math-errno.h" #include "test-math-scalar.h" -#define TEST_MSG "testing double (without inline functions)\n" - #include "libm-test.c" diff --git a/math/test-float-finite.c b/math/test-float-finite.c index 5a6092c..09ea1e9 100644 --- a/math/test-float-finite.c +++ b/math/test-float-finite.c @@ -20,6 +20,4 @@ #include "test-math-no-inline.h" #include "test-math-scalar.h" -#define TEST_MSG "testing float (finite-math-only)\n" - #include "libm-test.c" diff --git a/math/test-float-vlen16.h b/math/test-float-vlen16.h index 76aa443..9388d77 100644 --- a/math/test-float-vlen16.h +++ b/math/test-float-vlen16.h @@ -20,8 +20,6 @@ #include "test-math-no-inline.h" #include "test-math-vector.h" -#define TEST_MSG "testing float vector math (without inline functions)\n" - #define EXCEPTION_TESTS_float 0 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) diff --git a/math/test-float-vlen4.h b/math/test-float-vlen4.h index d3d69b7..0a3a254 100644 --- a/math/test-float-vlen4.h +++ b/math/test-float-vlen4.h @@ -20,8 +20,6 @@ #include "test-math-no-inline.h" #include "test-math-vector.h" -#define TEST_MSG "testing float vector math (without inline functions)\n" - #define EXCEPTION_TESTS_float 0 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) diff --git a/math/test-float-vlen8.h b/math/test-float-vlen8.h index 42e6092..f744dc5 100644 --- a/math/test-float-vlen8.h +++ b/math/test-float-vlen8.h @@ -20,8 +20,6 @@ #include "test-math-no-inline.h" #include "test-math-vector.h" -#define TEST_MSG "testing float vector math (without inline functions)\n" - #define EXCEPTION_TESTS_float 0 #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) diff --git a/math/test-float.c b/math/test-float.c index 1c0d40c..25ba35a 100644 --- a/math/test-float.c +++ b/math/test-float.c @@ -22,6 +22,4 @@ #include "test-math-errno.h" #include "test-math-scalar.h" -#define TEST_MSG "testing float (without inline functions)\n" - #include "libm-test.c" diff --git a/math/test-idouble.c b/math/test-idouble.c index b1c5960..944d981 100644 --- a/math/test-idouble.c +++ b/math/test-idouble.c @@ -20,6 +20,4 @@ #include "test-math-inline.h" #include "test-math-scalar.h" -#define TEST_MSG "testing double (inline functions)\n" - #include "libm-test.c" diff --git a/math/test-ifloat.c b/math/test-ifloat.c index aee1086..20c028e 100644 --- a/math/test-ifloat.c +++ b/math/test-ifloat.c @@ -20,6 +20,4 @@ #include "test-math-inline.h" #include "test-math-scalar.h" -#define TEST_MSG "testing float (inline functions)\n" - #include "libm-test.c" diff --git a/math/test-ildouble.c b/math/test-ildouble.c index fd5e2cb..ddba3e4 100644 --- a/math/test-ildouble.c +++ b/math/test-ildouble.c @@ -20,6 +20,4 @@ #include "test-math-inline.h" #include "test-math-scalar.h" -#define TEST_MSG "testing long double (inline functions)\n" - #include "libm-test.c" diff --git a/math/test-ldouble-finite.c b/math/test-ldouble-finite.c index d07d618..47cac2c 100644 --- a/math/test-ldouble-finite.c +++ b/math/test-ldouble-finite.c @@ -20,6 +20,4 @@ #include "test-math-no-inline.h" #include "test-math-scalar.h" -#define TEST_MSG "testing long double (finite-math-only)\n" - #include "libm-test.c" diff --git a/math/test-ldouble.c b/math/test-ldouble.c index 5a598f4c..209a816 100644 --- a/math/test-ldouble.c +++ b/math/test-ldouble.c @@ -22,6 +22,4 @@ #include "test-math-errno.h" #include "test-math-scalar.h" -#define TEST_MSG "testing long double (without inline functions)\n" - #include "libm-test.c" |