Merge branch 'maint'

* maint:
  docs: adjust comment w.r.t. recent tests renaming
  tests: some more renames for texinfo tests

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

11 files changed, 27 insertions, 27 deletions

diff --git a/doc/automake.texi b/doc/automake.texi
index bac074cd5..c36fab56a 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7918,7 +7918,7 @@ passed to @code{makeinfo} when building @file{.info} files; and
 @samp{$(AM_MAKEINFOHTMLFLAGS)} is used when building @file{.html}
 files.
 
-@c Keep in sync with txinfo21.sh
+@c Keep in sync with txinfo-many-output-formats.sh
 For instance, the following setting can be used to obtain one single
 @file{.html} file per manual, without node separators.
 @example
diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk
index 458a9e8d3..cd5a9ec72 100644
--- a/t/list-of-tests.mk
+++ b/t/list-of-tests.mk
@@ -1157,32 +1157,36 @@ t/target-cflags.sh \
 t/targetclash.sh \
 t/tests-environment-fd-redirect.sh \
 t/tests-environment-and-log-compiler.sh \
-t/txinfo.sh \
-t/txinfo-no-extra-dist.sh \
-t/txinfo-suffix-less-info.sh \
-t/txinfo-unrecognized-info-suffix.sh \
-t/txinfo-other-suffixes.sh \
+t/txinfo-absolute-srcdir-pr408.sh \
 t/txinfo-add-missing-and-dist.sh \
-t/txinfo-no-repeated-targets.sh \
-t/txinfo10.sh \
-t/txinfo-subdir-pr343.sh \
+t/txinfo-bsd-make-recurs.sh \
+t/txinfo-clean.sh \
+t/txinfo-dvi-recurs.sh \
 t/txinfo-info-in-srcdir.sh \
-t/txinfo-setfilename-repeated.sh \
-t/txinfo20.sh \
+t/txinfo-makeinfo-error-no-clobber.sh \
 t/txinfo-many-output-formats.sh \
+t/txinfo-no-clutter.sh \
+t/txinfo-no-extra-dist.sh \
+t/txinfo-no-installinfo.sh \
+t/txinfo-no-repeated-targets.sh \
+t/txinfo-other-suffixes.sh \
+t/txinfo-override-infodeps.sh \
 t/txinfo-override-texinfo-tex.sh \
+t/txinfo-setfilename-repeated.sh \
+t/txinfo-setfilename-suffix-strip.sh \
+t/txinfo-subdir-pr343.sh \
+t/txinfo-tex-dist.sh \
+t/txinfo-unrecognized-extension.sh \
+t/txinfo-unrecognized-info-suffix.sh \
+t/txinfo-vtexi.sh \
+t/txinfo-vtexi2.sh \
+t/txinfo-vtexi3.sh \
+t/txinfo-vtexi4.sh \
+t/txinfo-without-info-suffix.sh \
 t/txinfo23.sh \
 t/txinfo24.sh \
 t/txinfo25.sh \
-t/txinfo-absolute-srcdir-pr408.sh \
-t/txinfo-no-installinfo.sh \
 t/txinfo28.sh \
-t/txinfo-override-infodeps.sh \
-t/txinfo-setfilename-suffix-match.sh \
-t/txinfo-bsd-make-recurs.sh \
-t/txinfo-clean.sh \
-t/txinfo-no-clutter.sh \
-t/txinfo-unrecognized-extension.sh \
 t/transform.sh \
 t/transform2.sh \
 t/transform3.sh \
@@ -1217,10 +1221,6 @@ t/version6.sh \
 t/version7.sh \
 t/version8.sh \
 t/vpath.sh \
-t/vtexi.sh \
-t/vtexi2.sh \
-t/vtexi3.sh \
-t/vtexi4.sh \
 t/warnings-obsolete-default.sh \
 t/warnings-override.sh \
 t/warnings-precedence.sh \
diff --git a/t/txinfo10.sh b/t/txinfo-dvi-recurs.sh
index 2a186e1ef..2a186e1ef 100755
--- a/t/txinfo10.sh
+++ b/t/txinfo-dvi-recurs.sh
diff --git a/t/txinfo20.sh b/t/txinfo-makeinfo-error-no-clobber.sh
index 261725d8e..261725d8e 100755
--- a/t/txinfo20.sh
+++ b/t/txinfo-makeinfo-error-no-clobber.sh
diff --git a/t/txinfo-setfilename-suffix-match.sh b/t/txinfo-setfilename-suffix-strip.sh
index 8526d5381..8526d5381 100755
--- a/t/txinfo-setfilename-suffix-match.sh
+++ b/t/txinfo-setfilename-suffix-strip.sh
diff --git a/t/txinfo.sh b/t/txinfo-tex-dist.sh
index 8b22b27c5..8b22b27c5 100755
--- a/t/txinfo.sh
+++ b/t/txinfo-tex-dist.sh
diff --git a/t/vtexi.sh b/t/txinfo-vtexi.sh
index 31b763ec3..31b763ec3 100755
--- a/t/vtexi.sh
+++ b/t/txinfo-vtexi.sh
diff --git a/t/vtexi2.sh b/t/txinfo-vtexi2.sh
index aee1044e1..aee1044e1 100755
--- a/t/vtexi2.sh
+++ b/t/txinfo-vtexi2.sh
diff --git a/t/vtexi3.sh b/t/txinfo-vtexi3.sh
index a49579abe..dc45d07fd 100755
--- a/t/vtexi3.sh
+++ b/t/txinfo-vtexi3.sh
@@ -17,8 +17,8 @@
 # Check that vers*.texi files are automatically created and distributed
 # if @included into a texi source.  Also check that they correctly contain
 # the @values definitions they are advertised to.
-# See also the related test 'vtexi4.sh', which does similar checks, but
-# for version.texi only, and requires makeinfo, tex and texi2dvi.
+# See also the related test 'txinfo-vtexi4.sh', which does similar checks,
+# but for version.texi only, and requires makeinfo, tex and texi2dvi.
 
 . test-init.sh
 
diff --git a/t/vtexi4.sh b/t/txinfo-vtexi4.sh
index 97345ac0b..854ee56d3 100755
--- a/t/vtexi4.sh
+++ b/t/txinfo-vtexi4.sh
@@ -17,8 +17,8 @@
 # Check that the version.texi file is automatically created and distributed
 # if @included into a texi source.  Also check that is correctly defined
 # @values definitions it is advertised to.
-# See also the related test 'vtexi3.sh', which does similar checks, but
-# for more vers*.texi files, and does not require makeinfo, tex and
+# See also the related test 'txinfo-vtexi4.sh', which does similar checks,
+# but for more vers*.texi files, and does not require makeinfo, tex and
 # texi2dvi.
 
 required='makeinfo tex texi2dvi grep-nonprint'
diff --git a/t/txinfo-suffix-less-info.sh b/t/txinfo-without-info-suffix.sh
index d6f7caf5c..d6f7caf5c 100755
--- a/t/txinfo-suffix-less-info.sh
+++ b/t/txinfo-without-info-suffix.sh