Ignore tests which fail with released libunistring.

diff --git a/ChangeLog b/ChangeLog
index 86a5217ec2b50619a3f71c609ef6c5930ec5f89a..1fe3f9c5c544d00787b255006023d616c59144c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-08  Daiki Ueno  <ueno@unixuser.org>
+
+       * autogen.sh: Ignore libunistring tests which are known to fail.
+       (GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS): New variable.
+
 2012-12-08  Daiki Ueno  <ueno@unixuser.org>
 
        * NEWS: Mention that autoconf 2.60 is required.

diff --git a/autogen.sh b/autogen.sh
index 904254f701ed3bf3ea5e38c55efc5dbc56d01c9e..9b1b29a41843084860f343e38e6c4f7e5ef5912c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -251,8 +251,15 @@ if ! $skip_gnulib; then
       javaexec-script
       stdint
     '
+    GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS='
+      unilbrk/u8-possible-linebreaks-tests
+      unilbrk/ulc-width-linebreaks-tests
+      unistr/u8-mbtouc-tests
+      unistr/u8-mbtouc-unsafe-tests
+      uniwidth/width-tests
+    '
     $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \
-      --import --avoid=hash-tests $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER
+      --import --avoid=hash-tests `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER
     # In gettext-tools/libgrep:
     GNULIB_MODULES_TOOLS_FOR_LIBGREP='
       mbrlen