X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftest-striconveh.c;h=4c6b1e18f408265953324991f8a7a95a370b7ab7;hb=0c6fd3b84775ca4cf1045d4cc07a2dff4c73f29b;hp=bd2579ee1e5f6894a763460c7b9d0aea872043dd;hpb=441aa3044f43e5572f58c354f01e6bc070acd5c7;p=gnulib.git

diff --git a/tests/test-striconveh.c b/tests/test-striconveh.c
index bd2579ee1..4c6b1e18f 100644
--- a/tests/test-striconveh.c
+++ b/tests/test-striconveh.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion with error handling.
-   Copyright (C) 2007-2009 Free Software Foundation, Inc.
+   Copyright (C) 2007-2014 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
@@ -25,22 +25,10 @@
 #endif
 
 #include <errno.h>
-#include <stdio.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"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
@@ -508,6 +496,9 @@ main ()
           free (result);
         }
 
+      /* Disabled on NetBSD, because NetBSD 5.0 iconv() is buggy: it converts
+         the input "+2D/YQNhB" to U+1FED8 U+3FD8 U+40D8.  */
+#  if !(defined __NetBSD__ && !defined _LIBICONV_VERSION)
       /* Test conversion from UTF-7 to UTF-8 with EILSEQ.  */
       for (h = 0; h < SIZEOF (handlers); h++)
         {
@@ -555,6 +546,7 @@ main ()
               break;
             }
         }
+#  endif
 # endif
     }