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/aclocal-print-acdir.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/aclocal-print-acdir.sh')
-rwxr-xr-x | t/aclocal-print-acdir.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh index 53ad5561e..6e8aa0983 100755 --- a/t/aclocal-print-acdir.sh +++ b/t/aclocal-print-acdir.sh @@ -20,12 +20,12 @@ am_create_testdir=empty . ./defs || Exit 1 $ACLOCAL --print-ac-dir -test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir" +test "$($ACLOCAL --print-ac-dir)" = "$am_system_acdir" $ACLOCAL --system-acdir /bar --print-ac-dir -test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar +test "$($ACLOCAL --system-acdir /bar --print-ac-dir)" = /bar $ACLOCAL --automake-acdir /bar --print-ac-dir -test "`$ACLOCAL --automake-acdir /bar --print-ac-dir`" = "$am_system_acdir" +test "$($ACLOCAL --automake-acdir /bar --print-ac-dir)" = "$am_system_acdir" : |