From: Ralf Wildenhues Date: Sun, 16 Jan 2011 13:17:38 +0000 (+0100) Subject: tests: avoid failing command substitution in errexit mode. X-Git-Tag: ng-0.5a~250^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef46fa2f5ad4152075892ec4f6951bf2c918a8b0;p=thirdparty%2Fautomake.git 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 --- diff --git a/ChangeLog b/ChangeLog index 79b7d3930..4df0806c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-01-16 Ralf Wildenhues + + 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 Coverage and minor fixes for variable typo detection. diff --git a/tests/vartypo2.test b/tests/vartypo2.test index 5b8740416..3519846d2 100755 --- 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 73e7c553c..cf6719b5f 100755 --- 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.