Better error checking.

98 files changed, 164 insertions, 37 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 846ae01..1e92aa4 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,5 +1,22 @@
 2002-01-08  Bruno Haible  <bruno@clisp.org>
 
+	* msgattrib-*: Terminate the test immediately if the msg* program
+	fails.
+	* msgcat-*: Likewise.
+	* msgcomm-*: Likewise.
+	* msgconv-*: Likewise.
+	* msgen-*: Likewise.
+	* msgexec-*: Likewise.
+	* msgfilter-*: Likewise.
+	* msgfmt-*: Likewise.
+	* msggrep-*: Likewise.
+	* msgmerge-*: Likewise.
+	* msgunfmt-*: Likewise.
+	* msguniq-*: Likewise.
+	* xgettext-*: Likewise.
+
+2002-01-08  Bruno Haible  <bruno@clisp.org>
+
 	* format-elisp-1: New file.
 	* format-elisp-2: New file.
 	* lang-elisp: New file.
diff --git a/tests/msgattrib-1 b/tests/msgattrib-1
index 98c3acc..6330254 100755
--- a/tests/msgattrib-1
+++ b/tests/msgattrib-1
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test1.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --translated ma-test1.po -o ma-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test1.ok"
 cat <<EOF > ma-test1.ok
diff --git a/tests/msgattrib-10 b/tests/msgattrib-10
index 82986c6..ee97671 100755
--- a/tests/msgattrib-10
+++ b/tests/msgattrib-10
@@ -61,6 +61,7 @@ EOF
 tmpfiles="$tmpfiles ma-test10.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --set-obsolete ma-test10.po -o ma-test10.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test10.ok"
 cat <<EOF > ma-test10.ok
diff --git a/tests/msgattrib-11 b/tests/msgattrib-11
index 22a3b3e..0f8b28c 100755
--- a/tests/msgattrib-11
+++ b/tests/msgattrib-11
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test11.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --clear-obsolete ma-test11.po -o ma-test11.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test11.ok"
 cat <<EOF > ma-test11.ok
diff --git a/tests/msgattrib-12 b/tests/msgattrib-12
index 2fff0ef..c732820 100755
--- a/tests/msgattrib-12
+++ b/tests/msgattrib-12
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test12.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --fuzzy ma-test12.po -o ma-test12.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test12.ok"
 cat <<EOF > ma-test12.ok
diff --git a/tests/msgattrib-13 b/tests/msgattrib-13
index b2cff7d..f258734 100755
--- a/tests/msgattrib-13
+++ b/tests/msgattrib-13
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test13.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --obsolete ma-test13.po -o ma-test13.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test13.ok"
 cat <<EOF > ma-test13.ok
diff --git a/tests/msgattrib-14 b/tests/msgattrib-14
index 60e78ef..da81434 100755
--- a/tests/msgattrib-14
+++ b/tests/msgattrib-14
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test14.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --obsolete --no-fuzzy ma-test14.po -o ma-test14.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test14.ok"
 cat <<EOF > ma-test14.ok
diff --git a/tests/msgattrib-2 b/tests/msgattrib-2
index 2f156a1..7bddebb 100755
--- a/tests/msgattrib-2
+++ b/tests/msgattrib-2
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test2.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --untranslated ma-test2.po -o ma-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test2.ok"
 cat <<EOF > ma-test2.ok
diff --git a/tests/msgattrib-3 b/tests/msgattrib-3
index b9b5809..0a8a258 100755
--- a/tests/msgattrib-3
+++ b/tests/msgattrib-3
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test3.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --no-fuzzy ma-test3.po -o ma-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test3.ok"
 cat <<EOF > ma-test3.ok
diff --git a/tests/msgattrib-4 b/tests/msgattrib-4
index 10eb3e9..f4fe0d1 100755
--- a/tests/msgattrib-4
+++ b/tests/msgattrib-4
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test4.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --only-fuzzy ma-test4.po -o ma-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test4.ok"
 cat <<EOF > ma-test4.ok
diff --git a/tests/msgattrib-5 b/tests/msgattrib-5
index 46223b2..ee29637 100755
--- a/tests/msgattrib-5
+++ b/tests/msgattrib-5
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test5.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --no-obsolete ma-test5.po -o ma-test5.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test5.ok"
 cat <<EOF > ma-test5.ok
diff --git a/tests/msgattrib-6 b/tests/msgattrib-6
index 9473978..f1bdb85 100755
--- a/tests/msgattrib-6
+++ b/tests/msgattrib-6
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test6.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --only-obsolete ma-test6.po -o ma-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test6.ok"
 cat <<EOF > ma-test6.ok
diff --git a/tests/msgattrib-7 b/tests/msgattrib-7
index 2fa8f1f..0976c48 100755
--- a/tests/msgattrib-7
+++ b/tests/msgattrib-7
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test7.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --translated --only-obsolete ma-test7.po -o ma-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test7.ok"
 cat <<EOF > ma-test7.ok
diff --git a/tests/msgattrib-8 b/tests/msgattrib-8
index 6564f7c..4fc6708 100755
--- a/tests/msgattrib-8
+++ b/tests/msgattrib-8
@@ -60,6 +60,7 @@ EOF
 tmpfiles="$tmpfiles ma-test8.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --set-fuzzy ma-test8.po -o ma-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test8.ok"
 cat <<EOF > ma-test8.ok
diff --git a/tests/msgattrib-9 b/tests/msgattrib-9
index c7e5b09..a5ff71a 100755
--- a/tests/msgattrib-9
+++ b/tests/msgattrib-9
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles ma-test9.out"
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --clear-fuzzy ma-test9.po -o ma-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles ma-test9.ok"
 cat <<EOF > ma-test9.ok
diff --git a/tests/msgcat-1 b/tests/msgcat-1
index dc5d82b..e10c1c5 100755
--- a/tests/msgcat-1
+++ b/tests/msgcat-1
@@ -44,6 +44,7 @@ EOF
 tmpfiles="$tmpfiles mcat-test1.out"
 : ${MSGCAT=msgcat}
 ${MSGCAT} mcat-test1.in1 mcat-test1.in2 -o mcat-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test1.ok"
 cat << EOF > mcat-test1.ok
