Avoid test suite failures on NetBSD 5.0.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 71df3d2c6c0827a645a48b6e6cd7726131563cd7..fcfca1958306b7f3a57d04159b2ea076f9d33375 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-26  Bruno Haible  <bruno@clisp.org>
+
+       Avoid test suite failures on NetBSD 5.0.
+       * msgfilter-1: Skip the test if the 'fold' program trims trailing
+       spaces.
+       * msgfilter-3: Likewise.
+
 2010-05-23  Bruno Haible  <bruno@clisp.org>
 
        msggrep: Fix interpretation of '$' in regular expressions.

diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1
index ec0d2019fcea7d73405fb91e414e13d9aba353e5..6241e44180e688bd5de15e0cd897842b88202263 100755 (executable)
--- a/gettext-tools/tests/msgfilter-1
+++ b/gettext-tools/tests/msgfilter-1
@@ -24,6 +24,12 @@ echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   rm -fr $tmpfiles; exit 77
 }
 
+# Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
+echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
+  echo "Skipping test: fold program trims trailing spaces"
+  rm -fr $tmpfiles; exit 77
+}
+
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
 # line was not terminated with a newline and the -s option was given.
 foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`

diff --git a/gettext-tools/tests/msgfilter-3 b/gettext-tools/tests/msgfilter-3
index 546f85595053942c36a37d0b78c62c9c09ae0ac6..e36df42c5df2253cfac19dd3e252d5c66a9854a5 100755 (executable)
--- a/gettext-tools/tests/msgfilter-3
+++ b/gettext-tools/tests/msgfilter-3
@@ -24,6 +24,12 @@ echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   rm -fr $tmpfiles; exit 77
 }
 
+# Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
+echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
+  echo "Skipping test: fold program trims trailing spaces"
+  rm -fr $tmpfiles; exit 77
+}
+
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
 # line was not terminated with a newline and the -s option was given.
 foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`