X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-trunc2.c;h=b13433faa0c8a0de1c5948384f31a39c8268ee1b;hb=c26924950a3a546112e35c99aad85c0855f4664a;hp=5292ff64ffa154d94e6d4a38443b294c1fc6c8ab;hpb=ac328d5c86c856a6855ae1ff8a0939d320e0f7ee;p=gnulib.git

diff --git a/tests/test-trunc2.c b/tests/test-trunc2.c
index 5292ff64f..b13433faa 100644
--- a/tests/test-trunc2.c
+++ b/tests/test-trunc2.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
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "isnan.h"
+#include "isnand-nolibm.h"
 
 #define ASSERT(expr) \
   do									     \
@@ -34,6 +34,7 @@
       if (!(expr))							     \
         {								     \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
           abort ();							     \
         }								     \
     }									     \
@@ -103,7 +104,7 @@ trunc_reference (DOUBLE x)
 static int
 equal (DOUBLE x, DOUBLE y)
 {
-  return (isnan (x) ? isnan (y) : x == y);
+  return (isnand (x) ? isnand (y) : x == y);
 }
 
 /* Test whether the result for a given argument is correct.  */
@@ -113,10 +114,10 @@ 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 - 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 :
+	x + 1 > x ? result >= x && result <= x + 1 && result - x < 1 :
 	equal (result, x)));
 }