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/tap-log.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/tap-log.sh')
| -rwxr-xr-x | t/tap-log.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/tap-log.sh b/t/tap-log.sh index 5faf83894..92d63ec01 100755 --- a/t/tap-log.sh +++ b/t/tap-log.sh @@ -103,8 +103,8 @@ for result in xfail fail xpass skip error; do $FGREP "$pmarker $result $pmarker" my.log || st=1 $FGREP "$cmarker $result $cmarker" my.log || st=1 done -test `$FGREP -c "$pmarker" my.log` -eq 5 -test `$FGREP -c "$cmarker" my.log` -eq 5 +test $($FGREP -c "$pmarker" my.log) -eq 5 +test $($FGREP -c "$cmarker" my.log) -eq 5 # Passed test scripts shouldn't be mentioned in the global log. $EGREP '(^pass|[^x]pass)\.test' my.log && Exit 1 @@ -139,8 +139,8 @@ test ! -f my.log test ! -f test-suite.log # Check that VERBOSE causes the global testsuite log to be # emitted on stdout. -out=`cat stdout` -log=`cat global.log` +out=$(cat stdout) +log=$(cat global.log) case $out in *"$log"*) ;; *) Exit 1;; esac touch error2.log test-suite.log my.log |