X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-floorf1.c;h=98bbbe87a95f1a9833bb01a7ee5234098a0af8cb;hb=533101a268dc5015a140ff4695d8eeb04fbe57b6;hp=e156732392eb386cd5599169c347525418cfe0c2;hpb=89ae4589dd58d12e7cbcf0e92c1d828c1e430f97;p=gnulib.git

diff --git a/tests/test-floorf1.c b/tests/test-floorf1.c
index e15673239..98bbbe87a 100644
--- a/tests/test-floorf1.c
+++ b/tests/test-floorf1.c
@@ -1,5 +1,5 @@
 /* Test of rounding towards negative infinity.
-   Copyright (C) 2007-2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2013 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,60 +23,57 @@
 #include "signature.h"
 SIGNATURE_CHECK (floorf, float, (float));
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "isnanf-nolibm.h"
+#include "minus-zero.h"
+#include "infinity.h"
 #include "nan.h"
+#include "macros.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 zero = 0.0f;
+/* If IEEE compliance was not requested, the ICC compiler inlines its
+   own floorf assembly that turns -0.0f to 0.0f; but that is a correct
+   result when IEEE is not enforced.  To avoid spurious failure, we
+   have to provide this dummy function in order to outsmart ICC's
+   inlining, and call our floorf through a function pointer.  */
+static float
+dummy (float f)
+{
+  return 0;
+}
 
 int
-main ()
+main (int argc, char **argv _GL_UNUSED)
 {
+  float (*my_floorf) (float) = argc ? floorf : dummy;
+
   /* Zero.  */
-  ASSERT (floorf (0.0f) == 0.0f);
-  ASSERT (floorf (-zero) == 0.0f);
+  ASSERT (my_floorf (0.0f) == 0.0f);
+  ASSERT (my_floorf (minus_zerof) == 0.0f);
   /* Positive numbers.  */
-  ASSERT (floorf (0.3f) == 0.0f);
-  ASSERT (floorf (0.7f) == 0.0f);
-  ASSERT (floorf (1.0f) == 1.0f);
-  ASSERT (floorf (1.5f) == 1.0f);
-  ASSERT (floorf (1.999f) == 1.0f);
-  ASSERT (floorf (2.0f) == 2.0f);
-  ASSERT (floorf (65535.99f) == 65535.0f);
-  ASSERT (floorf (65536.0f) == 65536.0f);
-  ASSERT (floorf (2.341e31f) == 2.341e31f);
+  ASSERT (my_floorf (0.3f) == 0.0f);
+  ASSERT (my_floorf (0.7f) == 0.0f);
+  ASSERT (my_floorf (1.0f) == 1.0f);
+  ASSERT (my_floorf (1.5f) == 1.0f);
+  ASSERT (my_floorf (1.999f) == 1.0f);
+  ASSERT (my_floorf (2.0f) == 2.0f);
+  ASSERT (my_floorf (65535.99f) == 65535.0f);
+  ASSERT (my_floorf (65536.0f) == 65536.0f);
+  ASSERT (my_floorf (2.341e31f) == 2.341e31f);
   /* Negative numbers.  */
-  ASSERT (floorf (-0.3f) == -1.0f);
-  ASSERT (floorf (-0.7f) == -1.0f);
-  ASSERT (floorf (-1.0f) == -1.0f);
-  ASSERT (floorf (-1.001f) == -2.0f);
-  ASSERT (floorf (-1.5f) == -2.0f);
-  ASSERT (floorf (-1.999f) == -2.0f);
-  ASSERT (floorf (-2.0f) == -2.0f);
-  ASSERT (floorf (-65535.99f) == -65536.0f);
-  ASSERT (floorf (-65536.0f) == -65536.0f);
-  ASSERT (floorf (-2.341e31f) == -2.341e31f);
+  ASSERT (my_floorf (-0.3f) == -1.0f);
+  ASSERT (my_floorf (-0.7f) == -1.0f);
+  ASSERT (my_floorf (-1.0f) == -1.0f);
+  ASSERT (my_floorf (-1.001f) == -2.0f);
+  ASSERT (my_floorf (-1.5f) == -2.0f);
+  ASSERT (my_floorf (-1.999f) == -2.0f);
+  ASSERT (my_floorf (-2.0f) == -2.0f);
+  ASSERT (my_floorf (-65535.99f) == -65536.0f);
+  ASSERT (my_floorf (-65536.0f) == -65536.0f);
+  ASSERT (my_floorf (-2.341e31f) == -2.341e31f);
   /* Infinite numbers.  */
-  ASSERT (floorf (1.0f / 0.0f) == 1.0f / 0.0f);
-  ASSERT (floorf (-1.0f / 0.0f) == -1.0f / 0.0f);
+  ASSERT (my_floorf (Infinityf ()) == Infinityf ());
+  ASSERT (my_floorf (- Infinityf ()) == - Infinityf ());
   /* NaNs.  */
-  ASSERT (isnanf (floorf (NaNf ())));
+  ASSERT (isnanf (my_floorf (NaNf ())));
 
   return 0;
 }