have bootstrap initialize git-merge-changelog if found

[gnulib.git] / tests / test-round1.c

diff --git a/tests/test-round1.c b/tests/test-round1.c
index 625b9ff..0f2ed94 100644 (file)
--- a/tests/test-round1.c
+++ b/tests/test-round1.c
@@ -3,7 +3,7 @@
 
    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
 
    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,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -25,7 +25,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

-#include "isnand.h"
+#include "isnand-nolibm.h"
+#include "nan.h"

 
 #define ASSERT(expr) \
   do                                                                        \
 
 #define ASSERT(expr) \
   do                                                                        \


@@ -33,29 +34,22 @@
       if (!(expr))                                                          \
         {                                                                   \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
       if (!(expr))                                                          \
         {                                                                   \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \

+          fflush (stderr);                                                  \

           abort ();                                                         \
         }                                                                   \
     }                                                                       \
   while (0)
 
           abort ();                                                         \
         }                                                                   \
     }                                                                       \
   while (0)
 

-/* The Compaq (ex-DEC) C 6.4 compiler chokes on the expression 0.0 / 0.0.  */
-#ifdef __DECC
-static double
-NaN ()
-{
-  static double zero = 0.0;
-  return zero / zero;
-}
-#else
-# define NaN() (0.0 / 0.0)
-#endif
+/* HP cc on HP-UX 10.20 has a bug with the constant expression -0.0.
+   So we use -zero instead.  */
+double zero = 0.0;

 
 int
 main ()
 {
   /* Zero.  */
   ASSERT (round (0.0) == 0.0);
 
 int
 main ()
 {
   /* Zero.  */
   ASSERT (round (0.0) == 0.0);

-  ASSERT (round (-0.0) == 0.0);
+  ASSERT (round (-zero) == 0.0);

   /* Positive numbers.  */
   ASSERT (round (0.3) == 0.0);
   ASSERT (round (0.5) == 1.0);
   /* Positive numbers.  */
   ASSERT (round (0.3) == 0.0);
   ASSERT (round (0.5) == 1.0);


@@ -86,7 +80,7 @@ main ()
   ASSERT (round (1.0 / 0.0) == 1.0 / 0.0);
   ASSERT (round (-1.0 / 0.0) == -1.0 / 0.0);
   /* NaNs.  */
   ASSERT (round (1.0 / 0.0) == 1.0 / 0.0);
   ASSERT (round (-1.0 / 0.0) == -1.0 / 0.0);
   /* NaNs.  */

-  ASSERT (isnand (round (NaN ())));
+  ASSERT (isnand (round (NaNd ())));

 
   return 0;
 }
 
   return 0;
 }