Avoid spurious test output with guile 2.0.x.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f42e425ebbc7f6006eafa5693c776510b36912f8..b9cb6347119f8e6d8b050fbaa8cd3f1f430917c0 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-19  Bruno Haible  <bruno@clisp.org>
+
+       Avoid spurious test output with guile 2.0.x.
+       * lang-guile: Filter out ";;;" lines from standard error.
+
 2012-02-18  Bruno Haible  <bruno@clisp.org>
 
        Avoid test failure with fpc version 2.6.0.

diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index ba7a65cce3611781d5978b6673a0401597b7c706..4550b4a1c02fd62168b62618ea7b669a2a47e48f 100755 (executable)
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -126,7 +126,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   rm -fr $tmpfiles; exit 77
 fi
 
-tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
+tmpfiles="$tmpfiles prog.ok prog.oku prog.out prog.err"
 : ${DIFF=diff}
 cat <<\EOF > prog.ok
 «Votre commande, s'il vous plait», dit le garçon.
@@ -142,11 +142,13 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
+  grep -v '^;;;' prog.err 1>&2
   ${DIFF} prog.ok prog.out || exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
+  grep -v '^;;;' prog.err 1>&2
   ${DIFF} prog.oku prog.out || exit 1
 fi