Better error checking.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 846ae01979af125e0e9d9dd2bb5adcada9fe5b0b..1e92aa4f46791a910874790eed4c6fa187fbfc2f 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,20 @@
+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.

diff --git a/tests/msgattrib-1 b/tests/msgattrib-1
index 98c3acc34a8a6b81bed9d2d441a52e8c9a26c0e0..63302543a67f0c95448777ff0c0f113fb6645119 100755 (executable)
--- 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 82986c6109fee3d2b5215ce24fc04ce9b6fd61b5..ee9767199582dd79b1c30a6a248c71106664534f 100755 (executable)
--- 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 22a3b3ee02fb3b60aba360fd23dffed08fdf60db..0f8b28c48947b933495399b5a51304649576fb33 100755 (executable)
--- 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 2fff0efa46e7eaced4a2e0d8981631028b2e847c..c73282013f6776323456c540073c61b170eb98e6 100755 (executable)
--- 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 b2cff7d126339bc6475f6ebc1cb034a11a8b4c9d..f2587343a81070d389a540e38c20420b6af39b47 100755 (executable)
--- 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 60e78ef10595b0ab4c8a42831a82646f6124da67..da814341d871201b94582a1d2a73994d74d22da4 100755 (executable)
--- 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 2f156a167afaf0931962dc885838c88b81191721..7bddebb40654f050e7bd43a02ba5586824811792 100755 (executable)
--- 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 b9b58097514d7f79ccca949b77a8bbc8af8b10a4..0a8a2589b6621dd928cb6d3a4c626e0827ad57dd 100755 (executable)
--- 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 10eb3e9c27fb19a2b3b6060e59962686c4eab005..f4fe0d19c561ff5047c61d8d95b59d8533ad6633 100755 (executable)
--- 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 46223b289510a783b34ebf6bf0c9450cb7d9d50c..ee296376ef3a3d0fda811b4221b1e49a2de0d2f6 100755 (executable)
--- 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 9473978a8479babeaddc77aa8faa280603a36635..f1bdb85757e8fc8ac029f885041ecf42854f68dd 100755 (executable)
--- 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 2fa8f1f2ab4166c1bd95f08df38f1bf2949359f4..0976c489afec89d88b0c167e96e58a9d2cebf124 100755 (executable)
--- 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 6564f7c0d3dd4fe567b46d061dfbae22e536e017..4fc6708d9c25733f16f3ece268b5283e141720de 100755 (executable)
--- 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 c7e5b09833a246de6c6b27f2bf0369959459e553..a5ff71a98e8445441fb3f9dc42e21dcdb10e6c03 100755 (executable)
--- 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 dc5d82b0449463256a7cc9951d3b185733825468..e10c1c56fc7cf8a654d067a646ec20e2b8bca493 100755 (executable)
--- 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 8e735bebf0d474d84c356e959a2f398b238378d3..527d29b3a2e4cd82af65752e63c9cdaa9ab4219b 100755 (executable)
--- 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 deecf2d8868979d1e8d58400c8066c5f6432e72a..0f07e5227a7f9d3d6653bcf1a524a3ffc22690b8 100755 (executable)
--- 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 365a8fe2e59a66b24b4b84a41461f1aed5952897..4cf95a82272f78c306ce0c1a2f60721d532a1d34 100755 (executable)
--- 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 d602bcb8af2baa9f6e7b7eae05b779ebce742bca..9cb163e5087e895d72371749be0a22e7796fe2b3 100755 (executable)
--- 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 ac45456f4c7fbde371c1a90c14482bfb01f22c48..cea9b962425c8bf55e9862cd80d9fbafec57757e 100755 (executable)
--- 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 0365aab5b28531d43177974a31444b9dc8eed0fd..22e4c24672ea989ea64a08d76905290562879a5f 100755 (executable)
--- 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 6c6b8d535444dcafd68246ca7842ce43b63e6fef..fc3ca314a655fc9301fbfd6d581a36ba7abf7723 100755 (executable)
--- 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 f492d604937451a8e6ecdbaf14ef12de4464e6bc..ed774e370003d55721d5e527df13dc90484eda79 100755 (executable)
--- 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 1184f41274309d07ffe0634878926c1f1ceac578..b5cbbf6a527db97b9396ca9c1ecd54445bbf3066 100755 (executable)
--- 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 326baaab01ab67a2c385da5a6cecc1b9734939ce..4f24895bf277915739ce0e0f0d6594d3ca7d4d76 100755 (executable)
--- 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 311345167687b3c12ba8f0aac2967926ad614cb3..bbccd5d0e1df4d832e71a31aa784d491431d6bde 100755 (executable)
--- 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 6a487a110438a3ee1dc52fb2ab0903272f0573a8..fa7c06c277f28e29d5ae90a130b7cb7dbb361b0e 100755 (executable)
--- 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 1e4e1380aa5830e252320c9e3ea708d1866983c5..06f558e8e0de689741dd6ef37cafab845bee4620 100755 (executable)
--- 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 b2d2162d38011447ae46cac9a4b64ba97ddf35af..2cd8ac6e53f79d20b883e6e7a3a50347da7982b2 100755 (executable)
--- 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 45d19410f4919bda64de0147f2afa1493312fc59..de3e2648bc2c5aac87c1ba4df2c080cc865606fa 100755 (executable)
--- 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 393b2bdc4fe4ba637c7c1ec666c4ee31dc9fe6e5..20b45eb6c698743bf25b0adbf0a27b100f3ce7cb 100755 (executable)
--- 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 f3d828aa90b6fdcfa9a00c72adc1e8cf7551b698..df5168d547c9c2bc199b6c0fb9413d8eadda369c 100755 (executable)
--- 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 f1a6b609a84bcaf3b3a591af6f5879cd541fa626..b2e81bc1552e33fbbea982e35795b9bc65295459 100755 (executable)
--- 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 0a07e30e1323565359c30436b0ea59d6f344366d..198c3add40faba56500437efac0d801d213b54e5 100755 (executable)
--- 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 9571e111e25e17be93e8b862e351ce0f1d1eb29e..f97ddd5b114c2508904441216934dc5c4021f3d0 100755 (executable)
--- 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 17c2aae0c69ec108a0a00efda45bac22b097740d..42e365608518f457aeb5290d61c5833c231daff8 100755 (executable)
--- 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 9bc0b4a159f20654c5a145777b329577c32e94a6..619f1e4eece1388052c28a5952d41eccfca97652 100755 (executable)
--- 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 e06b48364a7a20854f1a3753d01380744705f30a..71fa2a2cd71d7d26c6892a88e72a75ddbe8785e6 100755 (executable)
--- 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 49df3244f284e9f162452ef5b110d3d05106b473..4b692e8859c6c33d208a36c3c67b5eb4c8405d44 100755 (executable)
--- 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 14f331c7f4f0e2e9bfd98c70f518cb23414c9f64..ad6c95ef69c560fc47d42a715cfc9494d906a6f7 100755 (executable)
--- 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 845128a068cc03f704b0df4e65848d9612a1dfff..459de059272b036e65876f3f67ad9b085360612d 100755 (executable)
--- 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 9a08f91ed1cc9ac4a0cc41f41ddf43fea54147df..673851353c3a985a05e3fc947879014cb2c36fa9 100755 (executable)
--- 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 3b71c50f09ca37ba633cb4decda5ee52a9ee3065..bb9e1faac03383bc6a3e577e532d2268d7245f06 100755 (executable)
--- 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 aa3861b8b428d463cfa594862f7e6a07c0b34722..553a766f5ce15c06532a8f2d63c68d67578d3a5f 100755 (executable)
--- 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 2809106cb4d0d1e279730e0c22476ccc01d21c65..1d0c2d2c2fbfed79ff3d0d01fb44ffb1d532dba9 100755 (executable)
--- 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 00622baedf59b2723e70e7ee6aa34fc89ba58543..4cbb0e054fbb9684a54fc1913ac364f8e37ac9ce 100755 (executable)
--- 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 19e53b640a906c3e42b64ac19f57bcf1eda90d1e..acd8f6c298930a99eb66bdf2d4804511cbb92330 100755 (executable)
--- 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 fabbcb3127169b3aa26a786639428b4f37b78ef4..94d107dfeb48d91eccecf4977a6c6513e8ba02d7 100755 (executable)
--- 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 d1d4b69e1e3104ff92e64698b0ebf4ad8b58194a..78e4c26b2168d936764581db1a48e26fb20a7678 100755 (executable)
--- 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 b745d7ab5476fa61f93d55601bfdd4b18e1ebd22..b434d801cb3b5d35cbf6ae42cd3871a9f74bd1d4 100755 (executable)
--- 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 91907680f4de91ed326d28983a1c975a9ff21266..68fb64d35943ddb76f9ff5c32223721bb5b3410d 100755 (executable)
--- 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 3566d16bf26f68fd4ff12328eacd2dc4aee7e108..3b8face07daf8c4a3de1bdea0479ff1bcbce24d3 100755 (executable)
--- 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 5c9c562cedebe0f23f345634cd3df19d8dc7cccd..c01918978802347b3486cc562dd7765fd5e60741 100755 (executable)
--- a/tests/msgfmt-10
+++ b/tests/msgfmt-10
@@ -38,8 +38,8 @@ msgstr[1] "%d yarars
 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 f567aad029dd3395ba28f8e653759584e0e6d223..56958358e8a03ddd6ef817ee79359fff07fae30b 100755 (executable)
