X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-trunc2.c;h=397e1ade0d1488d1e057b29cd09fd56dc36e1f60;hb=ae0044cde430d5feeba0c9c53a5c0fe1ba636080;hp=b13433faa0c8a0de1c5948384f31a39c8268ee1b;hpb=f2bbde92e487b8446ff201767c430306450220be;p=gnulib.git

diff --git a/tests/test-trunc2.c b/tests/test-trunc2.c
index b13433faa..397e1ade0 100644
--- a/tests/test-trunc2.c
+++ b/tests/test-trunc2.c
@@ -1,5 +1,5 @@
 /* Test of rounding towards zero.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -24,21 +24,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "isnand-nolibm.h"
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 
 /* The reference implementation, taken from lib/trunc.c.  */
@@ -74,27 +62,27 @@ trunc_reference (DOUBLE x)
     {
       /* Avoid rounding errors for values near 2^k, where k >= MANT_DIG-1.  */
       if (z < TWO_MANT_DIG)
-	{
-	  /* Round to the next integer (nearest or up or down, doesn't matter).  */
-	  z += TWO_MANT_DIG;
-	  z -= TWO_MANT_DIG;
-	  /* Enforce rounding down.  */
-	  if (z > y)
-	    z -= L_(1.0);
-	}
+        {
+          /* Round to the next integer (nearest or up or down, doesn't matter).  */
+          z += TWO_MANT_DIG;
+          z -= TWO_MANT_DIG;
+          /* Enforce rounding down.  */
+          if (z > y)
+            z -= L_(1.0);
+        }
     }
   else if (z < L_(0.0))
     {
       /* Avoid rounding errors for values near -2^k, where k >= MANT_DIG-1.  */
       if (z > - TWO_MANT_DIG)
-	{
-	  /* Round to the next integer (nearest or up or down, doesn't matter).  */
-	  z -= TWO_MANT_DIG;
-	  z += TWO_MANT_DIG;
-	  /* Enforce rounding up.  */
-	  if (z < y)
-	    z += L_(1.0);
-	}
+        {
+          /* Round to the next integer (nearest or up or down, doesn't matter).  */
+          z -= TWO_MANT_DIG;
+          z += TWO_MANT_DIG;
+          /* Enforce rounding up.  */
+          if (z < y)
+            z += L_(1.0);
+        }
     }
   return z;
 }
@@ -114,11 +102,11 @@ correct_result_p (DOUBLE x, DOUBLE result)
   return
     (x >= 0
      ? (x < 1 ? result == L_(0.0) :
-	x - 1 < x ? result <= x && result >= x - 1 && x - result < 1 :
-	equal (result, x))
+        x - 1 < x ? result <= x && result >= x - 1 && x - result < 1 :
+        equal (result, x))
      : (x > -1 ? result == L_(0.0) :
-	x + 1 > x ? result >= x && result <= x + 1 && result - x < 1 :
-	equal (result, x)));
+        x + 1 > x ? result >= x && result <= x + 1 && result - x < 1 :
+        equal (result, x)));
 }
 
 /* Test the function for a given argument.  */
@@ -135,9 +123,9 @@ check (double x)
       return 0;
     else
       {
-	fprintf (stderr, "trunc %g(%a) = %g(%a) or %g(%a)?\n",
-		 x, x, reference, reference, result, result);
-	return 1;
+        fprintf (stderr, "trunc %g(%a) = %g(%a) or %g(%a)?\n",
+                 x, x, reference, reference, result, result);
+        return 1;
       }
   }
 }
@@ -154,14 +142,14 @@ main ()
   for (highbits = 0; highbits < (1 << NUM_HIGHBITS); highbits++)
     for (lowbits = 0; lowbits < (1 << NUM_LOWBITS); lowbits++)
       {
-	/* Combine highbits and lowbits into a floating-point number,
-	   sign-extending the lowbits to 32-NUM_HIGHBITS bits.  */
-	union { double f; uint64_t i; } janus;
-	janus.i = ((uint64_t) highbits << (64 - NUM_HIGHBITS))
-		  | ((uint64_t) ((int64_t) ((uint64_t) lowbits << (64 - NUM_LOWBITS))
-				 >> (64 - NUM_LOWBITS - NUM_HIGHBITS))
-		     >> NUM_HIGHBITS);
-	error |= check (janus.f);
+        /* Combine highbits and lowbits into a floating-point number,
+           sign-extending the lowbits to 32-NUM_HIGHBITS bits.  */
+        union { double f; uint64_t i; } janus;
+        janus.i = ((uint64_t) highbits << (64 - NUM_HIGHBITS))
+                  | ((uint64_t) ((int64_t) ((uint64_t) lowbits << (64 - NUM_LOWBITS))
+                                 >> (64 - NUM_LOWBITS - NUM_HIGHBITS))
+                     >> NUM_HIGHBITS);
+        error |= check (janus.f);
       }
   return (error ? 1 : 0);
 }