diff --git a/tests/msgcat-2 b/tests/msgcat-2
index 8e735be..527d29b 100755
--- a/tests/msgcat-2
+++ b/tests/msgcat-2
@@ -53,14 +53,16 @@ msgid "You can log in as \"%1\"."
 msgstr "Sie können sich als \"%1\" einloggen."
 EOF
 
-tmpfiles="$tmpfiles mcat-test2.out"
+tmpfiles="$tmpfiles mcat-test2.out mcat-test2.err"
 rm -f mcat-test2.out
 
 : ${MSGCAT=msgcat}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCAT} --more-than=0 -o mcat-test2.out \
-    mcat-test2.in1 mcat-test2.in2 2>&1 \
-  | grep -v 'warning: .* encodings' | grep -v '^ '
+    mcat-test2.in1 mcat-test2.in2 >mcat-test2.err 2>&1
+result=$?
+cat mcat-test2.err | grep -v 'warning: .* encodings' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test2.ok"
 cat << \EOF > mcat-test2.ok
diff --git a/tests/msgcat-3 b/tests/msgcat-3
index deecf2d..0f07e52 100755
--- a/tests/msgcat-3
+++ b/tests/msgcat-3
@@ -54,14 +54,16 @@ msgid "You can log in as \"%1\"."
 msgstr "Sie können sich als \"%1\" einloggen."
 EOF
 
-tmpfiles="$tmpfiles mcat-test3.out"
+tmpfiles="$tmpfiles mcat-test3.out mcat-test3.err"
 rm -f mcat-test3.out
 
 : ${MSGCAT=msgcat}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCAT} --use-first --more-than=0 -o mcat-test3.out \
-    mcat-test3.in1 mcat-test3.in2 2>&1 \
-  | grep -v 'warning: .* encodings' | grep -v '^ '
+    mcat-test3.in1 mcat-test3.in2 >mcat-test3.err 2>&1
+result=$?
+cat mcat-test3.err | grep -v 'warning: .* encodings' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test3.ok"
 cat << \EOF > mcat-test3.ok
diff --git a/tests/msgcat-4 b/tests/msgcat-4
index 365a8fe..4cf95a8 100755
--- a/tests/msgcat-4
+++ b/tests/msgcat-4
@@ -54,14 +54,16 @@ msgstr ""
 "Glückwunsch!"
 EOF
 
-tmpfiles="$tmpfiles mcat-test4.out"
+tmpfiles="$tmpfiles mcat-test4.out mcat-test4.err"
 rm -f mcat-test4.out
 
 : ${MSGCAT=msgcat}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCAT} --use-first --more-than=0 -o mcat-test4.out \
-    mcat-test4.in1 mcat-test4.in2 2>&1 \
-  | grep -v 'warning: .* encodings' | grep -v '^ '
+    mcat-test4.in1 mcat-test4.in2 >mcat-test4.err 2>&1
+result=$?
+cat mcat-test4.err | grep -v 'warning: .* encodings' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test4.ok"
 cat << \EOF > mcat-test4.ok
diff --git a/tests/msgcat-5 b/tests/msgcat-5
index d602bcb..9cb163e 100755
--- a/tests/msgcat-5
+++ b/tests/msgcat-5
@@ -61,6 +61,7 @@ rm -f mcat-test5.out
 : ${MSGCAT=msgcat}
 ${MSGCAT} --use-first --more-than=0 -o mcat-test5.out \
     mcat-test5.in1 mcat-test5.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test5.ok"
 cat << EOF > mcat-test5.ok
diff --git a/tests/msgcat-6 b/tests/msgcat-6
index ac45456..cea9b96 100755
--- a/tests/msgcat-6
+++ b/tests/msgcat-6
@@ -61,6 +61,7 @@ rm -f mcat-test6.out
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test6.out \
     mcat-test6.in1 mcat-test6.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test6.ok"
 cat << EOF > mcat-test6.ok
diff --git a/tests/msgcat-7 b/tests/msgcat-7
index 0365aab..22e4c24 100755
--- a/tests/msgcat-7
+++ b/tests/msgcat-7
@@ -22,6 +22,7 @@ tmpfiles="$tmpfiles mcat-test7.out"
 rm -f mcat-test7.out
 : ${MSGCAT=msgcat}
 ${MSGCAT} mcat-test7.in1 --sort-output -o mcat-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcat-test7.ok"
 cat << EOF > mcat-test7.ok
diff --git a/tests/msgcomm-1 b/tests/msgcomm-1
index 6c6b8d5..fc3ca31 100755
--- a/tests/msgcomm-1
+++ b/tests/msgcomm-1
@@ -21,6 +21,7 @@ EOF
 tmpfiles="$tmpfiles mcomm-test1.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 -o mcomm-test1.out mcomm-test1.in1 mcomm-test1.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test1.ok"
 cat << EOF > mcomm-test1.ok
diff --git a/tests/msgcomm-10 b/tests/msgcomm-10
index f492d60..ed774e3 100755
--- a/tests/msgcomm-10
+++ b/tests/msgcomm-10
@@ -44,6 +44,7 @@ tmpfiles="$tmpfiles mcomm-test10.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test10.out \
     mcomm-test10.in1 mcomm-test10.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test10.ok"
 cat << EOF > mcomm-test10.ok
diff --git a/tests/msgcomm-11 b/tests/msgcomm-11
index 1184f41..b5cbbf6 100755
--- a/tests/msgcomm-11
+++ b/tests/msgcomm-11
@@ -48,6 +48,7 @@ tmpfiles="$tmpfiles mcomm-test11.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test11.out \
     mcomm-test11.in1 mcomm-test11.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test11.ok"
 cat << EOF > mcomm-test11.ok
diff --git a/tests/msgcomm-12 b/tests/msgcomm-12
index 326baaa..4f24895 100755
--- a/tests/msgcomm-12
+++ b/tests/msgcomm-12
@@ -70,6 +70,7 @@ tmpfiles="$tmpfiles mcomm-test12.out"
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test12.out \
     mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test12.ok"
 cat << EOF > mcomm-test12.ok
