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/subobj-clean-pr10697.sh | |
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/subobj-clean-pr10697.sh')
-rwxr-xr-x | t/subobj-clean-pr10697.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh index 69abc107b..a545658f7 100755 --- a/t/subobj-clean-pr10697.sh +++ b/t/subobj-clean-pr10697.sh @@ -34,21 +34,19 @@ END echo "OBJEXT='@OBJEXT@'" > get-objext.in oPATH=$PATH -ocwd=`pwd` || fatal_ "getting current working directory" +ocwd=$(pwd) || fatal_ "getting current working directory" # An rm(1) wrapper that fails when invoked too many times. mkdir rm-wrap max_rm_invocations=3 count_file=$ocwd/rm-wrap/count cat > rm-wrap/rm <<END -#!/bin/sh -set -e -count=\`cat '$count_file'\` -count=\`expr \$count + 1\` -if test \$count -le $max_rm_invocations; then :; else +#!$AM_TEST_RUNNER_SHELL -e +count=\$((\$(cat '$count_file') + 1)) +test \$count -le $max_rm_invocations || { echo "rm invoked more than $max_rm_invocations times" >&2 exit 1 -fi +} echo "\$count" > '$count_file' PATH='$oPATH'; export PATH exec rm "\$@" |