From 21fec67175f26976a04a7ab29e01536d5f9fc464 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 13 Jan 2011 20:56:04 +0100 Subject: [PATCH] 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. --- ChangeLog | 9 +++++++++ tests/txinfo.test | 1 + tests/txinfo8.test | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index dc59375..9d5a296 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-01-13 Stefano Lattarini + + 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 Improve, extend and tweak tests on Texinfo support. 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 : -- 2.7.4