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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index ed02a80a85016961a71448a81e42b59d0b610f2f..3043855291092af47c37d8a3b79d0fe9f8405165 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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  <Ralf.Wildenhues@gmx.de>
 
        Relax depcomp test for MSVC to not require minuso.

diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index d6122fdeabd32cb3f5653fc664f6880fe9b2fd71..db57e4f5b1a2779dae396c2e8855974c89b2e071 100755 (executable)
--- 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