X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-trunc1.c;h=b9e8a3c88a539febd729017db76940d408cc00ad;hb=4e793c35b62f5ea945b7d33ce36c78fc4d645b3a;hp=58669035b08f0d14d30e8b5b61a59345fca47849;hpb=7937a9a7f7a535f872ead3dbdd8e649b18ff61f5;p=gnulib.git

diff --git a/tests/test-trunc1.c b/tests/test-trunc1.c
index 58669035b..b9e8a3c88 100644
--- a/tests/test-trunc1.c
+++ b/tests/test-trunc1.c
@@ -1,5 +1,5 @@
 /* Test of rounding towards zero.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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
@@ -23,35 +23,31 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "isnand-nolibm.h"
+#include "nan.h"
+
 #define ASSERT(expr) \
   do									     \
     {									     \
       if (!(expr))							     \
         {								     \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
           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 (trunc (0.0) == 0.0);
-  ASSERT (trunc (-0.0) == 0.0);
+  ASSERT (trunc (-zero) == 0.0);
   /* Positive numbers.  */
   ASSERT (trunc (0.3) == 0.0);
   ASSERT (trunc (0.7) == 0.0);
@@ -76,7 +72,7 @@ main ()
   ASSERT (trunc (1.0 / 0.0) == 1.0 / 0.0);
   ASSERT (trunc (-1.0 / 0.0) == -1.0 / 0.0);
   /* NaNs.  */
-  ASSERT (isnan (trunc (NaN ())));
+  ASSERT (isnand (trunc (NaNd ())));
 
   return 0;
 }