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.

diff --git a/ChangeLog b/ChangeLog
index dc593755040d424b5b2aee90219ebd506b17fd9d..9d5a29617b579a901341793b5eed5aaff9e0b94e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        Improve, extend and tweak tests on Texinfo support.

diff --git a/tests/txinfo.test b/tests/txinfo.test
index 2e9448674988114f2b239dabc02a67e88eb48024..b764e53d3bfbf8ba0342c16bc0de712121976c79 100755 (executable)
--- 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 8dd24a4a79c4ed758881abf8a86c5ea30b6030f3..13c8e312e396a2ea663433400a3aff1063f54fc9 100755 (executable)
--- 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
 
 :