From 6e713425a0dcede167924e7691e95ab5e54e399c Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 14 Jun 2012 13:13:58 +0200 Subject: tests: use more POSIX shell features our test scripts Since commit 'v1.12-36-g2d68fd9' of 2012-05-07, "configure: search a sturdy POSIX shell to be used in the testsuite", the shell running our test script is assured to be a POSIX-conforming shell, so we can use the more modern and flexible idioms and features that we couldn't use when we also aimed at compatibility with non-POSIX Bourne shells, like Solaris /bin/sh. * t/README: Suggest to use POSIX shell features liberally in test cases, with possible exception of Makefile recipes and configure shell code. * Several tests: Adjust to use more POSIX shell features; e.g., $(...) rather than `...`, $((...)) rather than `expr ...`, "if ! CMD; then ..." instead of "if CMD; then :; else ...", and so on. In several places, when using the 'test' built-in, prefer '-eq' over '=' for numeric comparisons, and prefer "grep -c PATTERN FILE" over "grep PATTERN FILE | wc -l". Throw in other low-hanging easy improvements and fixlets while we are at it. * t/ax/depcomp.sh, t/ax/tap-summary-aux.sh, t/ax/tap-functions.sh, defs, defs-static.in: Likewise. Signed-off-by: Stefano Lattarini --- t/werror4.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 't/werror4.sh') diff --git a/t/werror4.sh b/t/werror4.sh index b2f3f6a78..9a9a1665c 100755 --- a/t/werror4.sh +++ b/t/werror4.sh @@ -40,7 +40,7 @@ $ACLOCAL AUTOMAKE_fails -Wno-error grep 'VAR multiply defined' stderr grep 'SUB multiply defined' stderr -test `grep -c 'warnings are treated as errors' stderr` -eq 1 +test $(grep -c 'warnings are treated as errors' stderr) -eq 1 sed '/AUTOMAKE_OPTIONS/d' sub/Makefile.am > t mv -f t sub/Makefile.am @@ -48,7 +48,7 @@ mv -f t sub/Makefile.am AUTOMAKE_fails -Wno-error grep 'VAR multiply defined' stderr grep 'SUB multiply defined' stderr -test `grep -c 'warnings are treated as errors' stderr` -eq 1 +test $(grep -c 'warnings are treated as errors' stderr) -eq 1 sed '/AUTOMAKE_OPTIONS/d' Makefile.am > t mv -f t Makefile.am @@ -56,7 +56,7 @@ mv -f t Makefile.am AUTOMAKE_fails -Werror grep 'VAR multiply defined' stderr grep 'SUB multiply defined' stderr -test `grep -c 'warnings are treated as errors' stderr` -eq 1 +test $(grep -c 'warnings are treated as errors' stderr) -eq 1 AUTOMAKE_run -Wno-error grep 'VAR multiply defined' stderr -- cgit v1.2.1