diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-05-09 18:08:18 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-05-09 20:54:21 +0200 |
| commit | a67b09f8ac2abb469fef7773a7616336004154b3 (patch) | |
| tree | 449e3563dfdf7f5c171708b6a236afa8608c7186 /gettext-tools | |
| parent | 1eaae9eade5b653616234b32c9a0ba7ba2a18a9f (diff) | |
| download | external_gettext-a67b09f8ac2abb469fef7773a7616336004154b3.zip external_gettext-a67b09f8ac2abb469fef7773a7616336004154b3.tar.gz external_gettext-a67b09f8ac2abb469fef7773a7616336004154b3.tar.bz2 | |
Avoid test suite failures on Cygwin 1.7.
Diffstat (limited to 'gettext-tools')
| -rw-r--r-- | gettext-tools/tests/ChangeLog | 7 | ||||
| -rwxr-xr-x | gettext-tools/tests/lang-c++ | 5 | ||||
| -rwxr-xr-x | gettext-tools/tests/lang-clisp | 6 | ||||
| -rwxr-xr-x | gettext-tools/tests/lang-tcl | 6 |
4 files changed, 19 insertions, 5 deletions
diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 149df4e..dff5525 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,10 @@ +2010-05-09 Bruno Haible <bruno@clisp.org> + + Avoid test suite failures on Cygwin 1.7. + * lang-c++: Link without the -Wl,--disable-auto-import option. + * lang-clisp: Convert CR/LF to LF before applying DIFF. + * lang-tcl: Likewise. + 2010-04-25 Bruno Haible <bruno@clisp.org> Update support of object-pascal-format strings. diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++ index e3420cd..9260403 100755 --- a/gettext-tools/tests/lang-c++ +++ b/gettext-tools/tests/lang-c++ @@ -70,7 +70,10 @@ tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}" # ${CXXFLAGS} or ${CPPFLAGS}. ${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \ || exit 1 -${LIBTOOL} --quiet --mode=link --tag=CXX ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \ +# Remove the -Wl,--disable-auto-import option here that is added by +# woe32-dll.m4. Cygwin 1.7.2 does not support it in C++ mode: It gives +# a link error about 'std::cout'. +${LIBTOOL} --quiet --mode=link --tag=CXX ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \ || exit 1 tmpfiles="$tmpfiles prog.tmp prog.pot" diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp index 3ea01a8..c7da170 100755 --- a/gettext-tools/tests/lang-clisp +++ b/gettext-tools/tests/lang-clisp @@ -148,11 +148,13 @@ EOF : ${LOCALE_FR=fr_FR} : ${LOCALE_FR_UTF8=fr_FR.UTF-8} if test $LOCALE_FR != none; then - CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR clisp prog.lisp 2 > prog.out || exit 1 + CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR clisp prog.lisp 2 > prog.tmp || exit 1 + LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1 ${DIFF} prog.ok prog.out || exit 1 fi if test $LOCALE_FR_UTF8 != none; then - CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 clisp prog.lisp 2 > prog.out || exit 1 + CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 clisp prog.lisp 2 > prog.tmp || exit 1 + LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1 ${DIFF} prog.oku prog.out || exit 1 fi diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl index c2b7981..c343cd6 100755 --- a/gettext-tools/tests/lang-tcl +++ b/gettext-tools/tests/lang-tcl @@ -100,11 +100,13 @@ EOF : ${LOCALE_FR=fr_FR} : ${LOCALE_FR_UTF8=fr_FR.UTF-8} if test $LOCALE_FR != none; then - LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.out || exit 1 + LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || exit 1 + LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1 ${DIFF} prog.ok prog.out || exit 1 fi if test $LOCALE_FR_UTF8 != none; then - LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.out || exit 1 + LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || exit 1 + LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1 ${DIFF} prog.oku prog.out || exit 1 fi if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then |