From: Bruno Haible <bruno@clisp.org>
Date: Sun, 19 Feb 2012 12:54:55 +0000 (+0100)
Subject: Avoid spurious test output with guile 2.0.x.
X-Git-Tag: v0.18.2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af5434cdba645d4d92c3ba17bd4a64999c62646d;p=thirdparty%2Fgettext.git

Avoid spurious test output with guile 2.0.x.
---

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f42e425eb..b9cb63471 100644
--- 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 ba7a65cce..4550b4a1c 100755
--- 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