From: Bruno Haible <bruno@clisp.org>
Date: Mon, 17 Dec 2001 17:24:19 +0000 (+0000)
Subject: Avoid a test failure on SunOS4 and Solaris.
X-Git-Tag: v0.11~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea998bd89eae046e3d8dab5e9efb77f0e540f02f;p=thirdparty%2Fgettext.git

Avoid a test failure on SunOS4 and Solaris.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 2017c37c5..b374ae274 100644
--- 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 23d2bb483..7d810d0d4 100644
--- 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
index 000000000..7f1cca606
Binary files /dev/null and b/tests/mex-test2.ok differ
diff --git a/tests/msgexec-2 b/tests/msgexec-2
index 51a28cf9b..d1d4b69e1 100755
--- 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