diff options
Diffstat (limited to 'math/libm-test.c')
| -rw-r--r-- | math/libm-test.c | 72 |
1 files changed, 51 insertions, 21 deletions
diff --git a/math/libm-test.c b/math/libm-test.c index 0486718b8a..b7f265c038 100644 --- a/math/libm-test.c +++ b/math/libm-test.c @@ -35,14 +35,15 @@ PRINTF_EXPR Floating point conversion specification to print a variable of type MATHTYPE with printf. PRINTF_EXPR just contains the specifier, not the percent and width arguments, - e.g. "f" + e.g. "f". + PRINTF_XEXPR Like PRINTF_EXPR, but print in hexadecimal format. */ /* This program isn't finished yet. It has tests for: acos, acosh, asin, asinh, atan, atan2, atanh, cbrt, ceil, copysign, cos, cosh, erf, erfc, exp, exp2, expm1, - fabs, fdim, floor, fmin, fmax, fmod, fpclassify, + fabs, fdim, floor, fma, fmax, fmin, fmod, fpclassify, frexp, gamma, hypot, ilogb, isfinite, isinf, isnan, isnormal, ldexp, lgamma, log, log10, log1p, log2, logb, @@ -137,7 +138,9 @@ /* Various constants (we must supply them precalculated for accuracy). */ #define M_PI_6 .52359877559829887308L -static int noErrors; +static int noErrors; /* number of errors */ +static int noTests; /* number of tests (without testing exceptions) */ +static int noExcTests; /* number of tests for exception flags */ static int verbose = 3; static MATHTYPE minus_zero, plus_zero; @@ -302,6 +305,7 @@ test_single_exception (const char *test_name, static void test_not_exception (const char *test_name, short int exception) { + ++noExcTests; #ifdef FE_DIVBYZERO if ((exception & DIVIDE_BY_ZERO_EXCEPTION) == 0) test_single_exception (test_name, exception, @@ -321,6 +325,7 @@ test_not_exception (const char *test_name, short int exception) static void test_exceptions (const char *test_name, short int exception) { + ++noExcTests; #ifdef FE_DIVBYZERO test_single_exception (test_name, exception, DIVIDE_BY_ZERO_EXCEPTION, FE_DIVBYZERO, @@ -364,6 +369,7 @@ check_equal (MATHTYPE computed, MATHTYPE supplied, MATHTYPE eps, MATHTYPE * diff static void output_result_bool (const char *test_name, int result) { + ++noTests; if (result) { output_pass_value (); @@ -384,6 +390,7 @@ static void output_isvalue (const char *test_name, int result, MATHTYPE value) { + ++noTests; if (result) { output_pass_value (); @@ -392,8 +399,9 @@ output_isvalue (const char *test_name, int result, { output_fail_value (test_name); if (verbose > 1) - printf (" Value: %.20" PRINTF_EXPR "\n", value); - noErrors++; + printf (" Value: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + value, value); + ++noErrors; } fpstack_test (test_name); @@ -404,6 +412,7 @@ static void output_isvalue_ext (const char *test_name, int result, MATHTYPE value, MATHTYPE parameter) { + ++noTests; if (result) { output_pass_value (); @@ -413,8 +422,10 @@ output_isvalue_ext (const char *test_name, int result, output_fail_value (test_name); if (verbose > 1) { - printf (" Value: %.20" PRINTF_EXPR "\n", value); - printf (" Parameter: %.20" PRINTF_EXPR "\n", parameter); + printf (" Value: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + value, value); + printf (" Parameter: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + parameter, parameter); } noErrors++; } @@ -429,6 +440,7 @@ output_result (const char *test_name, int result, MATHTYPE difference, int print_values, int print_diff) { + ++noTests; if (result) { output_pass_value (); @@ -439,12 +451,15 @@ output_result (const char *test_name, int result, if (verbose > 1 && print_values) { printf ("Result:\n"); - printf (" is: %.20" PRINTF_EXPR "\n", computed); - printf (" should be: %.20" PRINTF_EXPR "\n", expected); + printf (" is: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + computed, computed); + printf (" should be: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + expected, expected); if (print_diff) - printf (" difference: %.20" PRINTF_EXPR "\n", difference); + printf (" difference: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR + "\n", difference, difference); } - noErrors++; + ++noErrors; } fpstack_test (test_name); @@ -458,6 +473,7 @@ output_result_ext (const char *test_name, int result, MATHTYPE parameter, int print_values, int print_diff) { + ++noTests; if (result) { output_pass_value (); @@ -468,13 +484,17 @@ output_result_ext (const char *test_name, int result, if (verbose > 1 && print_values) { printf ("Result:\n"); - printf (" is: %.20" PRINTF_EXPR "\n", computed); - printf (" should be: %.20" PRINTF_EXPR "\n", expected); + printf (" is: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + computed, computed); + printf (" should be: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + expected, expected); if (print_diff) - printf (" difference: %.20" PRINTF_EXPR "\n", difference); - printf ("Parameter: %.20" PRINTF_EXPR "\n", parameter); + printf (" difference: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR + "\n", difference, difference); + printf ("Parameter: % .20" PRINTF_EXPR " % .20" PRINTF_XEXPR "\n", + parameter, parameter); } - noErrors++; + ++noErrors; } fpstack_test (test_name); @@ -605,6 +625,7 @@ check_long (const char *test_name, long int computed, long int expected) long int diff = computed - expected; int result = diff == 0; + ++noTests; output_new_test (test_name); test_exceptions (test_name, NO_EXCEPTION); @@ -637,6 +658,7 @@ check_longlong (const char *test_name, long long int computed, long long int diff = computed - expected; int result = diff == 0; + ++noTests; output_new_test (test_name); test_exceptions (test_name, NO_EXCEPTION); @@ -1165,9 +1187,14 @@ check_frexp (const char *test_name, MATHTYPE computed, MATHTYPE expected, if (verbose > 1) { printf ("Result:\n"); - printf (" is: %.20" PRINTF_EXPR " *2^%d\n", computed, comp_int); - printf (" should be: %.20" PRINTF_EXPR " *2^%d\n", expected, exp_int); - printf (" difference: %.20" PRINTF_EXPR "\n", diff); + printf (" is: %.20" PRINTF_EXPR " *2^%d %.20" + PRINTF_XEXPR "*2^%d\n", + computed, comp_int, computed, comp_int); + printf (" should be: %.20" PRINTF_EXPR " *2^%d %.20" + PRINTF_XEXPR "*2^%d\n", + expected, exp_int, expected, exp_int); + printf (" difference: %.20" PRINTF_EXPR " %.20" PRINTF_XEXPR "\n", + diff, diff); } noErrors++; } @@ -5261,11 +5288,14 @@ main (int argc, char *argv[]) identities (); inverse_functions (); + printf ("\nTest suite completed:\n"); + printf (" %d test cases plus %d tests for exception flags executed.\n", + noTests, noExcTests); if (noErrors) { - printf ("\n%d errors occured.\n", noErrors); + printf (" %d errors occured.\n", noErrors); exit (1); } - printf ("\n All tests passed successfully.\n"); + printf (" All tests passed successfully.\n"); exit (0); } |