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/test-driver-create-log-dir.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/test-driver-create-log-dir.sh')
| -rwxr-xr-x | t/test-driver-create-log-dir.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/test-driver-create-log-dir.sh b/t/test-driver-create-log-dir.sh index dc8e6811f..3b0839708 100755 --- a/t/test-driver-create-log-dir.sh +++ b/t/test-driver-create-log-dir.sh @@ -44,8 +44,8 @@ check-local: $(TEST_SUITE_LOG) test -f sub1/baz.trs END -cat > checkdir-driver <<'END' -#! /bin/sh +echo "#!$AM_TEST_RUNNER_SHELL" > checkdir-driver +cat >> checkdir-driver <<'END' set -e; set -u while test $# -gt 0; do case $1 in @@ -60,8 +60,8 @@ done echo "log: $log_file" # For debugging. echo "trs: $trs_file" # Ditto. case $log_file in */*);; *) exit 1;; esac -dir_log=`expr "$log_file" : '\(.*\)/[^/]*'` -dir_trs=`expr "$trs_file" : '\(.*\)/[^/]*'` +dir_log=${log_file%/*} +dir_trs=${trs_file%/*} echo "dir_log: $dir_log" # For debugging. echo "dir_trs: $dir_trs" # Likewise. test x"$dir_trs" = x"$dir_log" || exit 1 |