Fix testsuite failure due to bugs in third-party aclocal macros.

* tests/torture.at (Non-literal AC_CONFIG_SUBDIRS): Create a
hand-written aclocal.m4 file, so the -Werror test doesn't fail
over aclocal warnings about errors in third-party macro files.
Simplify test accordingly, calling autoreconf throughout.
Report by Bob Friesenhahn.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
This commit is contained in:
Ralf Wildenhues 2010-08-04 21:04:05 +02:00
parent a11cc13e77
commit c40eb4bc72
2 changed files with 13 additions and 6 deletions

View File

@ -1,5 +1,12 @@
2010-08-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Fix testsuite failure due to bugs in third-party aclocal macros.
* tests/torture.at (Non-literal AC_CONFIG_SUBDIRS): Create a
hand-written aclocal.m4 file, so the -Werror test doesn't fail
over aclocal warnings about errors in third-party macro files.
Simplify test accordingly, calling autoreconf throughout.
Report by Bob Friesenhahn.
Fix AC_LANG_SOURCE and AC_LANG_PROGRAM tests.
* tests/compile.at (AC_LANG_SOURCE example)
(AC_LANG_PROGRAM example): Fix broken sed script for

View File

@ -1708,9 +1708,6 @@ AT_CLEANUP
AT_SETUP([Non-literal AC_CONFIG_SUBDIRS])
AT_KEYWORDS([autoreconf])
# We use aclocal (via autoreconf).
AT_CHECK([aclocal --version || exit 77], [], [ignore], [ignore])
AT_DATA([install-sh], [])
AT_DATA([configure.in],
[[AC_INIT(GNU Outer, 1.0)
@ -1724,6 +1721,11 @@ AC_CONFIG_SUBDIRS([$my_subdirs])
AC_OUTPUT
]])
# Hand-written aclocal.m4, so we don't invoke `aclocal -Werror' which
# could barf over warnings in third-party macro files, or fail over
# warnings with older aclocal which didn't yet understand -W*.
AT_DATA([aclocal.m4])
AS_MKDIR_P([foo])
AT_DATA([foo/configure],
@ -1738,9 +1740,7 @@ AT_CHECK([autoreconf -Werror -v], [1], [ignore], [stderr])
AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore])
AT_CHECK([autoreconf -v], [0], [ignore], [stderr])
AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore])
# We cannot assume aclocal won't warn (aclocal-1.9 does not understand -W*
# options), so check autoconf only.
AT_CHECK([autoconf --force -Wno-syntax], 0, [ignore], [stderr])
AT_CHECK([autoreconf -v --force -Wno-syntax], 0, [ignore], [stderr])
AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1])
AT_CHECK([./configure $configure_options], [0], [ignore])