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/vtexi4.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/vtexi4.sh')
| -rwxr-xr-x | t/vtexi4.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/t/vtexi4.sh b/t/vtexi4.sh index 6038444b5..27b0636f7 100755 --- a/t/vtexi4.sh +++ b/t/vtexi4.sh @@ -24,16 +24,12 @@ required='makeinfo tex texi2dvi-o' . ./defs || Exit 1 -case `LC_ALL=C date '+%u'` in - [1-7]) date_is_posix=:;; - *) date_is_posx=false;; -esac -$date_is_posix \ - && day=`LC_ALL=C date '+%d'` && test -n "$day" \ - && month=`LC_ALL=C date '+%B'` && test -n "$month" \ - && year=`LC_ALL=C date '+%Y'`&& test -n "$year" \ +test $(LC_ALL=C date '+%u') -gt 0 && test $(LC_ALL=C date '+%u') -lt 8 \ + && day=$(LC_ALL=C date '+%d') && test -n "$day" \ + && month=$(LC_ALL=C date '+%B') && test -n "$month" \ + && year=$(LC_ALL=C date '+%Y') && test -n "$year" \ || skip_ "'date' is not POSIX-compliant enough" -day=`echo "$day" | sed 's/^0//'` +day=$(echo "$day" | sed 's/^0//') (echo 'x' | grep x) \ || skip_ "grep doesn't work on input that is not pure text" |