From: Ralf Wildenhues Date: Thu, 12 Mar 2009 21:03:43 +0000 (+0100) Subject: Ignore warnings from autom4te about Libtool macros. X-Git-Tag: v1.10b~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2391e51c1cdaa56ab03390ebb3754f100e6b021d;p=thirdparty%2Fautomake.git Ignore warnings from autom4te about Libtool macros. * tests/ltinstloc.test: When testing for presence of warnings, filter out any that are not interesting for this test, e.g., warnings about installed files or about bogusly named cache variables in libtool.m4, emitted by recent Autoconf when older Libtool is used. Signed-off-by: Ralf Wildenhues --- diff --git a/ChangeLog b/ChangeLog index ed02a80a8..304385529 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-03-12 Ralf Wildenhues + + Ignore warnings from autom4te about Libtool macros. + * tests/ltinstloc.test: When testing for presence of warnings, + filter out any that are not interesting for this test, e.g., + warnings about installed files or about bogusly named cache + variables in libtool.m4, emitted by recent Autoconf when older + Libtool is used. + 2009-03-09 Ralf Wildenhues Relax depcomp test for MSVC to not require minuso. diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test index d6122fdea..db57e4f5b 100755 --- a/tests/ltinstloc.test +++ b/tests/ltinstloc.test @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009 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 @@ -43,9 +43,12 @@ $ACLOCAL $AUTOCONF AUTOMAKE_fails --add-missing +# libtoolize might have installed config.guess and config.sub already, +# and autom4te might warn about bugs in Libtool macro files, so filter +# out warnings about Makefile.am only. We don't care in this test +# whether automake installs config.guess and config.sub. + cat >expected <<'END' -configure.in:5: installing `./config.guess' -configure.in:5: installing `./config.sub' Makefile.am:5: sub/liba2.la multiply defined in condition COND Makefile.am:5: `sub/liba2.la' should be installed below `lib' in condition COND ... Makefile.am:2: ... and should also be installed in `lib' in condition COND. @@ -55,7 +58,7 @@ Makefile.am:2: ... and should also be installed in `lib' in condition COND. Makefile.am:2: Libtool libraries can be built for only one destination. END -diff stderr expected +grep '^Makefile.am' stderr | diff - expected sed 's/#//' < Makefile.am > t mv -f t Makefile.am