[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2048-g1ca53a7

[Stefano Lattarini]

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=1ca53a79e4904281cf14c78b7b1234819094a3db

The branch, master has been updated
       via  1ca53a79e4904281cf14c78b7b1234819094a3db (commit)
       via  bee6dc63921d05197260c2d4170ca037df803ed4 (commit)
      from  b79511a10c43788dd03a0d32a70b8bf68d9a29a8 (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 1ca53a79e4904281cf14c78b7b1234819094a3db
Author: Stefano Lattarini <address@hidden>
Date:   Fri Mar 2 22:24:35 2012 +0100

    tests: fix spurious failure due to exported MAKEINFO
    
    * tests/txinfo30.test: Unset variable MAKEINFO, as its content could
    take precedence over our faked makeinfo script and cause a spurious
    failure.  Reported as part of automake bug#10866.  Add trailing ':'
    command since we are at it.

commit bee6dc63921d05197260c2d4170ca037df803ed4
Author: Stefano Lattarini <address@hidden>
Date:   Fri Mar 2 22:07:58 2012 +0100

    tests: fix spurious failure in a vala test
    
    * tests/vala-mix2.test: Append to 'configure.ac' rather than to
    'configure.in'.  Reported as part of automake bug#10866, and also
    revealed by "make maintainer-check".

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

Summary of changes:
 tests/txinfo30.test  |    6 ++++++
 tests/vala-mix2.test |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/tests/txinfo30.test b/tests/txinfo30.test
index 82ea856..09ebd5e 100755
--- a/tests/txinfo30.test
+++ b/tests/txinfo30.test
@@ -42,6 +42,10 @@ chmod +x makeinfo
 PATH=`pwd`$PATH_SEPARATOR$PATH
 export PATH
 
+# Otherwise configure might pick up a working makeinfo from the
+# environment.  Seen in automake bug#10866.
+unset MAKEINFO || :
+
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
@@ -55,3 +59,5 @@ test -f bar.info
 rm -f bar.info
 $MAKE && Exit 1
 test ! -f bar.info
+
+:
diff --git a/tests/vala-mix2.test b/tests/vala-mix2.test
index 88d2818..4ac5444 100755
--- a/tests/vala-mix2.test
+++ b/tests/vala-mix2.test
@@ -22,7 +22,7 @@ required='valac cc c++ GNUmake'
 
 set -e
 
-cat >> configure.in <<'END'
+cat >> configure.ac <<'END'
 AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_VALAC


hooks/post-receive
-- 
GNU Automake