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/mkinst3.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/mkinst3.sh')
| -rwxr-xr-x | t/mkinst3.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/t/mkinst3.sh b/t/mkinst3.sh index fbe01c652..08cfb76e8 100755 --- a/t/mkinst3.sh +++ b/t/mkinst3.sh @@ -19,6 +19,8 @@ am_create_testdir=empty . ./defs || Exit 1 +cwd=$(pwd) || fatal_ "getting current working directory" + # Make sure the directory we will create can be created... mkdir '~a b' && mkdir '~a b/-x y' \ || skip_ "directory names with spaces and metacharacters not accepted" @@ -49,10 +51,9 @@ exec mkdir "$@" EOF chmod +x bin/mkdir -AM_PATH=$PATH -export AM_PATH -PATH=`pwd`/bin$PATH_SEPARATOR$PATH -export PATH + +AM_PATH=$PATH; export AM_PATH +PATH=$cwd/bin$PATH_SEPARATOR$PATH; export PATH # Test mkinstalldirs without mkdir -p. @@ -60,6 +61,8 @@ export PATH test -d '~a b/-x y' rm -rf '~a b' -./mkinstalldirs "`pwd`///~a b//-x y" -test -d "`pwd`/~a b/-x y" +./mkinstalldirs "$cwd///~a b//-x y" +test -d "$cwd/~a b/-x y" rm -rf '~a b' + +: |