From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 13 Jan 2011 19:56:04 +0000 (+0100)
Subject: tests: fix spurious failures in two texinfo tests
X-Git-Tag: v1.11.1b~36^2~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21fec67175f26976a04a7ab29e01536d5f9fc464;p=thirdparty%2Fautomake.git

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 dc5937550..9d5a29617 100644
--- 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 2e9448674..b764e53d3 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 8dd24a4a7..13c8e312e 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
 
 :