progname: also set global program_invocation_name, when possible.

[gnulib.git] / tests / uniconv / test-u16-conv-from-enc.c

diff --git a/tests/uniconv/test-u16-conv-from-enc.c b/tests/uniconv/test-u16-conv-from-enc.c
index 11f43ee..1d1594e 100644 (file)
--- a/tests/uniconv/test-u16-conv-from-enc.c
+++ b/tests/uniconv/test-u16-conv-from-enc.c
@@ -1,5 +1,5 @@
 /* Test of conversion to UTF-16 from legacy encodings.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2009 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
@@ -33,6 +33,7 @@
       if (!(expr))                                                          \
         {                                                                   \
           fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+          fflush (stderr);                                                  \
           abort ();                                                         \
         }                                                                   \
     }                                                                       \
@@ -76,15 +77,14 @@ main ()
       for (o = 0; o < 2; o++)
        {
          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-         uint16_t *result = NULL;
-         size_t length = 0;
-         int retval = u16_conv_from_encoding ("ISO-8859-1", handler,
-                                              input, strlen (input),
-                                              offsets,
-                                              &result, &length);
-         ASSERT (retval == 0);
+         size_t length;
+         uint16_t *result = u16_conv_from_encoding ("ISO-8859-1", handler,
+                                                    input, strlen (input),
+                                                    offsets,
+                                                    NULL, &length);
+         ASSERT (result != NULL);
          ASSERT (length == SIZEOF (expected));
-         ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
+         ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
          if (o)
            {
              for (i = 0; i < 37; i++)
@@ -109,15 +109,14 @@ main ()
       for (o = 0; o < 2; o++)
        {
          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-         uint16_t *result = NULL;
-         size_t length = 0;
-         int retval = u16_conv_from_encoding ("ISO-8859-2", handler,
-                                              input, strlen (input),
-                                              offsets,
-                                              &result, &length);
-         ASSERT (retval == 0);
+         size_t length;
+         uint16_t *result = u16_conv_from_encoding ("ISO-8859-2", handler,
+                                                    input, strlen (input),
+                                                    offsets,
+                                                    NULL, &length);
+         ASSERT (result != NULL);
          ASSERT (length == SIZEOF (expected));
-         ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
+         ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
          if (o)
            {
              for (i = 0; i < 16; i++)
@@ -130,7 +129,7 @@ main ()
     }
 
   /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2.  */
-# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__)
+# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
   /* Test conversions from autodetect_jp to UTF-16.  */
   for (h = 0; h < SIZEOF (handlers); h++)
     {
@@ -143,15 +142,14 @@ main ()
       for (o = 0; o < 2; o++)
        {
          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-         uint16_t *result = NULL;
-         size_t length = 0;
-         int retval = u16_conv_from_encoding ("autodetect_jp", handler,
-                                              input, strlen (input),
-                                              offsets,
-                                              &result, &length);
-         ASSERT (retval == 0);
+         size_t length;
+         uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+                                                    input, strlen (input),
+                                                    offsets,
+                                                    NULL, &length);
+         ASSERT (result != NULL);
          ASSERT (length == SIZEOF (expected));
-         ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
+         ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
          if (o)
            {
              for (i = 0; i < 10; i++)
@@ -173,15 +171,14 @@ main ()
       for (o = 0; o < 2; o++)
        {
          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-         uint16_t *result = NULL;
-         size_t length = 0;
-         int retval = u16_conv_from_encoding ("autodetect_jp", handler,
-                                              input, strlen (input),
-                                              offsets,
-                                              &result, &length);
-         ASSERT (retval == 0);
+         size_t length;
+         uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+                                                    input, strlen (input),
+                                                    offsets,
+                                                    NULL, &length);
+         ASSERT (result != NULL);
          ASSERT (length == SIZEOF (expected));
-         ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
+         ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
          if (o)
            {
              for (i = 0; i < 10; i++)
@@ -203,15 +200,14 @@ main ()
       for (o = 0; o < 2; o++)
        {
          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-         uint16_t *result = NULL;
-         size_t length = 0;
-         int retval = u16_conv_from_encoding ("autodetect_jp", handler,
-                                              input, strlen (input),
-                                              offsets,
-                                              &result, &length);
-         ASSERT (retval == 0);
+         size_t length;
+         uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+                                                    input, strlen (input),
+                                                    offsets,
+                                                    NULL, &length);
+         ASSERT (result != NULL);
          ASSERT (length == SIZEOF (expected));
-         ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
+         ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
          if (o)
            {
              for (i = 0; i < 16; i++)