diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-14 13:13:58 +0200 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 14:24:38 +0200 |
commit | 6e713425a0dcede167924e7691e95ab5e54e399c (patch) | |
tree | 4ce8cbe368733dc0049b5b690b13e0e3123d7a3a /t/add-missing.tap | |
parent | d0dc448517d3a61ba55e62dd76b9a42b68bef8f8 (diff) | |
download | automake-6e713425a0dcede167924e7691e95ab5e54e399c.tar.gz |
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 <stefano.lattarini@gmail.com>
Diffstat (limited to 't/add-missing.tap')
-rwxr-xr-x | t/add-missing.tap | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/add-missing.tap b/t/add-missing.tap index 39b7ae7f6..6f16a0ae6 100755 --- a/t/add-missing.tap +++ b/t/add-missing.tap @@ -25,7 +25,7 @@ am_create_testdir=empty plan_ "later" build_aux=build-aux -ocwd=`pwd` || fatal_ "cannot get current working directory" +ocwd=$(pwd) || fatal_ "cannot get current working directory" # Try to improve readability of displayed diffs. if diff -u /dev/null /dev/null; then @@ -79,7 +79,7 @@ check_count=0 check_ () { set +x # Temporary disable shell traces to remove noise from log files. - incr_ check_count + check_count=$(($check_count + 1)) echo check count: $check_count override=no run_aclocal=no @@ -280,7 +280,7 @@ END # For config.guess and config.sub. for mach in build host target system; do - MACH=`echo "$mach" | LC_ALL=C tr '[a-z]' '[A-Z]'` + MACH=$(echo "$mach" | LC_ALL=C tr '[a-z]' '[A-Z]') check_ <<END == Name == cfg-$mach |