diff --git a/tests/msgcomm-13 b/tests/msgcomm-13
index 3113451..bbccd5d 100755
--- a/tests/msgcomm-13
+++ b/tests/msgcomm-13
@@ -73,6 +73,7 @@ tmpfiles="$tmpfiles mcomm-test13.out"
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test13.out \
     mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test13.ok"
 cat << EOF > mcomm-test13.ok
diff --git a/tests/msgcomm-14 b/tests/msgcomm-14
index 6a487a1..fa7c06c 100755
--- a/tests/msgcomm-14
+++ b/tests/msgcomm-14
@@ -68,6 +68,7 @@ tmpfiles="$tmpfiles mcomm-test14.out"
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test14.out \
     mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test14.ok"
 cat << EOF > mcomm-test14.ok
diff --git a/tests/msgcomm-15 b/tests/msgcomm-15
index 1e4e138..06f558e 100755
--- a/tests/msgcomm-15
+++ b/tests/msgcomm-15
@@ -71,6 +71,7 @@ rm -f mcomm-test15.out
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location -o mcomm-test15.out \
     mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 # we've no unique msg; thus no PO should be created.
 if test -f mcomm-test15.out; then
diff --git a/tests/msgcomm-16 b/tests/msgcomm-16
index b2d2162..2cd8ac6 100755
--- a/tests/msgcomm-16
+++ b/tests/msgcomm-16
@@ -53,14 +53,16 @@ msgid "You can log in as \"%1\"."
 msgstr "Sie können sich als \"%1\" einloggen."
 EOF
 
-tmpfiles="$tmpfiles mcomm-test16.out"
+tmpfiles="$tmpfiles mcomm-test16.out mcomm-test16.err"
 rm -f mcomm-test16.out
 
 : ${MSGCOMM=msgcomm}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCOMM} --more-than=0 -o mcomm-test16.out \
-    mcomm-test16.in1 mcomm-test16.in2 2>&1 \
-  | grep -v 'warning: .* encodings' | grep -v '^ '
+    mcomm-test16.in1 mcomm-test16.in2 >mcomm-test16.err 2>&1
+result=$?
+cat mcomm-test16.err | grep -v 'warning: .* encodings' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test16.ok"
 cat << \EOF > mcomm-test16.ok
diff --git a/tests/msgcomm-17 b/tests/msgcomm-17
index 45d1941..de3e264 100755
--- a/tests/msgcomm-17
+++ b/tests/msgcomm-17
@@ -70,6 +70,7 @@ tmpfiles="$tmpfiles mcomm-test17.out"
 
 ${MSGCOMM} -u mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 \
            -o mcomm-test17.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test17.ok"
 cat << EOF > mcomm-test17.ok
diff --git a/tests/msgcomm-18 b/tests/msgcomm-18
index 393b2bd..20b45eb 100755
--- a/tests/msgcomm-18
+++ b/tests/msgcomm-18
@@ -23,6 +23,7 @@ EOF
 tmpfiles="$tmpfiles mcomm-test18.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 mcomm-test18.in1 mcomm-test18.in2 -o mcomm-test18.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test18.ok"
 cat << EOF > mcomm-test18.ok
diff --git a/tests/msgcomm-19 b/tests/msgcomm-19
index f3d828a..df5168d 100755
--- a/tests/msgcomm-19
+++ b/tests/msgcomm-19
@@ -25,6 +25,7 @@ EOF
 tmpfiles="$tmpfiles mcomm-test19.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 mcomm-test19.in1 mcomm-test19.in2 -o mcomm-test19.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test19.ok"
 cat << EOF > mcomm-test19.ok
diff --git a/tests/msgcomm-2 b/tests/msgcomm-2
index f1a6b60..b2e81bc 100755
--- a/tests/msgcomm-2
+++ b/tests/msgcomm-2
@@ -22,6 +22,7 @@ tmpfiles="$tmpfiles mcomm-test2.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location -o mcomm-test2.out \
     mcomm-test2.in1 mcomm-test2.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test2.ok"
 cat << EOF > mcomm-test2.ok
diff --git a/tests/msgcomm-20 b/tests/msgcomm-20
index 0a07e30..198c3ad 100755
--- a/tests/msgcomm-20
+++ b/tests/msgcomm-20
@@ -26,6 +26,7 @@ tmpfiles="$tmpfiles mcomm-test20.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 -o mcomm-test20.out \
     mcomm-test20.in1 mcomm-test20.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test20.ok"
 cat << EOF > mcomm-test20.ok
diff --git a/tests/msgcomm-21 b/tests/msgcomm-21
index 9571e11..f97ddd5 100755
--- a/tests/msgcomm-21
+++ b/tests/msgcomm-21
@@ -26,6 +26,7 @@ EOF
 tmpfiles="$tmpfiles mcomm-test21.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 mcomm-test21.in1 mcomm-test21.in2 -o mcomm-test21.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test21.ok"
 cat << EOF > mcomm-test21.ok
diff --git a/tests/msgcomm-22 b/tests/msgcomm-22
index 17c2aae..42e3656 100755
--- a/tests/msgcomm-22
+++ b/tests/msgcomm-22
@@ -69,6 +69,7 @@ rm -f mcomm-test22.out
 
 ${MSGCOMM} --less-than=2 -o mcomm-test22.out \
     mcomm-test22.in1 mcomm-test22.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test22.ok"
 cat << EOF > mcomm-test22.ok
diff --git a/tests/msgcomm-23 b/tests/msgcomm-23
index 9bc0b4a..619f1e4 100755
--- a/tests/msgcomm-23
+++ b/tests/msgcomm-23
@@ -12,6 +12,7 @@ cp ${top_srcdir}/tests/msguniq-a.in mcomm-23.in2
 tmpfiles="$tmpfiles mcomm-23.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} -w 1000 mcomm-23.in1 mcomm-23.in2 -o mcomm-23.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} ${top_srcdir}/tests/msguniq-a.out mcomm-23.out
