X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-fprintf-posix.h;h=9481aaa16ff3013fedd1edd7a6143d87002f7f3f;hb=409da8c2eb774db685376f350518657fe6f621be;hp=f076a724b3bbdb2d2b94dcb8c99a55f2a862dca9;hpb=d6f2795056e4d0040cdd6c0962518635e174bce4;p=gnulib.git

diff --git a/tests/test-fprintf-posix.h b/tests/test-fprintf-posix.h
index f076a724b..9481aaa16 100644
--- a/tests/test-fprintf-posix.h
+++ b/tests/test-fprintf-posix.h
@@ -1,10 +1,10 @@
 /* Test of POSIX compatible vsprintf() and sprintf() functions.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,23 +12,10 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2007.  */
 
-/* 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
-
 static void
 test_function (int (*my_fprintf) (FILE *, const char *, ...))
 {
@@ -49,24 +36,15 @@ test_function (int (*my_fprintf) (FILE *, const char *, ...))
   /* Positive zero.  */
   my_fprintf (stdout, "%a %d\n", 0.0, 33, 44, 55);
 
-  /* Negative zero.  */
-  my_fprintf (stdout, "%a %d\n", -0.0, 33, 44, 55);
-
   /* Positive infinity.  */
   my_fprintf (stdout, "%a %d\n", 1.0 / 0.0, 33, 44, 55);
 
   /* Negative infinity.  */
   my_fprintf (stdout, "%a %d\n", -1.0 / 0.0, 33, 44, 55);
 
-  /* NaN.  */
-  my_fprintf (stdout, "%a %d\n", NaN (), 33, 44, 55);
-
   /* FLAG_ZERO with infinite number.  */
   my_fprintf (stdout, "%010a %d\n", 1.0 / 0.0, 33, 44, 55);
 
-  /* FLAG_ZERO with NaN.  */
-  my_fprintf (stdout, "%010a %d\n", NaN (), 33, 44, 55);
-
   /* Test the support of the %f format directive.  */
 
   /* A positive number.  */
@@ -81,18 +59,18 @@ test_function (int (*my_fprintf) (FILE *, const char *, ...))
   /* Positive zero.  */
   my_fprintf (stdout, "%f %d\n", 0.0, 33, 44, 55);
 
-  /* Negative zero.  */
-  my_fprintf (stdout, "%f %d\n", -0.0, 33, 44, 55);
-
-  /* NaN.  */
-  my_fprintf (stdout, "%f %d\n", NaN (), 33, 44, 55);
-
   /* FLAG_ZERO.  */
   my_fprintf (stdout, "%015f %d\n", 1234.0, 33, 44, 55);
 
   /* Precision.  */
   my_fprintf (stdout, "%.f %d\n", 1234.0, 33, 44, 55);
 
+  /* Precision with no rounding.  */
+  my_fprintf (stdout, "%.2f %d\n", 999.95, 33, 44, 55);
+
+  /* Precision with rounding.  */
+  my_fprintf (stdout, "%.2f %d\n", 999.996, 33, 44, 55);
+
   /* A positive number.  */
   my_fprintf (stdout, "%Lf %d\n", 12.75L, 33, 44, 55);
 
@@ -105,20 +83,18 @@ test_function (int (*my_fprintf) (FILE *, const char *, ...))
   /* Positive zero.  */
   my_fprintf (stdout, "%Lf %d\n", 0.0L, 33, 44, 55);
 
-  /* Negative zero.  */
-  my_fprintf (stdout, "%Lf %d\n", -0.0L, 33, 44, 55);
-
-  { /* NaN.  */
-    static long double zero = 0.0L;
-    my_fprintf (stdout, "%Lf %d\n", zero / zero, 33, 44, 55);
-  }
-
   /* FLAG_ZERO.  */
   my_fprintf (stdout, "%015Lf %d\n", 1234.0L, 33, 44, 55);
 
   /* Precision.  */
   my_fprintf (stdout, "%.Lf %d\n", 1234.0L, 33, 44, 55);
 
+  /* Precision with no rounding.  */
+  my_fprintf (stdout, "%.2Lf %d\n", 999.95L, 33, 44, 55);
+
+  /* Precision with rounding.  */
+  my_fprintf (stdout, "%.2Lf %d\n", 999.996L, 33, 44, 55);
+
   /* Test the support of the %F format directive.  */
 
   /* A positive number.  */
@@ -133,18 +109,18 @@ test_function (int (*my_fprintf) (FILE *, const char *, ...))
   /* Positive zero.  */
   my_fprintf (stdout, "%F %d\n", 0.0, 33, 44, 55);
 
-  /* Negative zero.  */
-  my_fprintf (stdout, "%F %d\n", -0.0, 33, 44, 55);
-
-  /* NaN.  */
-  my_fprintf (stdout, "%F %d\n", NaN (), 33, 44, 55);
-
   /* FLAG_ZERO.  */
   my_fprintf (stdout, "%015F %d\n", 1234.0, 33, 44, 55);
 
   /* Precision.  */
   my_fprintf (stdout, "%.F %d\n", 1234.0, 33, 44, 55);
 
+  /* Precision with no rounding.  */
+  my_fprintf (stdout, "%.2F %d\n", 999.95, 33, 44, 55);
+
+  /* Precision with rounding.  */
+  my_fprintf (stdout, "%.2F %d\n", 999.996, 33, 44, 55);
+
   /* A positive number.  */
   my_fprintf (stdout, "%LF %d\n", 12.75L, 33, 44, 55);
 
@@ -157,20 +133,18 @@ test_function (int (*my_fprintf) (FILE *, const char *, ...))
   /* Positive zero.  */
   my_fprintf (stdout, "%LF %d\n", 0.0L, 33, 44, 55);
 
-  /* Negative zero.  */
-  my_fprintf (stdout, "%LF %d\n", -0.0L, 33, 44, 55);
-
-  { /* NaN.  */
-    static long double zero = 0.0L;
-    my_fprintf (stdout, "%LF %d\n", zero / zero, 33, 44, 55);
-  }
-
   /* FLAG_ZERO.  */
   my_fprintf (stdout, "%015LF %d\n", 1234.0L, 33, 44, 55);
 
   /* Precision.  */
   my_fprintf (stdout, "%.LF %d\n", 1234.0L, 33, 44, 55);
 
+  /* Precision with no rounding.  */
+  my_fprintf (stdout, "%.2LF %d\n", 999.95L, 33, 44, 55);
+
+  /* Precision with rounding.  */
+  my_fprintf (stdout, "%.2LF %d\n", 999.996L, 33, 44, 55);
+
   /* Test the support of the POSIX/XSI format strings with positions.  */
 
   my_fprintf (stdout, "%2$d %1$d\n", 33, 55);