diff options
author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:09:39 +0100 |
---|---|---|
committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2014-12-19 13:27:34 +0100 |
commit | 78964087335e66e9ae4ad3899bd545b770e30581 (patch) | |
tree | c7d54a7a97e2bdde966d14fbb3c1c176a341e306 /t | |
parent | 3f9fc60baa2e7f9324e17a26f592e92148b7117c (diff) | |
parent | caba6a20804021ab607b40ccefece4e77ef72a77 (diff) | |
download | automake-78964087335e66e9ae4ad3899bd545b770e30581.tar.gz |
Merge branch 'micro' into minor
* micro:
sync: update third-part files from upstream
Make sure AM_INIT_AUTOMAKE has a trailing newline
dist: adjust warning messages about shar and tarZ deprecation
docs: improve description of ${PACKAGE}, ${VERSION}, and similar variables
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't')
-rw-r--r-- | t/aminit-trailing-dnl-comment-pr16841.sh | 44 | ||||
-rw-r--r-- | t/list-of-tests.mk | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/t/aminit-trailing-dnl-comment-pr16841.sh b/t/aminit-trailing-dnl-comment-pr16841.sh new file mode 100644 index 000000000..fc73ebead --- /dev/null +++ b/t/aminit-trailing-dnl-comment-pr16841.sh @@ -0,0 +1,44 @@ +#! /bin/sh +# Copyright (C) 2014 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Check that a trailing 'dnl' m4 comment automake after the +# AM_INIT_AUTOMAKE invocation doesn't produce a syntactically +# invalid configure script. This used to be the case until +# automake 1.13, but we broke that in automake 1.14. See +# automake bug#16841. + +am_create_testdir=empty +. test-init.sh + +cat > configure.ac <<END +AC_INIT([test-pr16841], [1.0]) +AM_INIT_AUTOMAKE([1.14 -Werror]) dnl Some comment +echo "OK OK OK" +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT +END + +: > Makefile.am + +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +./configure >stdout || { cat stdout; exit 1; } +cat stdout +grep '^OK OK OK$' stdout + +: diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index 8d458f55e..327c60eff 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -135,6 +135,7 @@ t/amhello-cflags.sh \ t/amhello-cross-compile.sh \ t/amhello-binpkg.sh \ t/aminit-moreargs-deprecation.sh \ +t/aminit-trailing-dnl-comment-pr16841.sh \ t/amassign.sh \ t/am-config-header.sh \ t/am-prog-cc-stdc.sh \ |