[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-281-g6615a9c

[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=6615a9c3195f8e17c7dbfd052ca528019739a517

The branch, maint has been updated
       via  6615a9c3195f8e17c7dbfd052ca528019739a517 (commit)
       via  21fec67175f26976a04a7ab29e01536d5f9fc464 (commit)
      from  cf65e60d20f66e867af51f55426e93d1f3c6c328 (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 6615a9c3195f8e17c7dbfd052ca528019739a517
Merge: cf65e60 21fec67
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 13 21:35:05 2011 +0100

    Merge branch 'tests-texinfo' into maint

commit 21fec67175f26976a04a7ab29e01536d5f9fc464
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jan 13 20:56:04 2011 +0100

    tests: fix spurious failures in two texinfo tests
    
    * tests/txinfo.test ($required): Add 'makeinfo'.
    * tests/txinfo8.test: Create a dummy 'textutils.info' file, so
    that make won't try to run makeinfo (which could be unavailable)
    to build it.
    Found by NixOS Hydra, reported by Ralf Wildenhues.

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

Summary of changes:
 ChangeLog          |    9 +++++++++
 tests/txinfo.test  |    1 +
 tests/txinfo8.test |    7 +++++++
 3 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc0db29..ab9fa23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-13  Stefano Lattarini  <address@hidden>
+
+       tests: fix spurious failures in two texinfo tests
+       * tests/txinfo.test ($required): Add 'makeinfo'.
+       * tests/txinfo8.test: Create a dummy 'textutils.info' file, so
+       that make won't try to run makeinfo (which could be unavailable)
+       to build it.
+       Found by NixOS Hydra, reported by Ralf Wildenhues.
+
 2011-01-13  Ralf Wildenhues  <address@hidden>
 
        Avoid testsuite failures due to Autoconf Fortran change.
diff --git a/tests/txinfo.test b/tests/txinfo.test
index 2e94486..b764e53 100755
--- a/tests/txinfo.test
+++ b/tests/txinfo.test
@@ -18,6 +18,7 @@
 # Test to ensure texinfo.tex is included in distribution.  Bug report by
 # Jim Meyering.
 
+required=makeinfo
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/txinfo8.test b/tests/txinfo8.test
index 8dd24a4..13c8e31 100755
--- a/tests/txinfo8.test
+++ b/tests/txinfo8.test
@@ -53,6 +53,13 @@ $AUTOMAKE -a
 test -f auxdir/texinfo.tex
 
 ./configure
+
+# Create textutils.info by hand, so that we don't have to require
+# makeinfo.  Also ensure it's really newer than textutils.texi, so
+# that make won't try to re-create it.
+$sleep
+: > textutils.info
+
 $MAKE test1 test2
 
 :


hooks/post-receive
-- 
GNU Automake