diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-08-04 21:04:05 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-08-05 06:21:09 +0200 |
| commit | c40eb4bc723e3b0131f0d05d86484d358ab0dd7e (patch) | |
| tree | 41136a773a0c6542e212371051dd6c3bf6afdef4 /tests/torture.at | |
| parent | a11cc13e77e96cf40b6060dd8384a00ff110b846 (diff) | |
| download | autoconf-c40eb4bc723e3b0131f0d05d86484d358ab0dd7e.tar.gz | |
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>
Diffstat (limited to 'tests/torture.at')
| -rw-r--r-- | tests/torture.at | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/torture.at b/tests/torture.at index ff059284..97cb5c6c 100644 --- a/tests/torture.at +++ b/tests/torture.at @@ -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]) |