diff --git a/tests/msgcomm-3 b/tests/msgcomm-3
index e06b483..71fa2a2 100755
--- a/tests/msgcomm-3
+++ b/tests/msgcomm-3
@@ -22,6 +22,7 @@ tmpfiles="$tmpfiles mcomm-test3.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test3.out \
     mcomm-test3.in1 mcomm-test3.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test3.ok"
 cat << EOF > mcomm-test3.ok
diff --git a/tests/msgcomm-4 b/tests/msgcomm-4
index 49df324..4b692e8 100755
--- a/tests/msgcomm-4
+++ b/tests/msgcomm-4
@@ -33,6 +33,7 @@ tmpfiles="$tmpfiles mcomm-test4.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 -o mcomm-test4.out \
     mcomm-test4.in1 mcomm-test4.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test4.ok"
 cat << EOF > mcomm-test4.ok
diff --git a/tests/msgcomm-5 b/tests/msgcomm-5
index 14f331c..ad6c95e 100755
--- a/tests/msgcomm-5
+++ b/tests/msgcomm-5
@@ -33,6 +33,7 @@ tmpfiles="$tmpfiles mcomm-test5.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test5.out \
     mcomm-test5.in1 mcomm-test5.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test5.ok"
 cat << EOF > mcomm-test5.ok
diff --git a/tests/msgcomm-6 b/tests/msgcomm-6
index 845128a..459de05 100755
--- a/tests/msgcomm-6
+++ b/tests/msgcomm-6
@@ -33,6 +33,7 @@ tmpfiles="$tmpfiles mcomm-test6.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location -o mcomm-test6.out \
     mcomm-test6.in1 mcomm-test6.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test6.ok"
 cat << EOF > mcomm-test6.ok
diff --git a/tests/msgcomm-7 b/tests/msgcomm-7
index 9a08f91..6738513 100755
--- a/tests/msgcomm-7
+++ b/tests/msgcomm-7
@@ -33,6 +33,7 @@ tmpfiles="$tmpfiles mcomm-test7.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location --omit-header -o mcomm-test7.out \
     mcomm-test7.in1 mcomm-test7.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test7.ok"
 cat << EOF > mcomm-test7.ok
diff --git a/tests/msgcomm-8 b/tests/msgcomm-8
index 3b71c50..bb9e1fa 100755
--- a/tests/msgcomm-8
+++ b/tests/msgcomm-8
@@ -44,6 +44,7 @@ tmpfiles="$tmpfiles mcomm-test8.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 -o mcomm-test8.out \
     mcomm-test8.in1 mcomm-test8.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test8.ok"
 cat << EOF > mcomm-test8.ok
diff --git a/tests/msgcomm-9 b/tests/msgcomm-9
index aa3861b..553a766 100755
--- a/tests/msgcomm-9
+++ b/tests/msgcomm-9
@@ -44,6 +44,7 @@ tmpfiles="$tmpfiles mcomm-test9.out"
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location -o mcomm-test9.out \
     mcomm-test9.in1 mcomm-test9.in2
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mcomm-test9.ok"
 cat << EOF > mcomm-test9.ok
diff --git a/tests/msgconv-1 b/tests/msgconv-1
index 2809106..1d0c2d2 100755
--- a/tests/msgconv-1
+++ b/tests/msgconv-1
@@ -23,6 +23,7 @@ EOF
 tmpfiles="$tmpfiles mco-test1.out"
 : ${MSGCONV=msgconv}
 ${MSGCONV} --to-code=UTF-8 mco-test1.po -o mco-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mco-test1.ok"
 cat <<EOF > mco-test1.ok
diff --git a/tests/msgconv-2 b/tests/msgconv-2
index 00622ba..4cbb0e0 100755
--- a/tests/msgconv-2
+++ b/tests/msgconv-2
@@ -24,6 +24,7 @@ EOF
 tmpfiles="$tmpfiles mco-test2.out"
 : ${MSGCONV=msgconv}
 ${MSGCONV} -t Big5 mco-test2.po -o mco-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mco-test2.ok"
 cat <<EOF > mco-test2.ok
diff --git a/tests/msgen-1 b/tests/msgen-1
index 19e53b6..acd8f6c 100755
--- a/tests/msgen-1
+++ b/tests/msgen-1
@@ -30,6 +30,7 @@ EOF
 tmpfiles="$tmpfiles men-test1.out"
 : ${MSGEN=msgen}
 ${MSGEN} men-test1.po -o men-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles men-test1.ok"
 cat <<EOF > men-test1.ok
diff --git a/tests/msgexec-1 b/tests/msgexec-1
index fabbcb3..94d107d 100755
--- a/tests/msgexec-1
+++ b/tests/msgexec-1
@@ -74,6 +74,7 @@ chmod a+x mex-test1.sh
 tmpfiles="$tmpfiles mex-test1.out"
 : ${MSGEXEC=msgexec}
 ${MSGEXEC} -i mex-test1.po ./mex-test1.sh > mex-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mex-test1.ok"
 cat <<EOF > mex-test1.ok
diff --git a/tests/msgexec-2 b/tests/msgexec-2
index d1d4b69..78e4c26 100755
--- a/tests/msgexec-2
+++ b/tests/msgexec-2
@@ -60,6 +60,7 @@ EOF
 tmpfiles="$tmpfiles mex-test2.out"
 : ${MSGEXEC=msgexec}
 ${MSGEXEC} -i mex-test2.po 0 > mex-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${CMP=cmp}
 ${CMP} mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
diff --git a/tests/msgfilter-1 b/tests/msgfilter-1
index b745d7a..b434d80 100755
--- a/tests/msgfilter-1
+++ b/tests/msgfilter-1
@@ -77,11 +77,13 @@ msgstr ""
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
-tmpfiles="$tmpfiles mfi-test1.out"
+tmpfiles="$tmpfiles mfi-test1.out mfi-test1.err"
 : ${MSGFILTER=msgfilter}
 LC_ALL=C \
-${MSGFILTER} -i mfi-test1.po -o mfi-test1.out fold -b -s -w 20 2>&1 \
-  | grep -v 'warning: Locale charset' | grep -v '^ '
+${MSGFILTER} -i mfi-test1.po -o mfi-test1.out fold -b -s -w 20 >mfi-test1.err 2>&1
+result=$?
+cat mfi-test1.err | grep -v 'warning: Locale charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mfi-test1.ok"
 cat <<EOF > mfi-test1.ok
