Use same tests for isfinite/finite, lgamma/gamma.

4 files changed, 55 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 29dbe03a1c..8594fdaaa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013-05-24  Joseph Myers  <joseph@codesourcery.com>
+
+	* math/libm-test.inc (finite_test_data): Remove.
+	(finite_test): Run tests from isfinite_test_data.
+	(gamma_test_data): Remove.
+	(gamma_test): Run tests from lgamma_test_data.
+	* sysdeps/i386/fpu/libm-test-ulps: Update.
+	* sysdeps/x86_64/fpu/libm-test-ulps: Likewise.
+
 2013-05-24  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* manual/platform.texi: Add PowerPC PPR function set documentation.
diff --git a/math/libm-test.inc b/math/libm-test.inc
index fc1801b4df..a03647afa4 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -8117,26 +8117,6 @@ fdim_test (void)
 }
 
 
-static const struct test_f_i_data finite_test_data[] =
-  {
-    TEST_f_b (finite, 0, 1, NO_INEXACT_EXCEPTION),
-    TEST_f_b (finite, minus_zero, 1, NO_INEXACT_EXCEPTION),
-    TEST_f_b (finite, 10, 1, NO_INEXACT_EXCEPTION),
-    TEST_f_b (finite, min_subnorm_value, 1, NO_INEXACT_EXCEPTION),
-    TEST_f_b (finite, plus_infty, 0, NO_INEXACT_EXCEPTION),
-    TEST_f_b (finite, minus_infty, 0, NO_INEXACT_EXCEPTION),
-    TEST_f_b (finite, qnan_value, 0, NO_INEXACT_EXCEPTION),
-  };
-
-static void
-finite_test (void)
-{
-  START (finite);
-  RUN_TEST_LOOP_f_b (finite, finite_test_data, );
-  END;
-}
-
-
 static const struct test_f_f_data floor_test_data[] =
   {
     TEST_f_f (floor, 0.0, 0.0, NO_INEXACT_EXCEPTION),
@@ -9350,30 +9330,6 @@ frexp_test (void)
   END;
 }
 
-
-static const struct test_f_f1_data gamma_test_data[] =
-  {
-    TEST_f_f1 (gamma, plus_infty, plus_infty, 1),
-    TEST_f_f1 (gamma, 0, plus_infty, 1, DIVIDE_BY_ZERO_EXCEPTION|ERRNO_ERANGE),
-    TEST_f_f1 (gamma, -3, plus_infty, IGNORE, DIVIDE_BY_ZERO_EXCEPTION|ERRNO_ERANGE),
-    TEST_f_f1 (gamma, minus_infty, plus_infty, IGNORE),
-    TEST_f_f1 (gamma, qnan_value, qnan_value, IGNORE),
-
-    TEST_f_f1 (gamma, 1, 0, 1),
-    TEST_f_f1 (gamma, 3, M_LN2l, 1),
-
-    TEST_f_f1 (gamma, 0.5, M_LOG_SQRT_PIl, 1),
-    TEST_f_f1 (gamma, -0.5, M_LOG_2_SQRT_PIl, -1),
-  };
-
-static void
-gamma_test (void)
-{
-  START (gamma);
-  RUN_TEST_LOOP_f_f1 (gamma, gamma_test_data, , signgam);
-  END;
-}
-
 static const struct test_ff_f_data hypot_test_data[] =
   {
     TEST_ff_f (hypot, plus_infty, 1, plus_infty),
@@ -9479,6 +9435,15 @@ isfinite_test (void)
   END;
 }
 
+static void
+finite_test (void)
+{
+  START (finite);
+  /* finite uses the same test data as isfinite.  */
+  RUN_TEST_LOOP_f_b (finite, isfinite_test_data, );
+  END;
+}
+
 static const struct test_ff_i_data isgreater_test_data[] =
   {
     TEST_ff_i (isgreater, minus_zero, minus_zero, 0, NO_INEXACT_EXCEPTION),
@@ -9933,6 +9898,15 @@ lgamma_test (void)
   END;
 }
 
+static void
+gamma_test (void)
+{
+  START (gamma);
+  /* gamma uses the same test data as lgamma.  */
+  RUN_TEST_LOOP_f_f1 (gamma, lgamma_test_data, , signgam);
+  END;
+}
+
 
 static const struct test_f_l_data lrint_test_data[] =
   {
diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
index c53276bd2c..1d0e130871 100644
--- a/sysdeps/i386/fpu/libm-test-ulps
+++ b/sysdeps/i386/fpu/libm-test-ulps
@@ -5367,6 +5367,16 @@ double: 1
 idouble: 1
 ildouble: 1
 ldouble: 1
+Test "gamma (0.7)":
+float: 1
+ifloat: 1
+Test "gamma (1.2)":
+double: 1
+float: 2
+idouble: 1
+ifloat: 2
+ildouble: 1
+ldouble: 1
 
 # hypot
 Test "hypot (-0.7, -12.4)":
@@ -7506,7 +7516,9 @@ ldouble: 1
 
 Function: "gamma":
 double: 1
+float: 2
 idouble: 1
+ifloat: 2
 ildouble: 1
 ldouble: 1
 
diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps
index 970c7975a0..0c73de4820 100644
--- a/sysdeps/x86_64/fpu/libm-test-ulps
+++ b/sysdeps/x86_64/fpu/libm-test-ulps
@@ -6472,6 +6472,18 @@ idouble: 1
 Test "gamma (-0.5)":
 ildouble: 1
 ldouble: 1
+Test "gamma (0.7)":
+double: 1
+float: 1
+idouble: 1
+ifloat: 1
+Test "gamma (1.2)":
+double: 1
+float: 2
+idouble: 1
+ifloat: 2
+ildouble: 1
+ldouble: 1
 
 # hypot
 Test "hypot (-0.7, -12.4)":
@@ -8564,6 +8576,10 @@ ildouble: 1
 ldouble: 1
 
 Function: "gamma":
+double: 1
+float: 2
+idouble: 1
+ifloat: 2
 ildouble: 1
 ldouble: 1