* tests/Makefile.am (TESTS): Added new file.

	(XFAIL_TESTS): Likewise.
	* tests/texinfo10.test: New file.

diff --git a/ChangeLog b/ChangeLog
index 9cfbbe0..71f9f39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-05-06  Tom Tromey  <tromey@redhat.com>
+
+       * tests/Makefile.am (TESTS): Added new file.
+       (XFAIL_TESTS): Likewise.
+       * tests/texinfo10.test: New file.
+
 2001-05-05  Pavel Roskin <proski@gnu.org>
 
        * automake.in (scan_texinfo_file): Treat @defindex and @synindex

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1aa5948..f785b5e 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = objc.test subobj2.test yaccvpath.test
+XFAIL_TESTS = objc.test subobj2.test yaccvpath.test texinfo10.test
 
 TESTS =        \
 acinclude.test \
@@ -267,6 +267,7 @@ texinfo6.test \
 texinfo7.test \
 texinfo8.test \
 texinfo9.test \
+texinfo10.test \
 unused.test \
 vartar.test \
 version.test \

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 2da55d0..6e54e3b 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -75,7 +75,7 @@ install_sh = @install_sh@
 
 AUTOMAKE_OPTIONS = gnits
 
-XFAIL_TESTS = objc.test subobj2.test yaccvpath.test
+XFAIL_TESTS = objc.test subobj2.test yaccvpath.test texinfo10.test
 
 TESTS = \
 acinclude.test \
@@ -340,6 +340,7 @@ texinfo6.test \
 texinfo7.test \
 texinfo8.test \
 texinfo9.test \
+texinfo10.test \
 unused.test \
 vartar.test \
 version.test \

diff --git a/tests/texinfo10.test b/tests/texinfo10.test
new file mode 100755 (executable)
index 0000000..80ebf8a
--- /dev/null
+++ b/tests/texinfo10.test
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+# Make sure dvi target recurses into subdir.
+# Reported by Pavel Roskin
+
+. $srcdir/defs || exit 1
+
+cat > Makefile.am << 'END'
+SUBDIRS = sub
+END
+
+mkdir sub
+cat > sub/Makefile.am << 'END'
+info_TEXINFOS = maude.texi
+END
+
+echo '@setfilename maude.info' > sub/maude.texi
+: > sub/texinfo.tex
+
+$AUTOMAKE || exit 1
+
+grep dvi-recursive Makefile.in