tests: avoid failing command substitution in errexit mode.

* tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
a command substitution with a nonzero exit status, that causes
IRIX and Tru64/OSF sh to fail the whole test.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 79b7d393017f0056ae458c3ddc48d3fbe853ed9e..4df0806c4f344d010d0c0834969d4eca7aa7458a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       tests: avoid failing command substitution in errexit mode.
+       * tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
+       a command substitution with a nonzero exit status, that causes
+       IRIX and Tru64/OSF sh to fail the whole test.
+
 2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Coverage and minor fixes for variable typo detection.

diff --git a/tests/vartypo2.test b/tests/vartypo2.test
index 5b8740416782894f1cecefdae5b474efcaa75a23..3519846d20e1e570d4dce3053d39f9897deec6cf 100755 (executable)
--- a/tests/vartypo2.test
+++ b/tests/vartypo2.test
@@ -55,7 +55,7 @@ AUTOMAKE_fails --add-missing
 # Makefile.am:5: library has `libfoo_la' as canonical name (possible typo)
 
 
-test -z "`grep 'as canonical' stderr | grep -v ' .libfoo_la. '`"
+grep 'as canonical' stderr | grep -v ' .libfoo_la. ' && Exit 1
 test `grep 'variable.*is defined but' stderr | wc -l` = 6
 
 # If we add a global -Wnone, all warnings should disappear.

diff --git a/tests/vartypos.test b/tests/vartypos.test
index 73e7c553cdf2653156b0d68d2291e15a47871247..cf6719b5f8eab30f30a2683166ef380f46f690ac 100755 (executable)
--- a/tests/vartypos.test
+++ b/tests/vartypos.test
@@ -73,7 +73,8 @@ AUTOMAKE_fails
 # Makefile.am:13: warning: variable `libfoo_a_DEPENDENCIES' is defined but no program or
 # Makefile.am:13: library has `libfoo_a' as canonical name (possible typo)
 
-test -z "`grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v ' .libfoo_a. '`"
+grep 'as canonical' stderr | grep -v ' .foo. ' | grep -v ' .libfoo_a. ' \
+  && Exit 1
 test `grep 'variable.*is defined but' stderr | wc -l` = 13
 
 # If we add a global -Wnone, all warnings should disappear.