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/instspc.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/instspc.tap')
-rwxr-xr-x | t/instspc.tap | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/instspc.tap b/t/instspc.tap index cbe0fdfdd..a6f776376 100755 --- a/t/instspc.tap +++ b/t/instspc.tap @@ -219,8 +219,8 @@ if test $# -gt 0; then esac done # We need to determine the TAP plan adaptively. - n=`for t in $test_names_list; do echo $t; done | wc -l` - plan_ `expr $n '*' 2` # Two tests per "problematic string". + n=$(for t in $test_names_list; do echo $t; done | wc -l) + plan_ $(($n * 2)) # Two tests per "problematic string". unset n else test_names_list=$all_test_names_list @@ -228,7 +228,7 @@ else plan_ 94 fi -ocwd=`pwd` || fatal_ "cannot get current working directory" +ocwd=$(pwd) || fatal_ "getting current working directory" create_input_data @@ -324,10 +324,10 @@ for test_name in $test_names_list; do # the test directory not to be removed when the script terminates. if not am_keeping_testdirs && test "$r" = ok; then rm_rf_ "$build" "$dest" || fatal_ "removing temporary subdirectory" - else - : For lesser shells with broken 'set -e'. fi + : For shells with busted 'set -e'. + done # $instspc_action done # $test_name |