diff --git a/tests/msgfilter-2 b/tests/msgfilter-2
index 9190768..68fb64d 100755
--- a/tests/msgfilter-2
+++ b/tests/msgfilter-2
@@ -79,7 +79,7 @@ msgstr ""
 #~ msgstr "das einen verheirateten Mann liebt"
 EOF
 
-tmpfiles="$tmpfiles mfi-test2.out"
+tmpfiles="$tmpfiles mfi-test2.out mfi-test2.err"
 : ${MSGFILTER=msgfilter}
 sedexpr1='1{
 s/^/\[\[/
@@ -88,8 +88,10 @@ sedexpr2='${
 s/$/\]\]/
 }'
 LC_ALL=C \
-${MSGFILTER} -i mfi-test2.po -o mfi-test2.out sed -e "$sedexpr1" -e "$sedexpr2" 2>&1 \
-  | grep -v 'warning: Locale charset' | grep -v '^ '
+${MSGFILTER} -i mfi-test2.po -o mfi-test2.out sed -e "$sedexpr1" -e "$sedexpr2" >mfi-test2.err 2>&1
+result=$?
+cat mfi-test2.err | grep -v 'warning: Locale charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mfi-test2.ok"
 cat <<EOF > mfi-test2.ok
diff --git a/tests/msgfmt-1 b/tests/msgfmt-1
index 3566d16..3b8face 100755
--- a/tests/msgfmt-1
+++ b/tests/msgfmt-1
@@ -53,7 +53,9 @@ fi
 tmpfiles="$tmpfiles modules.po"
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
 ${MSGCAT} --use-first module1.po module2.po -o modules.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 ${MSGFMT} modules.po -o LC_MESSAGES/gen.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test1.out"
 : ${GETTEXT=gettext}
diff --git a/tests/msgfmt-10 b/tests/msgfmt-10
index 5c9c562..c019189 100755
--- a/tests/msgfmt-10
+++ b/tests/msgfmt-10
@@ -38,8 +38,8 @@ msgstr[1] "%d yararsýz kurals"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check mf-test10.po1 -o /dev/null || \
-  { rm -fr $tmpfiles; exit 1; }
+${MSGFMT} --check mf-test10.po1 -o /dev/null
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test10.po2"
 cat <<EOF > mf-test10.po2
diff --git a/tests/msgfmt-2 b/tests/msgfmt-2
index f567aad..5695835 100755
--- a/tests/msgfmt-2
+++ b/tests/msgfmt-2
@@ -65,7 +65,9 @@ fi
 tmpfiles="$tmpfiles modules.po"
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
 ${MSGCAT} --use-first module1.po module2.po -o modules.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 ${MSGFMT} modules.po -o LC_MESSAGES/gen.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mf-test2.out"
 : ${GETTEXT=gettext}
diff --git a/tests/msgfmt-3 b/tests/msgfmt-3
index 04713de..b0b2ed7 100755
--- a/tests/msgfmt-3
+++ b/tests/msgfmt-3
@@ -18,11 +18,13 @@ msgid   ""
 msgstr  ""
 EOF
 
-tmpfiles="$tmpfiles mftest3.mo"
+tmpfiles="$tmpfiles mftest3.mo mftest3.err"
 : ${MSGFMT=msgfmt}
 LC_MESSAGES=C LC_ALL= \
-${MSGFMT} mf-test3.po -o mftest3.mo 2>&1 \
-  | grep -v 'warning: Charset' | grep -v '^ '
+${MSGFMT} mf-test3.po -o mftest3.mo >mftest3.err 2>&1
+result=$?
+cat mftest3.err | grep -v 'warning: Charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 test ! -f mftest3.mo
 result=$?
diff --git a/tests/msgfmt-5 b/tests/msgfmt-5
index 646c4e6..93d4997 100755
--- a/tests/msgfmt-5
+++ b/tests/msgfmt-5
@@ -35,11 +35,14 @@ EOF
 tmpfiles="$tmpfiles foo-de.mo foo-fr.mo"
 : ${MSGFMT=msgfmt}
 ${MSGFMT} foo.po
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles foo-de.out foo-fr.out"
 : ${MSGUNFMT=msgunfmt}
 ${MSGUNFMT} foo-de.mo -o foo-de.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 ${MSGUNFMT} foo-fr.mo -o foo-fr.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles foo-de.ok"
 cat <<EOF > foo-de.ok
diff --git a/tests/msggrep-1 b/tests/msggrep-1
index 5024cb8..5e116d6 100755
--- a/tests/msggrep-1
+++ b/tests/msggrep-1
@@ -158,6 +158,7 @@ EOF
 tmpfiles="$tmpfiles mg-test1.out"
 : ${MSGGREP=msggrep}
 ${MSGGREP} -N pipe-bidi.c mg-test1.po -o mg-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mg-test1.ok"
 cat <<\EOF > mg-test1.ok
diff --git a/tests/msggrep-2 b/tests/msggrep-2
index b10c3ff..424455c 100755
--- a/tests/msggrep-2
+++ b/tests/msggrep-2
@@ -155,6 +155,7 @@ EOF
 tmpfiles="$tmpfiles mg-test2.out"
 : ${MSGGREP=msggrep}
 ${MSGGREP} -M fr mg-test2.po -o mg-test2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mg-test2.ok"
 cat <<\EOF > mg-test2.ok
diff --git a/tests/msggrep-3 b/tests/msggrep-3
index 2cb996d..3701b7c 100755
--- a/tests/msggrep-3
+++ b/tests/msggrep-3
@@ -159,11 +159,13 @@ msgid "GSG-9"
 msgstr "Antiterror-Einheit"
 EOF
 
-tmpfiles="$tmpfiles mg-test3.out"
+tmpfiles="$tmpfiles mg-test3.out mg-test3.err"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -K -e error -T -e Speicher mg-test3.po -o mg-test3.out 2>&1 \
-  | grep -v 'warning: Locale charset' | grep -v '^ '
+${MSGGREP} -K -e error -T -e Speicher mg-test3.po -o mg-test3.out >mg-test3.err 2>&1
+result=$?
+cat mg-test3.err | grep -v 'warning: Locale charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mg-test3.ok"
 cat <<\EOF > mg-test3.ok
