Imported Upstream version 0.9.3upstream/0.9.3

1 files changed, 34 insertions, 46 deletions

diff --git a/tests/unistdio/test-ulc-vasnprintf2.c b/tests/unistdio/test-ulc-vasnprintf2.c
index 90229751..d61c1cfc 100644
--- a/tests/unistdio/test-ulc-vasnprintf2.c
+++ b/tests/unistdio/test-ulc-vasnprintf2.c
@@ -1,5 +1,5 @@
 /* Test of ulc_vasnprintf() function in an ISO-8859-1 locale.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 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
@@ -22,23 +22,11 @@
 
 #include <locale.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
-  do									     \
-    {									     \
-      if (!(expr))							     \
-        {								     \
-          fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 static void
 test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
@@ -50,40 +38,40 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     {
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%U %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%U %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "Rafal Maszkowski 33") == 0);
+              || strcmp (result, "Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* Width.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%20U %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%20U %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "    Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "    Rafal Maszkowski 33") == 0);
+              || strcmp (result, "    Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* FLAG_LEFT.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%-20U %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%-20U %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "Rafa? Maszkowski     33") == 0
-	      || strcmp (result, "Rafal Maszkowski     33") == 0);
+              || strcmp (result, "Rafal Maszkowski     33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* FLAG_ZERO: no effect.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%020U %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%020U %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "    Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "    Rafal Maszkowski 33") == 0);
+              || strcmp (result, "    Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
@@ -92,46 +80,46 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   {
     static const uint16_t unicode_string[] = /* Rafał Maszkowski */
       {
-	'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
-	's', 'k', 'i', 0
+        'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
+        's', 'k', 'i', 0
       };
     {
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%lU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%lU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "Rafal Maszkowski 33") == 0);
+              || strcmp (result, "Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* Width.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%20lU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%20lU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "    Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "    Rafal Maszkowski 33") == 0);
+              || strcmp (result, "    Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* FLAG_LEFT.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%-20lU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%-20lU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "Rafa? Maszkowski     33") == 0
-	      || strcmp (result, "Rafal Maszkowski     33") == 0);
+              || strcmp (result, "Rafal Maszkowski     33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* FLAG_ZERO: no effect.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%020lU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%020lU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "    Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "    Rafal Maszkowski 33") == 0);
+              || strcmp (result, "    Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
@@ -140,46 +128,46 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
   {
     static const uint32_t unicode_string[] = /* Rafał Maszkowski */
       {
-	'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
-	's', 'k', 'i', 0
+        'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
+        's', 'k', 'i', 0
       };
     {
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%llU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%llU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "Rafal Maszkowski 33") == 0);
+              || strcmp (result, "Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* Width.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%20llU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%20llU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "    Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "    Rafal Maszkowski 33") == 0);
+              || strcmp (result, "    Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* FLAG_LEFT.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%-20llU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%-20llU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "Rafa? Maszkowski     33") == 0
-	      || strcmp (result, "Rafal Maszkowski     33") == 0);
+              || strcmp (result, "Rafal Maszkowski     33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
     { /* FLAG_ZERO: no effect.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%020llU %d", unicode_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%020llU %d", unicode_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "    Rafa? Maszkowski 33") == 0
-	      || strcmp (result, "    Rafal Maszkowski 33") == 0);
+              || strcmp (result, "    Rafal Maszkowski 33") == 0);
       ASSERT (length == strlen (result));
       free (result);
     }
@@ -192,7 +180,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     {
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%s %d", locale_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "\304rger 33") == 0);
       ASSERT (length == strlen (result));
@@ -201,7 +189,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     { /* Width.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%10s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%10s %d", locale_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "     \304rger 33") == 0);
       ASSERT (length == strlen (result));
@@ -210,7 +198,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     { /* FLAG_LEFT.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%-10s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%-10s %d", locale_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "\304rger      33") == 0);
       ASSERT (length == strlen (result));
@@ -219,7 +207,7 @@ test_function (char * (*my_asnprintf) (char *, size_t *, const char *, ...))
     { /* FLAG_ZERO: no effect.  */
       size_t length;
       char *result =
-	my_asnprintf (NULL, &length, "%010s %d", locale_string, 33, 44, 55);
+        my_asnprintf (NULL, &length, "%010s %d", locale_string, 33, 44, 55);
       ASSERT (result != NULL);
       ASSERT (strcmp (result, "     \304rger 33") == 0);
       ASSERT (length == strlen (result));