X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vsnprintf.c;h=9c1be8d115330dcfa69816d1e8f9b0aefa1c9d0a;hb=8424f040f4bfc95e7448e62ac26ea028faf36480;hp=a8ed6ec7c75523fc8dd24a0b1b3fda0cc9e9cfdd;hpb=75d146361fe980e1e1bbb9639edc6fbed5345e82;p=gnulib.git

diff --git a/tests/test-vsnprintf.c b/tests/test-vsnprintf.c
index a8ed6ec7c..9c1be8d11 100644
--- a/tests/test-vsnprintf.c
+++ b/tests/test-vsnprintf.c
@@ -1,10 +1,10 @@
 /* Test of vsnprintf() function.
-   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
+   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,14 +12,11 @@
    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.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <stdio.h>
 
@@ -33,6 +30,7 @@
       if (!(expr))							     \
         {								     \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);						     \
           abort ();							     \
         }								     \
     }									     \
@@ -63,13 +61,18 @@ main (int argc, char *argv[])
       retval = my_snprintf (buf, size, "%d", 12345);
       if (size < 6)
 	{
+#if CHECK_VSNPRINTF_POSIX
 	  ASSERT (retval < 0 || retval >= size);
+#endif
 	  if (size > 0)
 	    {
 	      ASSERT (memcmp (buf, "12345", size - 1) == 0);
 	      ASSERT (buf[size - 1] == '\0' || buf[size - 1] == '0' + size);
 	    }
-	  ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
+#if !CHECK_VSNPRINTF_POSIX
+	  if (size > 0)
+#endif
+	    ASSERT (memcmp (buf + size, "DEADBEEF" + size, 8 - size) == 0);
 	}
       else
 	{