On Wed, 4 Aug 2010, Ralf Wildenhues wrote:

This is a testsuite bug: it should not trip over a quoting bug in some
third-party macro file you have installed.  OK to fix Autoconf as below?

But please do fix that xmms.m4 file to not have underquoted macros.

I do see some quoting in the xmms macro but it makes me bleary-eyed and I hesitate to try fixing it without breaking it. If it really causes problems, I could simply delete the file.

As for the veracity of your fix, I suspect that you are better equipped to know what is right than I am.

Bob


Thanks,
Ralf

   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.

diff --git a/tests/torture.at b/tests/torture.at
index ff05928..97cb5c6 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])


--
Bob Friesenhahn
bfrie...@simple.dallas.tx.us, http://www.simplesystems.org/users/bfriesen/
GraphicsMagick Maintainer,    http://www.GraphicsMagick.org/

Reply via email to