From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 11 Jan 2011 12:12:05 +0000 (+0100)
Subject: tests: work around a texi+cygnus bug causing a spurious XFAIL
X-Git-Tag: ng-0.5a~269^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51b68122c3abc0503e8eddfc188645c9109d76c4;p=thirdparty%2Fautomake.git

tests: work around a texi+cygnus bug causing a spurious XFAIL

* tests/txinfo5b.test: New test, like txinfo5.test but calling
automake with the `-Wno-override' option to work around a bug
in the texinfo + cygnus interaction.
* tests/txinfo5.test: Update heading comments.
* tests/Makefile.am (TEST): Updated.
---

diff --git a/ChangeLog b/ChangeLog
index df8013887..f260ca50b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	tests: work around a texi+cygnus bug causing a spurious XFAIL
+	* tests/txinfo5b.test: New test, like txinfo5.test but calling
+	automake with the `-Wno-override' option to work around a bug
+	in the texinfo + cygnus interaction.
+	* tests/txinfo5.test: Update heading comments.
+	* tests/Makefile.am (TEST): Updated.
+
 2011-01-09  Dave Hart  <davehart@gmail.com>  (tiny change)
 
 	Fix another typo in Rule.pm comment.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ceb503b89..a6ed4c21a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -738,6 +738,7 @@ txinfo2.test \
 txinfo3.test \
 txinfo4.test \
 txinfo5.test \
+txinfo5b.test \
 txinfo6.test \
 txinfo7.test \
 txinfo8.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7ecfcaabd..bcfd4784f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1005,6 +1005,7 @@ txinfo2.test \
 txinfo3.test \
 txinfo4.test \
 txinfo5.test \
+txinfo5b.test \
 txinfo6.test \
 txinfo7.test \
 txinfo8.test \
diff --git a/tests/txinfo5.test b/tests/txinfo5.test
index 24671131b..0b3ea683b 100755
--- a/tests/txinfo5.test
+++ b/tests/txinfo5.test
@@ -16,6 +16,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test to make sure that texinfo.tex is not required by --cygnus.
+# Also check that TEXINFOS + cygnus work without requiring the
+# `-Wno-override' option.
+# See also sister test txinfo5b.test.
 # Report from Ian Taylor.
 
 . ./defs || Exit 1
diff --git a/tests/txinfo5b.test b/tests/txinfo5b.test
new file mode 100755
index 000000000..f14eadb00
--- /dev/null
+++ b/tests/txinfo5b.test
@@ -0,0 +1,44 @@
+#! /bin/sh
+# Copyright (C) 1998, 2001, 2002, 2008, 2011 Free Software Foundation,
+# Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Test to make sure that texinfo.tex is not required by --cygnus.
+# See also sister test txinfo5.test.
+# Report from Ian Taylor.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AM_MAINTAINER_MODE
+END
+
+cat > Makefile.am << 'END'
+# Disable `override' warning to work around an unrelated
+# texi+cygnus bug.
+AUTOMAKE_OPTIONS = -Wno-override
+info_TEXINFOS = ian.texi
+END
+
+echo '@setfilename ian.info' > ian.texi
+
+$ACLOCAL
+$AUTOMAKE --cygnus
+$AUTOMAKE -a --cygnus
+test ! -f texinfo.tex
+
+: