diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 14:52:21 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-22 15:01:15 +0200 |
| commit | 062aeb245e68208dccb3ccc9b28e100a81dbc79b (patch) | |
| tree | 916ca4ae612169af518ca3c4b81ceb2e94567d6d /t/subst3.sh | |
| parent | 488de31efa525d864ad56cd023f3b33c83101088 (diff) | |
| parent | 3a1a8c6d3cb46bfe65b715ddd8a3e0d7e27e1bf7 (diff) | |
| download | automake-062aeb245e68208dccb3ccc9b28e100a81dbc79b.tar.gz | |
Merge branch 'maint'
* maint:
tests: automatic re-execution works for non-POSIX shells too
tests: use more POSIX shell features our test scripts
+ Extra non-trivial edits:
* t/ax/test-init.sh: Apply the diffs between past versions of
'defs' in maint and in master; i.e., remove handling of $required
entries 'texi2dvi-o' and 'makeinfo-html', and adjust to the fact
that the parallel testsuite harness is now the default.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/subst3.sh')
| -rwxr-xr-x | t/subst3.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/subst3.sh b/t/subst3.sh index cc81063e3..f20133614 100755 --- a/t/subst3.sh +++ b/t/subst3.sh @@ -23,7 +23,7 @@ cat >> configure.ac <<'EOF' AC_PROG_CC AM_PROG_AR AC_PROG_RANLIB -if test -n "$doit"; then +if test x"$doit" = x"yes"; then AC_SUBST([basehdr], [sub/base.h]) AC_SUBST([nobasehdr], [sub/nobase.h]) AC_SUBST([basedata], [sub/base.dat]) @@ -139,7 +139,7 @@ rm -f install-sh $ACLOCAL $AUTOCONF $AUTOMAKE -a --copy -./configure --prefix "`pwd`/inst" --program-prefix=p doit=yes +./configure --prefix "$(pwd)/inst" --program-prefix=p doit=yes $MAKE $MAKE test-install-data @@ -147,9 +147,9 @@ $MAKE test-install-exec $MAKE uninstall $MAKE clean -test `find inst/foo -type f -print | wc -l` = 0 +test $(find inst/foo -type f -print | wc -l) -eq 0 -./configure --prefix "`pwd`/inst" --program-prefix=p doit= +./configure --prefix "$(pwd)/inst" --program-prefix=p doit=no $MAKE $MAKE test-install-nothing-data @@ -162,14 +162,14 @@ $MAKE uninstall $MAKE distclean mkdir build cd build -../configure --prefix "`pwd`/inst" --program-prefix=p doit=yes +../configure --prefix "$(pwd)/inst" --program-prefix=p doit=yes $MAKE $MAKE test-install-data $MAKE test-install-exec $MAKE uninstall -test `find inst/foo -type f -print | wc -l` = 0 +test $(find inst/foo -type f -print | wc -l) -eq 0 -../configure --prefix "`pwd`/inst" --program-prefix=p doit= +../configure --prefix "$(pwd)/inst" --program-prefix=p doit=no $MAKE $MAKE test-install-nothing-data $MAKE test-install-nothing-exec |