From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 2 Mar 2012 21:24:35 +0000 (+0100)
Subject: tests: fix spurious failure due to exported MAKEINFO
X-Git-Tag: v1.11b~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ca53a79e4904281cf14c78b7b1234819094a3db;p=thirdparty%2Fautomake.git

tests: fix spurious failure due to exported MAKEINFO

* tests/txinfo30.test: Unset variable MAKEINFO, as its content could
take precedence over our faked makeinfo script and cause a spurious
failure.  Reported as part of automake bug#10866.  Add trailing ':'
command since we are at it.
---

diff --git a/tests/txinfo30.test b/tests/txinfo30.test
index 82ea85659..09ebd5e18 100755
--- a/tests/txinfo30.test
+++ b/tests/txinfo30.test
@@ -42,6 +42,10 @@ chmod +x makeinfo
 PATH=`pwd`$PATH_SEPARATOR$PATH
 export PATH
 
+# Otherwise configure might pick up a working makeinfo from the
+# environment.  Seen in automake bug#10866.
+unset MAKEINFO || :
+
 $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
@@ -55,3 +59,5 @@ test -f bar.info
 rm -f bar.info
 $MAKE && Exit 1
 test ! -f bar.info
+
+: