X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-roundf1.c;h=2ccbe29faa9c6ded95bf2e83b6b5f81f8a4151e7;hb=1aeca770e12bdc87d6cfe0e43cc2f37a910213a0;hp=6311e3a8981640a59bb9db69b9b32cb7fda544b8;hpb=980d2709cea1e46299cb5b4f74f7c7a95d07ef06;p=gnulib.git

diff --git a/tests/test-roundf1.c b/tests/test-roundf1.c
index 6311e3a89..2ccbe29fa 100644
--- a/tests/test-roundf1.c
+++ b/tests/test-roundf1.c
@@ -1,9 +1,9 @@
 /* Test of rounding to nearest, breaking ties away from zero.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 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
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -22,38 +22,20 @@
 
 #include <math.h>
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "signature.h"
+SIGNATURE_CHECK (roundf, float, (float));
 
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
-
-/* The Compaq (ex-DEC) C 6.4 compiler chokes on the expression 0.0 / 0.0.  */
-#ifdef __DECC
-static float
-NaN ()
-{
-  static float zero = 0.0f;
-  return zero / zero;
-}
-#else
-# define NaN() (0.0f / 0.0f)
-#endif
+#include "isnanf-nolibm.h"
+#include "minus-zero.h"
+#include "nan.h"
+#include "macros.h"
 
 int
 main ()
 {
   /* Zero.  */
   ASSERT (roundf (0.0f) == 0.0f);
-  ASSERT (roundf (-0.0f) == 0.0f);
+  ASSERT (roundf (minus_zerof) == 0.0f);
   /* Positive numbers.  */
   ASSERT (roundf (0.3f) == 0.0f);
   ASSERT (roundf (0.5f) == 1.0f);
@@ -84,7 +66,7 @@ main ()
   ASSERT (roundf (1.0 / 0.0f) == 1.0 / 0.0f);
   ASSERT (roundf (-1.0 / 0.0f) == -1.0 / 0.0f);
   /* NaNs.  */
-  ASSERT (isnan (roundf (NaN ())));
+  ASSERT (isnanf (roundf (NaNf ())));
 
   return 0;
 }