--- 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 04713de30be1a42d1c04ffac726001237f37e13d..b0b2ed7f99458034fe28570134533468c42e1a69 100755 (executable)
--- 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 646c4e6b24402aee91767a80bc07674cc17cb28f..93d49977b7547f10069c12738687279237442708 100755 (executable)
--- 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 5024cb8a03fe1feeacdd2f2bd4dfdb899dfcfc37..5e116d69d97dd270faca93487d66d5190e178d8e 100755 (executable)
--- 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 b10c3ffb5968017c9b16ff528d08dc656adddfb3..424455cb74e76d59400b75e2aaffe2f21466b7a9 100755 (executable)
--- 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 2cb996d4afea719be9fe400f6c79876790787388..3701b7caa7be79f41f5b758f3310dc9fbacfc64d 100755 (executable)
--- 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 b7ac53246633fb3b173c0e62d90450f6ea2f96b4..0d80f56dc2977ad6b434fd64442db8d279ced302 100755 (executable)
--- 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 d88c407002883fb614a543a4b637373f24aafffc..d33abbce77454d5fff404cd47662528fb0d52106 100755 (executable)
--- 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 fe7bf6b7b2ea8ca94d54e4abb063ac462bff86d3..73fabfb3cdc5f164ae038056d265fd083770e076 100755 (executable)
--- 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 20d3f5326997b74061077544cfe22a5511341b21..bbf434f9405b67a47658d8b62cad14cd8d6e8cfd 100755 (executable)
--- 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 3ffca40db7eab6b0479f65937b83e2b88227c2aa..ae77e0541ac4eb6e684c1e82d8881cd3e0ab0eba 100755 (executable)
--- 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 89bd4be9a26320d994c337a617bc67339518a8c1..fba505235ece94b5b27975183258d95c218b2f19 100755 (executable)
--- 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 d4d583f063d2ca1dff6bbdbb9d3d6f0cc0db49f8..9670bc162030f0462e755d3c70389fa56c8a0733 100755 (executable)
--- 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 2b999c0a1e5ccd808b579a4ad728ffc40968fa84..a94652dd533041dcd122d307c9a4d7ecc9762c80 100755 (executable)
--- 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 d729cb53f4381bf354817e5ea08d4982063feee3..48e697e6f2a364cb2744758db8c3778bc5f93943 100755 (executable)
--- 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 662913c0a217e55ddd240f8ea3487f354f585352..70113b4ac233303d81bd0c230bbbf792a814d2e4 100755 (executable)
--- 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 6810492aa292dcab683a2a3658229b05a847649e..2cc6a315f5b9bc7d3c99fb0b9ba911203580bd0a 100755 (executable)
--- 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 4cf48d35c2eec420074d5747fa49f86dc540c402..abd6cee74bb6c3c8b02639ceb5c34286cc4b9612 100755 (executable)
--- 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 883fc643b97e368a24fa402f96a1f4b9e5cede6f..6b5b4cce864dd964421ec2e94bc4e0620847bccd 100755 (executable)
--- 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 35e3a2e531ebe66629f012394b3bb1aa6ba7becf..42a046aeb76649788b485b2cb2a4649ce64d0097 100755 (executable)
--- 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 9900a54cd85d6b00b7d29bafdc387bd7f08fe4f6..bc9f9312152efb898c5105153c0e2950ae152c00 100755 (executable)
--- 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 d9b7346e4beba59e5015ba430c6bc4c8d87ba004..43a2ddb259a95565c6461435be95087789e6a37d 100755 (executable)
--- 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 142b27e32e8def7734875df4a76d383e15b213ae..d245493ef6b75073cb0d39fec36e5aaad17df899 100755 (executable)
--- 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 611a665cfbdc589a8b5db84b64ec31ae17b7a443..1bdff4460ca74ffbf63912070c1d82723871dfc3 100755 (executable)
--- 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 5e8f13ab030c24ea899bc80f31dfe472eaa2b321..2e340dc64e757a9209259e658d77f31830ce3269 100755 (executable)
--- 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 840463a2f53f7b3a2ca007c5ee16fef87f3b99bb..8ef4b359da9422c641b122f360679ac18b7e0ff8 100755 (executable)
--- 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 c466cadb20274032906ec89d4df9d91ce8034b5e..17be1a0aff1103d64c05f9e50a5c3d3ab5fd207c 100755 (executable)
--- 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 d6e7cd4437f7ed4e18ee7249b79c37052519ea32..5b4a9cd49e97a47bb6e5597198488cce9cad34a7 100755 (executable)
--- 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 129cda786be560a942204bb0fb2e6d5bb4a1d8f1..8b4a562852506e74dac96b037aae2ef528c40e6c 100755 (executable)
--- 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 b0d08e456c64ee27d597ee409204fc31c79a30eb..f40a6abdae88d6da372931470a3bdfa827b1c4c3 100755 (executable)
--- 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 7d927c6aeb520db2b521207e1ca6020b2f438664..dd059b058ebec7f7db8f5ba2613976f3d9d99cd0 100755 (executable)
--- 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 596a47e084dfffcca05230ea21e8a712500cb732..0d81ede37f8622c710ad0ed3558c021e76c0b361 100755 (executable)
--- 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 478cbd2ef7ba9d8199935a9535f97cebb376ba6a..ff6dbc6ed84609d78c3a6cbbd0c121d63f416144 100755 (executable)
--- 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 6ecf042c57d37884381b23fa4ebdda743b88833e..a0d1371f0551e87752bef9839458e84a02e4cfe3 100755 (executable)
--- 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 9d0956f634d732caf232d22d54909da383f4aa6f..87fd468c6bfbe8c5c85fc16973444f23fd80fb3a 100755 (executable)
--- 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 a5a9c83fad1f7c6728f968f4e63d4269c36e49e1..a0498b526d2ea6415093c4dd8d1bfbe068c3aa54 100755 (executable)
--- 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 98e7a4ab7c867587257fd591d0ae8b45719ed070..b071455aeef479b9065ceceb8bec12790329bfac 100755 (executable)
--- 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 8a8e47761182112630ea5a9205043cbe3693f5f0..34fd2df870029b13fa730502e80fe52a70f92ec4 100755 (executable)
--- 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 4d5f63bbacf0cae528f3abc464725694411e35a6..166a2de5a0e6d1addca2849debc29a366c61b1d0 100755 (executable)
--- 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 7d1278e235a3fe4ca558c0714ddc6b44f0be2ed3..830e9cd5ba8fdd05849ba6936b0e49f6fc3ee39e 100755 (executable)
--- 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 6994e57c787deb4bdba0d61f1f9df5c00490e43d..209ab10a8c82b73911b498a35d1854be5936d408 100755 (executable)
--- 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 153e666f2d4d7e702357fae12abde5dd5d3cb10a..a5a5b3476e822913ef59b34dceef3c0077f01784 100755 (executable)
--- 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 77b9ec01fc6e69ef4dee75aa1cceeac2344e49ce..b3e7a7fa6532cdb1db46b9b1e5b0b58d16c5c539 100755 (executable)
--- 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 e0840000dad6184f9bcdbf8f071424f678ab1825..5a23f2e9ff6d6ed8268721567a9015358bdf76fd 100755 (executable)
--- 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