diff --git a/tests/msggrep-4 b/tests/msggrep-4
index b7ac532..0d80f56 100755
--- a/tests/msggrep-4
+++ b/tests/msggrep-4
@@ -161,13 +161,13 @@ echo 'invalid' > mg-test4.in1
 tmpfiles="$tmpfiles mg-test4.in2"
 echo 'illegal' > mg-test4.in2
 
-tmpfiles="$tmpfiles mg-test4.out"
-
-tmpfiles="$tmpfiles mg-test4.out"
+tmpfiles="$tmpfiles mg-test4.out mg-test4.err"
 : ${MSGGREP=msggrep}
 LC_MESSAGES=C LC_ALL= \
-${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot mg-test4.po -o mg-test4.out 2>&1 \
-  | grep -v 'warning: Locale charset' | grep -v '^ '
+${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot mg-test4.po -o mg-test4.out > mg-test4.err 2>&1
+result=$?
+cat mg-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mg-test4.ok"
 cat <<\EOF > mg-test4.ok
diff --git a/tests/msgmerge-1 b/tests/msgmerge-1
index d88c407..d33abbc 100755
--- a/tests/msgmerge-1
+++ b/tests/msgmerge-1
@@ -39,6 +39,7 @@ EOF
 tmpfiles="$tmpfiles mm-test1.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q mm-test1.in1 mm-test1.in2 -o mm-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test1.ok"
 cat << EOF > mm-test1.ok
diff --git a/tests/msgmerge-10 b/tests/msgmerge-10
index fe7bf6b..73fabfb 100755
--- a/tests/msgmerge-10
+++ b/tests/msgmerge-10
@@ -45,6 +45,7 @@ EOF
 tmpfiles="$tmpfiles foo.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q foo.po foo.pot -o foo.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles foo.ok"
 cat <<EOF > foo.ok
diff --git a/tests/msgmerge-11 b/tests/msgmerge-11
index 20d3f53..bbf434f 100755
--- a/tests/msgmerge-11
+++ b/tests/msgmerge-11
@@ -41,6 +41,7 @@ EOF
 tmpfiles="$tmpfiles foo.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} --multi-domain -q foo.po foo.pot -o foo.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles foo.ok"
 cat <<EOF > foo.ok
diff --git a/tests/msgmerge-12 b/tests/msgmerge-12
index 3ffca40..ae77e05 100755
--- a/tests/msgmerge-12
+++ b/tests/msgmerge-12
@@ -32,6 +32,7 @@ EOF
 tmpfiles="$tmpfiles mm-test12.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q --compendium mm-test12.com /dev/null mm-test12.pot -o mm-test12.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test12.ok"
 cat << EOF > mm-test12.ok
diff --git a/tests/msgmerge-14 b/tests/msgmerge-14
index 89bd4be..fba5052 100755
--- a/tests/msgmerge-14
+++ b/tests/msgmerge-14
@@ -65,6 +65,7 @@ cp mm-test14.po mm-test14.bak
 tmpfiles="$tmpfiles mm-test14.po~"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q --update mm-test14.po mm-test14.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mm-test14.bak mm-test14.po
diff --git a/tests/msgmerge-15 b/tests/msgmerge-15
index d4d583f..9670bc1 100755
--- a/tests/msgmerge-15
+++ b/tests/msgmerge-15
@@ -54,6 +54,7 @@ EOF
 tmpfiles="$tmpfiles mm-test15.po~"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q --update mm-test15.po mm-test15.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test15.ok"
 cat <<EOF > mm-test15.ok
diff --git a/tests/msgmerge-16 b/tests/msgmerge-16
index 2b999c0..a94652d 100755
--- a/tests/msgmerge-16
+++ b/tests/msgmerge-16
@@ -53,6 +53,7 @@ EOF
 tmpfiles="$tmpfiles mm-test16.po~"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q --update mm-test16.po mm-test16.pot
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test16.ok"
 cat <<EOF > mm-test16.ok
diff --git a/tests/msgmerge-17 b/tests/msgmerge-17
index d729cb5..48e697e 100755
--- a/tests/msgmerge-17
+++ b/tests/msgmerge-17
@@ -57,6 +57,7 @@ EOF
 tmpfiles="$tmpfiles mm-test17.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q mm-test17.po mm-test17.pot -o mm-test17.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test17.ok"
 cat <<EOF > mm-test17.ok
diff --git a/tests/msgmerge-18 b/tests/msgmerge-18
index 662913c..70113b4 100755
--- a/tests/msgmerge-18
+++ b/tests/msgmerge-18
@@ -59,6 +59,7 @@ EOF
 tmpfiles="$tmpfiles mm-test18.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q mm-test18.po mm-test18.pot -o mm-test18.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test18.ok"
 cat <<EOF > mm-test18.ok
diff --git a/tests/msgmerge-19 b/tests/msgmerge-19
index 6810492..2cc6a31 100755
--- a/tests/msgmerge-19
+++ b/tests/msgmerge-19
@@ -57,6 +57,7 @@ EOF
 tmpfiles="$tmpfiles mm-test19.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q mm-test19.po mm-test19.pot -o mm-test19.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test19.ok"
 cat <<EOF > mm-test19.ok
diff --git a/tests/msgmerge-20 b/tests/msgmerge-20
index 4cf48d3..abd6cee 100755
--- a/tests/msgmerge-20
+++ b/tests/msgmerge-20
@@ -90,6 +90,7 @@ EOF
 tmpfiles="$tmpfiles mm-test20.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q mm-test20.po mm-test20.pot -o mm-test20.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test20.ok"
 cat <<EOF > mm-test20.ok
diff --git a/tests/msgmerge-3 b/tests/msgmerge-3
index 883fc64..6b5b4cc 100755
--- a/tests/msgmerge-3
+++ b/tests/msgmerge-3
@@ -53,6 +53,7 @@ EOF
 tmpfiles="$tmpfiles mm-test3.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q mm-test3.in1 mm-test3.in2 -o mm-test3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test3.ok"
 cat << EOF > mm-test3.ok
diff --git a/tests/msgmerge-4 b/tests/msgmerge-4
index 35e3a2e..42a046a 100755
--- a/tests/msgmerge-4
+++ b/tests/msgmerge-4
@@ -28,6 +28,7 @@ EOF
 tmpfiles="$tmpfiles mm-test4.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q mm-test4.in1.po mm-test4.in2.po -o mm-test4.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test4.ok"
 cat <<EOF > mm-test4.ok
diff --git a/tests/msgmerge-5 b/tests/msgmerge-5
index 9900a54..bc9f931 100755
--- a/tests/msgmerge-5
+++ b/tests/msgmerge-5
@@ -37,11 +37,13 @@ msgstr ""
 "blah blah blah blah blah blah blah blah blah blah blah blah blah bla bla bla\n"
 EOF
 
-tmpfiles="$tmpfiles mm-test5.out"
+tmpfiles="$tmpfiles mm-test5.out mm-test5.err"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q mm-test5.in1.po mm-test5.in2.po -o mm-test5.out 2>&1 \
-  | grep -v 'warning: Charset' | grep -v '^ '
+${MSGMERGE} -q mm-test5.in1.po mm-test5.in2.po -o mm-test5.out >mm-test5.err 2>&1
+result=$?
+cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test5.ok"
 cat <<EOF > mm-test5.ok
diff --git a/tests/msgmerge-6 b/tests/msgmerge-6
index d9b7346..43a2ddb 100755
--- a/tests/msgmerge-6
+++ b/tests/msgmerge-6
@@ -31,6 +31,7 @@ EOF
 tmpfiles="$tmpfiles mm-test6.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -C mm-test6.com mm-test6.in1 mm-test6.pot -o mm-test6.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test6.ok"
 cat << EOF > mm-test6.ok
diff --git a/tests/msgmerge-7 b/tests/msgmerge-7
index 142b27e..d245493 100755
--- a/tests/msgmerge-7
+++ b/tests/msgmerge-7
@@ -31,6 +31,7 @@ EOF
 tmpfiles="$tmpfiles mm-test7.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -C mm-test7.com mm-test7.in1 mm-test7.pot -o mm-test7.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test7.ok"
 cat << EOF > mm-test7.ok
diff --git a/tests/msgmerge-8 b/tests/msgmerge-8
index 611a665..1bdff44 100755
--- a/tests/msgmerge-8
+++ b/tests/msgmerge-8
@@ -39,6 +39,7 @@ EOF
 tmpfiles="$tmpfiles mm-test8.out"
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -C mm-test8.com mm-test8.in1 mm-test8.pot -o mm-test8.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test8.ok"
 cat << EOF > mm-test8.ok
diff --git a/tests/msgmerge-9 b/tests/msgmerge-9
index 5e8f13a..2e340dc 100755
--- a/tests/msgmerge-9
+++ b/tests/msgmerge-9
@@ -60,6 +60,7 @@ tmpfiles="$tmpfiles mm-test9.out"
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q mm-test9.in1.po mm-test9.in2.po -o mm-test9.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mm-test9.ok"
 cat <<EOF > mm-test9.ok
diff --git a/tests/msgunfmt-1 b/tests/msgunfmt-1
index 840463a..8ef4b35 100755
--- a/tests/msgunfmt-1
+++ b/tests/msgunfmt-1
@@ -33,10 +33,12 @@ EOF
 tmpfiles="$tmpfiles mu-test1.mo"
 : ${MSGFMT=msgfmt}
 ${MSGFMT} mu-test1.in -o mu-test1.mo
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles mu-test1.out"
 : ${MSGUNFMT=msgunfmt}
 ${MSGUNFMT} mu-test1.mo -o mu-test1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} mu-test1.in mu-test1.out
diff --git a/tests/msguniq-1 b/tests/msguniq-1
index c466cad..17be1a0 100755
--- a/tests/msguniq-1
+++ b/tests/msguniq-1
@@ -6,6 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles msguniq-1.out"
 : ${MSGUNIQ-msguniq}
 ${MSGUNIQ} -w 1000 ${top_srcdir}/tests/msguniq-a.in -o msguniq-1.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} ${top_srcdir}/tests/msguniq-a.out msguniq-1.out
