X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-isnan.c;h=cfdff84a2cc82b734c0c9191e24fe9d18e17b5fb;hb=bb09133116a45861827711f5e8faf2c82b98c552;hp=bb925cb1469995fe990c55751c21b34f2e7b2f68;hpb=ea0f5bf6444c14f97c069b5da723781ecb8a84aa;p=gnulib.git

diff --git a/tests/test-isnan.c b/tests/test-isnan.c
index bb925cb14..cfdff84a2 100644
--- a/tests/test-isnan.c
+++ b/tests/test-isnan.c
@@ -1,5 +1,5 @@
 /* Test of isnand() substitute.
-   Copyright (C) 2007-2008 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
@@ -21,36 +21,18 @@
 
 #include <math.h>
 
+/* isnan must be a macro.  */
+#ifndef isnan
+# error missing declaration
+#endif
+
 #include <float.h>
 #include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
 
+#include "minus-zero.h"
+#include "infinity.h"
 #include "nan.h"
-
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
-
-/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0f.
-   So we use -zero instead.  */
-float zerof = 0.0f;
-
-/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
-   So we use -zero instead.  */
-double zerod = 0.0;
-
-/* On HP-UX 10.20, negating 0.0L does not yield -0.0L.
-   So we use minus_zerol instead.  */
-long double minus_zerol = -LDBL_MIN * LDBL_MIN;
+#include "macros.h"
 
 static void
 test_float (void)
@@ -63,10 +45,10 @@ test_float (void)
   ASSERT (!isnan (-2.718e30f));
   ASSERT (!isnan (-2.718e-30f));
   ASSERT (!isnan (0.0f));
-  ASSERT (!isnan (-zerof));
+  ASSERT (!isnan (minus_zerof));
   /* Infinite values.  */
-  ASSERT (!isnan (1.0f / 0.0f));
-  ASSERT (!isnan (-1.0f / 0.0f));
+  ASSERT (!isnan (Infinityf ()));
+  ASSERT (!isnan (- Infinityf ()));
   /* Quiet NaN.  */
   ASSERT (isnan (NaNf ()));
 #if defined FLT_EXPBIT0_WORD && defined FLT_EXPBIT0_BIT
@@ -103,10 +85,10 @@ test_double (void)
   ASSERT (!isnan (-2.718e30));
   ASSERT (!isnan (-2.718e-30));
   ASSERT (!isnan (0.0));
-  ASSERT (!isnan (-zerod));
+  ASSERT (!isnan (minus_zerod));
   /* Infinite values.  */
-  ASSERT (!isnan (1.0 / 0.0));
-  ASSERT (!isnan (-1.0 / 0.0));
+  ASSERT (!isnan (Infinityd ()));
+  ASSERT (!isnan (- Infinityd ()));
   /* Quiet NaN.  */
   ASSERT (isnan (NaNd ()));
 #if defined DBL_EXPBIT0_WORD && defined DBL_EXPBIT0_BIT
@@ -148,17 +130,17 @@ test_long_double (void)
   ASSERT (!isnan (0.0L));
   ASSERT (!isnan (minus_zerol));
   /* Infinite values.  */
-  ASSERT (!isnan (1.0L / 0.0L));
-  ASSERT (!isnan (-1.0L / 0.0L));
+  ASSERT (!isnan (Infinityl ()));
+  ASSERT (!isnan (- Infinityl ()));
   /* Quiet NaN.  */
-  ASSERT (isnan (0.0L / 0.0L));
+  ASSERT (isnan (NaNl ()));
 
 #if defined LDBL_EXPBIT0_WORD && defined LDBL_EXPBIT0_BIT
   /* A bit pattern that is different from a Quiet NaN.  With a bit of luck,
      it's a Signalling NaN.  */
   {
     memory_long_double m;
-    m.value = 0.0L / 0.0L;
+    m.value = NaNl ();
 # if LDBL_EXPBIT0_BIT > 0
     m.word[LDBL_EXPBIT0_WORD] ^= (unsigned int) 1 << (LDBL_EXPBIT0_BIT - 1);
 # else