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/transform2.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/transform2.sh')
| -rwxr-xr-x | t/transform2.sh | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/t/transform2.sh b/t/transform2.sh index a4a94f7a9..357e6b7e1 100755 --- a/t/transform2.sh +++ b/t/transform2.sh @@ -66,17 +66,20 @@ $ACLOCAL $AUTOCONF $AUTOMAKE -./configure --program-transform-name='s/[12]//' --prefix "`pwd`/inst" --mandir "`pwd`/inst/man" +cwd=$(pwd) || fatal_ "getting current working directory" + +./configure --program-transform-name='s/[12]//' --prefix "$cwd/inst" \ + --mandir "$cwd/inst/man" $MAKE $MAKE test-install $MAKE uninstall -test `find inst -type f -print | wc -l` = 0 +test $(find inst -type f -print | wc -l) -eq 0 # Also squash all file types in question. # On newer Cygwin versions, that won't work, likely due to overly # aggressive appending of '.exe' suffix when copying/renaming Windows -# executables). So let's skip this part of the test if we detect the +# executables. So let's skip this part of the test if we detect the # faulty heuristic is present. See also: # <http://lists.gnu.org/archive/html/automake-patches/2010-08/msg00153.html> # <http://thread.gmane.org/gmane.os.cygwin/119380> @@ -86,10 +89,11 @@ chmod a+x foo bar.exe cp foo bar && cmp foo bar \ || skip_ "your Cygwin is too aggressive in tweaking '.exe' suffixes" -./configure --program-transform-name='s/.*/foo/' --prefix "`pwd`/inst" --mandir "`pwd`/inst/man" +./configure --program-transform-name='s/.*/foo/' --prefix "$cwd/inst" \ + --mandir "$cwd/inst/man" $MAKE $MAKE test-install-foo $MAKE uninstall -test `find inst -type f -print | wc -l` = 0 +test $(find inst -type f -print | wc -l) -eq 0 : |