Merge branch 'master' into ng/master

* master:
  docs: adjust comment w.r.t. recent tests renaming
  tests: some more renames for texinfo tests
  tests: enhance and tweak some texinfo tests
  tests: remove a redundant texinfo test
  tests: don't list a removed tests in XFAIL_TESTS
  tests: more explicative names for some tests
  cleanup: drop a redundant %?FIRST% transform
  maint: state when compatibility cruft should be removed or warned about

+ Non-trivial extra edits

* t/txinfo-other-suffixes.sh: Remove, Automake-NG only supports
'.texi' ad suffix for Texinfo files.
* t/txinfo-without-info-suffix.sh: Remove, Automake-NG doesn't
support generating suffix-less info files.
* t/txinfo-no-repeated-targets.sh: Remove, superseded by test
't/txinfo-rules-once.sh' (see [ng] commit v1.12.1-416-gd5459b9).
* t/txinfo-dvi-recurs.sh: Remove, basically an obsolete grepping
test (as was the test 'txinfo10.sh' this was renamed from; see
[ng] commit v1.12.2-887-gb80d8d2).

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

1 files changed, 41 insertions, 0 deletions

diff --git a/t/txinfo-setfilename-repeated.sh b/t/txinfo-setfilename-repeated.sh
new file mode 100755
index 000000000..0d12b053a
--- /dev/null
+++ b/t/txinfo-setfilename-repeated.sh
@@ -0,0 +1,41 @@
+#! /bin/sh
+# Copyright (C) 2002-2012 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/>.
+
+# Make sure Automake uses the _first_ @setfilname it sees.
+# Report from Karl Berry.
+
+. test-init.sh
+
+cat > Makefile.am << 'END'
+info_TEXINFOS = texinfo.texi
+END
+
+cat > texinfo.texi << 'END'
+@setfilename texinfo.info
+...
+@verbatim
+@setfilename foobar.info
+@end verbatim
+...
+END
+
+$ACLOCAL
+$AUTOMAKE --add-missing
+
+grep 'foobar' Makefile.in && exit 1
+grep 'texinfo\.info:' Makefile.in
+
+: