Avoid a test failure on SunOS4 and Solaris.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2017c37c51042803eb5383a2afb443797e7b8f14..b374ae2742ab27cf8ab7376ca726c7fd9fea49a5 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-17  Bruno Haible  <bruno@clisp.org>
+
+       * msgexec-2: Don't use 'tr'. It is broken on Solaris.
+       * mex-test2.ok: New file.
+       * Makefile.am (EXTRA_DIST): Add it.
+
 2001-12-15  Bruno Haible  <bruno@clisp.org>
 
        * msgfmt-7: Write "8bit", not "8-bit".

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 23d2bb483a14493e6455e8c86774eaae6a372c8b..7d810d0d4549433681dfcfe1cab51a1d33b5e572 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,7 +54,7 @@ TESTS = gettext-1 gettext-2 \
        plural-1 plural-2 \
        lang-c lang-c++ lang-objc lang-clisp lang-java lang-pascal lang-ycp lang-po lang-rst
 
-EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po msguniq-a.in msguniq-a.out
+EXTRA_DIST = $(TESTS) test.mo xg-test1.ok.po mex-test2.ok msguniq-a.in msguniq-a.out
 
 XGETTEXT = ../src/xgettext
 

diff --git a/tests/mex-test2.ok b/tests/mex-test2.ok
new file mode 100644 (file)
index 0000000..7f1cca6
Binary files /dev/null and b/tests/mex-test2.ok differ

diff --git a/tests/msgexec-2 b/tests/msgexec-2
index 51a28cf9b52592940baa76c58fb212e46bcd0dbe..d1d4b69e1e3104ff92e64698b0ebf4ad8b58194a 100755 (executable)
--- a/tests/msgexec-2
+++ b/tests/msgexec-2
@@ -59,19 +59,10 @@ EOF
 
 tmpfiles="$tmpfiles mex-test2.out"
 : ${MSGEXEC=msgexec}
-(${MSGEXEC} -i mex-test2.po 0 | tr '\000' '@' ; echo) > mex-test2.out
-
-tmpfiles="$tmpfiles mex-test2.ok"
-cat <<EOF > mex-test2.ok
-Project-Id-Version: Bonnie Tyler
-Content-Type: text/plain; charset=ISO-8859-1
-Content-Transfer-Encoding: 8bit
-@So viele verheiratete Männer@und ihre Frauen verstehen sie nicht@@@@@Die Flügel der frischen Liebe
-heben dich zum Himmel@Für die anderen@bist du bloß ein verrücktes dummes Ding@das einen verheirateten Mann liebt@
-EOF
+${MSGEXEC} -i mex-test2.po 0 > mex-test2.out
 
-: ${DIFF=diff}
-${DIFF} mex-test2.ok mex-test2.out
+: ${CMP=cmp}
+${CMP} mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
 result=$?
 
 rm -fr $tmpfiles