diff options
| author | Alexandre Duret-Lutz <adl@gnu.org> | 2005-02-06 12:33:32 +0000 |
|---|---|---|
| committer | Alexandre Duret-Lutz <adl@gnu.org> | 2005-02-06 12:33:32 +0000 |
| commit | 16ca57539ea8482c6449cf769d36d52778c8553c (patch) | |
| tree | 3e177dfbcfc4d765c64df9791050e6f40d975fc4 /tests/acloca18.test | |
| parent | fdfebffaf7814f4b7db38d0740c057daa67e150f (diff) | |
| download | automake-16ca57539ea8482c6449cf769d36d52778c8553c.tar.gz | |
* aclocal.in (usage, parse_arguments): New --dry-run and --diff
options.
(install_file, write_aclocal): Honor --dry-run and --diff.
* doc/automake.texi (aclocal options): Document --dry-run and --diff.
(Serials): Mention --diff.
* lib/Automake/FileUtils.pm (handle_exec_errors): Accept an
$expected_exit_code argument.
(xsystem): Take a list of arguments, not a string.
* tests/acloca18.test: Use --dry-run and --diff.
Suggested by Paul Eggert.
Diffstat (limited to 'tests/acloca18.test')
| -rwxr-xr-x | tests/acloca18.test | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/acloca18.test b/tests/acloca18.test index 362d8bab1..f6f732c81 100755 --- a/tests/acloca18.test +++ b/tests/acloca18.test @@ -75,6 +75,13 @@ grep macro23 foo ACLOCAL_TESTSUITE_FLAGS='-I 4 -I 1 -I 2 -I 3' rm -f foo +$ACLOCAL --install --dry-run +$AUTOCONF +./configure +grep macro12 foo +grep macro23 foo + +rm -f foo $ACLOCAL --install $AUTOCONF ./configure @@ -93,3 +100,15 @@ $AUTOCONF ./configure grep macro14 foo grep macro21 foo + + +mkdir dirlist-test +cat >dirlist-test/m1.m4 <<EOF +#serial 456 +AC_DEFUN([AM_MACRO1], [echo macro1d >> foo]) +AC_DEFUN([AM_MACRO2], [echo macro2d >> foo]) +EOF +rm -f foo +$ACLOCAL --diff=diff >output +cat output +grep '#serial 456' output |