X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Ftest-vsnprintf.c;h=e549f66252bd6b1449ba61fa6e73b92e910ccb8a;hb=174af8a731d5ae17339dd5b69c0de0b7f24be594;hp=ccc9e5a70364250fcbd92fa8830d00b2490cef82;hpb=2ebbda00230a4447662e3c8e45cf0fb99c6fac6a;p=gnulib.git

diff --git a/tests/test-vsnprintf.c b/tests/test-vsnprintf.c
index ccc9e5a70..e549f6625 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.
 
-   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>
 
@@ -27,7 +24,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define ASSERT(expr) if (!(expr)) abort ();
+#define ASSERT(expr) \
+  do									     \
+    {									     \
+      if (!(expr))							     \
+        {								     \
+          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          abort ();							     \
+        }								     \
+    }									     \
+  while (0)
 
 static int
 my_snprintf (char *buf, int size, const char *format, ...)
@@ -54,13 +60,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
 	{