diff --git a/tests/msguniq-2 b/tests/msguniq-2
index d6e7cd4..5b4a9cd 100755
--- a/tests/msguniq-2
+++ b/tests/msguniq-2
@@ -6,6 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles msguniq-2.out"
 : ${MSGUNIQ-msguniq}
 ${MSGUNIQ} -w 1000 -u ${top_srcdir}/tests/msguniq-a.in -o msguniq-2.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-2.ok"
 cat <<\EOF > msguniq-2.ok
diff --git a/tests/msguniq-3 b/tests/msguniq-3
index 129cda7..8b4a562 100755
--- a/tests/msguniq-3
+++ b/tests/msguniq-3
@@ -6,6 +6,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 tmpfiles="$tmpfiles msguniq-3.out"
 : ${MSGUNIQ-msguniq}
 ${MSGUNIQ} -w 1000 -d ${top_srcdir}/tests/msguniq-a.in -o msguniq-3.out
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles msguniq-3.ok"
 cat <<\EOF > msguniq-3.ok
diff --git a/tests/xgettext-1 b/tests/xgettext-1
index b0d08e4..f40a6ab 100755
--- a/tests/xgettext-1
+++ b/tests/xgettext-1
@@ -12,6 +12,7 @@ tmpfiles="$tmpfiles xg-test1.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-test1 -k_ --omit-header --no-location \
  $top_srcdir/src/xgettext.c $top_srcdir/src/msgfmt.c $top_srcdir/src/gettext.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 : ${DIFF=diff}
 ${DIFF} $top_srcdir/tests/xg-test1.ok.po xg-test1.po
diff --git a/tests/xgettext-10 b/tests/xgettext-10
index 7d927c6..dd059b0 100755
--- a/tests/xgettext-10
+++ b/tests/xgettext-10
@@ -34,6 +34,7 @@ EOF
 tmpfiles="$tmpfiles xg-test10.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -c -d xg-test10 xg-test10.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test10.ok"
 cat <<EOF > xg-test10.ok
