Re: [PATCH] {maint} Improve, extend and tweak tests on Texinfo support.

[Stefano Lattarini]

On Thursday 13 January 2011, Ralf Wildenhues wrote:
> Hi Stefano,
> 
> * Stefano Lattarini wrote on Mon, Jan 03, 2011 at 02:38:48PM CET:
> > From f236e0eb21df62ff4e5c01ecfaefe75d2e3d3d9b Mon Sep 17 00:00:00 2001
> > From: Stefano Lattarini <address@hidden>
> > Date: Fri, 24 Dec 2010 02:56:35 +0100
> > Subject: [PATCH] Improve, extend and tweak tests on Texinfo support.
> > 
> > * tests/instdir-texi.test: Add a call to `ls -l' after that to
> > `make', for debugging.  When looking for required tools, do not
> > redirect the output of "$tool --help" to /dev/null, and do not
> > uselessly run it in a subshell.
> > * tests/txinfo.test: Rewritten to run autoconf, ./configure and
> > make.  All checks moved into Makefile.am.
> > * tests/txinfo8.test: Likewise, and modernize the generated
> > configure.in.
> [...]
> 
> This patch has caused a couple of regressions, txinfo.test and
> txinfo8.test now fail when makeinfo is not found.  See here:
> <http://hydra.nixos.org/build/856303/log/raw>
> How about not requiring makeinfo in these tests?
>
What about a middle-ground solution to ensure more coverage on
systems lacking Texinfo?  See the patch below.

I will wait for approval before pushing.

Regards,
  Stefano

-*-*-

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(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc59375..9d5a296 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-11  Stefano Lattarini  <address@hidden>
 
        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
 
 :
-- 
1.7.2.3