From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 13 Nov 2011 09:25:43 +0000 (+0100)
Subject: tests: fix spurious failure with older install-info
X-Git-Tag: v1.11.1b~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa53725d148cbda064fc598aa6a2a422e9cc422;p=thirdparty%2Fautomake.git

tests: fix spurious failure with older install-info

* tests/install-info-dir.test (foo.texi): Also add proper
`@settitle', `@dircategory' and `@direntry' directive, otherwise
older versions of `install-info' (e.g., 4.8) will fail to create
the `dir' index file in ${infodir}.

Problem revealed by a failure on NetBSD 5.1.
---

diff --git a/ChangeLog b/ChangeLog
index 3cccebc90..1e624a8a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-11-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: fix spurious failure with older install-info
+	* tests/install-info-dir.test (foo.texi): Also add proper
+	`@settitle', `@dircategory' and `@direntry' directive, otherwise
+	older versions of `install-info' (e.g., 4.8) will fail to create
+	the `dir' index file in ${infodir}.
+	Problem revealed by a failure on NetBSD 5.1.
+
 2011-11-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	maintcheck: fix spurious failure in 'color2.test'
diff --git a/tests/install-info-dir.test b/tests/install-info-dir.test
index f75b11538..044bf6d2a 100755
--- a/tests/install-info-dir.test
+++ b/tests/install-info-dir.test
@@ -43,6 +43,14 @@ END
 cat > foo.texi << 'END'
 \input texinfo
 @setfilename foo.info
+@c All the following directives might be required to allow older
+@c versions of the `install-info' program (e.g., version 4.8) to
+@c create the `dir' index file in ${infodir}.  Don't remove them.
+@settitle foo
+@dircategory Dummy utilities
+@direntry
+* Foo: (foo).  Does nothing at all, but has a nice name.
+@end direntry
 @node Top
 Hello world!
 @bye