[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-276-g2391e51

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=2391e51c1cdaa56ab03390ebb3754f100e6b021d

The branch, master has been updated
       via  2391e51c1cdaa56ab03390ebb3754f100e6b021d (commit)
      from  8050a6b4d7e2afd82a8e329180e0c035da3af3e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2391e51c1cdaa56ab03390ebb3754f100e6b021d
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Mar 12 22:03:43 2009 +0100

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog            |    9 +++++++++
 tests/ltinstloc.test |   11 +++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed02a80..3043855 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-03-12  Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        Relax depcomp test for MSVC to not require minuso.
diff --git a/tests/ltinstloc.test b/tests/ltinstloc.test
index d6122fd..db57e4f 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


hooks/post-receive
--
GNU Automake