1 files changed, 6 insertions, 57 deletions
diff --git a/tests/test-math.c b/tests/test-math.c
index 7ac8b9a6..f940a249 100644
--- a/tests/test-math.c
+++ b/tests/test-math.c
@@ -1,5 +1,5 @@
 /* Test of <math.h> substitute.
-   Copyright (C) 2007-2015 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,35 +25,6 @@
 choke me
 #endif
 
-#ifndef HUGE_VALF
-# error HUGE_VALF should be defined
-choke me
-#endif
-
-#ifndef HUGE_VAL
-# error HUGE_VAL should be defined
-choke me
-#endif
-
-#ifndef HUGE_VALL
-# error HUGE_VALL should be defined
-choke me
-#endif
-
-#ifndef FP_ILOGB0
-# error FP_ILOGB0 should be defined
-choke me
-#endif
-
-#ifndef FP_ILOGBNAN
-# error FP_ILOGBNAN should be defined
-choke me
-#endif
-
-#include <limits.h>
-
-#include "macros.h"
-
 #if 0
 /* Check that NAN expands into a constant expression.  */
 static float n = NAN;
@@ -63,17 +34,7 @@ static float n = NAN;
    This is a separate function because IRIX 6.5 "cc -O" miscompiles an
    'x == x' test.  */
 static int
-numeric_equalf (float x, float y)
-{
-  return x == y;
-}
-static int
-numeric_equald (double x, double y)
-{
-  return x == y;
-}
-static int
-numeric_equall (long double x, long double y)
+numeric_equal (double x, double y)
 {
   return x == y;
 }
@@ -83,22 +44,10 @@ main (void)
 {
   double d = NAN;
   double zero = 0.0;
-  ASSERT (!numeric_equald (d, d));
-
+  if (numeric_equal (d, d))
+    return 1;
   d = HUGE_VAL;
-  ASSERT (numeric_equald (d, 1.0 / zero));
-
-  ASSERT (numeric_equalf (HUGE_VALF, HUGE_VALF + HUGE_VALF));
-
-  ASSERT (numeric_equald (HUGE_VAL, HUGE_VAL + HUGE_VAL));
-
-  ASSERT (numeric_equall (HUGE_VALL, HUGE_VALL + HUGE_VALL));
-
-  /* Check the value of FP_ILOGB0.  */
-  ASSERT (FP_ILOGB0 == INT_MIN || FP_ILOGB0 == - INT_MAX);
-
-  /* Check the value of FP_ILOGBNAN.  */
-  ASSERT (FP_ILOGBNAN == INT_MIN || FP_ILOGBNAN == INT_MAX);
-
+  if (!numeric_equal (d, 1.0 / zero))
+    return 1;
   return 0;
 }