diff --git a/tests/xgettext-11 b/tests/xgettext-11
index 596a47e..0d81ede 100755
--- a/tests/xgettext-11
+++ b/tests/xgettext-11
@@ -21,6 +21,7 @@ EOF
 tmpfiles="$tmpfiles xg-test11.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -c --keyword-substring --keyword=Exception -d xg-test11 xg-test11.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test11.ok"
 cat <<EOF > xg-test11.ok
diff --git a/tests/xgettext-12 b/tests/xgettext-12
index 478cbd2..ff6dbc6 100755
--- a/tests/xgettext-12
+++ b/tests/xgettext-12
@@ -27,6 +27,7 @@ EOF
 tmpfiles="$tmpfiles xg-test12.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-test12 -k_ --omit-header --no-location xg-test12.in.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test12.ok"
 cat <<EOF > xg-test12.ok
diff --git a/tests/xgettext-15 b/tests/xgettext-15
index 6ecf042..a0d1371 100755
--- a/tests/xgettext-15
+++ b/tests/xgettext-15
@@ -19,6 +19,7 @@ EOF
 tmpfiles="$tmpfiles xg-test15.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -d xg-test15 xg-test15.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test15.ok"
 cat <<EOF > xg-test15.ok
diff --git a/tests/xgettext-16 b/tests/xgettext-16
index 9d0956f..87fd468 100755
--- a/tests/xgettext-16
+++ b/tests/xgettext-16
@@ -19,6 +19,7 @@ EOF
 tmpfiles="$tmpfiles xg-test16.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 -d xg-test16 xg-test16.java
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test16.ok"
 cat <<EOF > xg-test16.ok
diff --git a/tests/xgettext-17 b/tests/xgettext-17
index a5a9c83..a0498b5 100755
--- a/tests/xgettext-17
+++ b/tests/xgettext-17
@@ -14,6 +14,7 @@ EOF
 tmpfiles="$tmpfiles xg-test17.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-test17 xg-test17.ycp
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test17.ok"
 cat <<EOF > xg-test17.ok
diff --git a/tests/xgettext-2 b/tests/xgettext-2
index 98e7a4a..b071455 100755
--- a/tests/xgettext-2
+++ b/tests/xgettext-2
@@ -21,6 +21,7 @@ EOF
 tmpfiles="$tmpfiles xg-test2.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-test2 -k_ --omit-header --no-location xg-test2.in.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test2.ok"
 cat <<EOF > xg-test2.ok
diff --git a/tests/xgettext-3 b/tests/xgettext-3
index 8a8e477..34fd2df 100755
--- a/tests/xgettext-3
+++ b/tests/xgettext-3
@@ -8,13 +8,15 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles zero-domain.po"
+tmpfiles="$tmpfiles zero-domain.po xg-test3.err"
 rm -f zero-domain.po
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
 ${XGETTEXT} -k_ -d zero-domain -x $top_srcdir/po/gettext.pot \
-  $top_srcdir/src/xgettext.c 2>&1 \
-  | grep -v 'warning: Charset' | grep -v '^ '
+  $top_srcdir/src/xgettext.c >xg-test3.err 2>&1
+result=$?
+cat xg-test3.err | grep -v 'warning: Charset' | grep -v '^ '
+test $result = 0 || { rm -fr $tmpfiles; exit 1; }
 
 test ! -f zero-domain.po
 result=$?
diff --git a/tests/xgettext-4 b/tests/xgettext-4
index 4d5f63b..166a2de 100755
--- a/tests/xgettext-4
+++ b/tests/xgettext-4
@@ -14,6 +14,7 @@ EOF
 tmpfiles="$tmpfiles xg-test4.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --add-location xg-test4.in.c -d xg-test4
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test4.ok"
 cat <<EOF > xg-test4.ok
diff --git a/tests/xgettext-5 b/tests/xgettext-5
index 7d1278e..830e9cd 100755
--- a/tests/xgettext-5
+++ b/tests/xgettext-5
@@ -11,6 +11,7 @@ EOF
 tmpfiles="$tmpfiles xg-test5.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --trigraphs xg-test5.in.c -d xg-test5
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test5.ok"
 cat <<EOF > xg-test5.ok
diff --git a/tests/xgettext-6 b/tests/xgettext-6
index 6994e57..209ab10 100755
--- a/tests/xgettext-6
+++ b/tests/xgettext-6
@@ -11,6 +11,7 @@ EOF
 tmpfiles="$tmpfiles xg-test6.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments xg-test6.in.cc -d xg-test6
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test6.ok"
 cat <<EOF > xg-test6.ok
diff --git a/tests/xgettext-7 b/tests/xgettext-7
index 153e666..a5a5b34 100755
--- a/tests/xgettext-7
+++ b/tests/xgettext-7
@@ -22,6 +22,7 @@ tmpfiles="$tmpfiles xg-test7.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=XXX xg-test7.in.C \
   -d xg-test7
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test7.ok"
 cat <<EOF > xg-test7.ok
diff --git a/tests/xgettext-8 b/tests/xgettext-8
index 77b9ec0..b3e7a7f 100755
--- a/tests/xgettext-8
+++ b/tests/xgettext-8
@@ -47,6 +47,7 @@ tmpfiles="$tmpfiles xg-test8.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n xg-test8.in.po \
   xg-test8.c xg-test8.cc -d xg-test8
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test8.ok"
 cat <<EOF > xg-test8.ok
diff --git a/tests/xgettext-9 b/tests/xgettext-9
index e084000..5a23f2e 100755
--- a/tests/xgettext-9
+++ b/tests/xgettext-9
@@ -41,6 +41,7 @@ EOF
 tmpfiles="$tmpfiles xg-test9.po"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -c --c++ -d xg-test9 xg-test9.c
+test $? = 0 || { rm -fr $tmpfiles; exit 1; }
 
 tmpfiles="$tmpfiles xg-test9.ok"
 cat <<EOF > xg-test9.ok