tests: drop requirement 'texi2dvi-o'; 'texi2dvi' is enough

* defs: Since we now require Texinfo 4.9 or later in the Automake
generated Makefiles, and since the '-o' option of texi2dvi has been
supported since Texinfo 4.1, the requirement 'texi2dvi-o' is
obsolete -- the simpler requirement 'texi2dvi' is enough.
* t/silent8.sh ($required): Adjust by using simply 'texi2dvi'
instead of 'texi2dvi-o'
* t/txinfo-no-clutter.sh: Likewise.
* t/txinfo13.sh: Likewise.
* t/txinfo23.sh: Likewise.
* t/txinfo24.sh: Likewise.
* t/txinfo25.sh: Likewise.
* t/txinfo28.sh: Likewise.
* t/txinfo33.sh: Likewise.
* t/vtexi4.sh: Likewise.

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

diff --git a/defs b/defs
index 5034362a75106056c5628e255c949a00968d800c..a6d2b4a9da236f3551e571e2fc9ef027226a43ce 100644 (file)
--- a/defs
+++ b/defs
@@ -934,12 +934,6 @@ do
         skip_all_ "TeX is required, but it wasn't found by configure"
       fi
       ;;
-    texi2dvi-o)
-      # Texi2dvi supports '-o' since Texinfo 4.1.
-      echo "$me: running texi2dvi -o /dev/null --version"
-      texi2dvi -o /dev/null --version \
-        || skip_all_ "required program 'texi2dvi' not available"
-      ;;
     lex)
       test x"$LEX" = x"false" && skip_all_ "lex not found or disabled"
       export LEX

diff --git a/t/silent8.sh b/t/silent8.sh
index f15e99f99742db91efa819605877c9266449c951..7393d19c20cf46262b61831426ec9130b0fe4db9 100755 (executable)
--- a/t/silent8.sh
+++ b/t/silent8.sh
@@ -16,7 +16,7 @@
 
 # Check texinfo rules in silent-rules mode.
 
-required='makeinfo-html tex texi2dvi-o dvips'
+required='makeinfo-html tex texi2dvi dvips'
 . ./defs || Exit 1
 
 echo AC_OUTPUT >> configure.ac

diff --git a/t/txinfo-no-clutter.sh b/t/txinfo-no-clutter.sh
index 7c7856f0d3a4c8d0bb50b33d90a8b02183252ce1..43b83da1f8fd39311af3ae551d37841f7032a984 100755 (executable)
--- a/t/txinfo-no-clutter.sh
+++ b/t/txinfo-no-clutter.sh
@@ -17,7 +17,7 @@
 # The pdf, ps and dvi targets shouldn't let clutter in the build directory.
 # Related to automake bug#11146.
 
-required='makeinfo tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 mkdir sub

diff --git a/t/txinfo13.sh b/t/txinfo13.sh
index 77f9af785b7081e07a16046979aa9002cad3d61e..d3a7079b003be086dfb64a5c4904597686245d89 100755 (executable)
--- a/t/txinfo13.sh
+++ b/t/txinfo13.sh
@@ -18,7 +18,7 @@
 # Also make sure we do not distribute too much foo.info* files (Report
 # from Vincent Lefevre).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 echo AC_OUTPUT >> configure.ac

diff --git a/t/txinfo23.sh b/t/txinfo23.sh
index e5c17611d69b0a23b7b842dd74f1c2c527a41920..4ac9e9f022531a7023ee1d0378fba084273b85f7 100755 (executable)
--- a/t/txinfo23.sh
+++ b/t/txinfo23.sh
@@ -19,7 +19,7 @@
 # (Similar to txinfo13.test, plus DISTCLEANFILES).
 # (See also txinfo24.test and txinfo25.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'

diff --git a/t/txinfo24.sh b/t/txinfo24.sh
index 709cee71f94f891bf0e5eba4a817138b8f79dfe8..ecf4e9c0b5a0ca3b554f3b9ee2d75868d066d5e7 100755 (executable)
--- a/t/txinfo24.sh
+++ b/t/txinfo24.sh
@@ -18,7 +18,7 @@
 # (Similar to txinfo16.test, plus CLEANFILES).
 # (See also txinfo23.test and txinfo25.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'

diff --git a/t/txinfo25.sh b/t/txinfo25.sh
index 7aa66ae9d7563c5e338acd62e4d4eb62a5e20b4f..0d217d52f0010a4fdf7f5bf1ec1bb83f31061279 100755 (executable)
--- a/t/txinfo25.sh
+++ b/t/txinfo25.sh
@@ -20,7 +20,7 @@
 # (Similar to txinfo16.test, plus CLEANFILES).
 # (See also txinfo23.test and txinfo24.test).
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 cat >> configure.ac << 'END'

diff --git a/t/txinfo28.sh b/t/txinfo28.sh
index 97b36d50a6c7f2692736a782b8983f329e2456d8..cd09f41ad85c3e35c41f398f9787fee6264e2e26 100755 (executable)
--- a/t/txinfo28.sh
+++ b/t/txinfo28.sh
@@ -19,7 +19,7 @@
 # references.
 # Report from Ralf Corsepius.
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 # This setting, when honored by GNU ls, used to cause an infinite loop

diff --git a/t/txinfo33.sh b/t/txinfo33.sh
index 4bdd76734c36654c6096268e05cfb091b2fcfd0d..d35d0d3199f99b19b5f791e7e5123a96d4f682f0 100755 (executable)
--- a/t/txinfo33.sh
+++ b/t/txinfo33.sh
@@ -17,7 +17,7 @@
 # DVIS, PDFS, PSS, HTMLS should not be cleaned upon 'mostlyclean'.
 # Similar to txinfo25.test.
 
-required='makeinfo tex texi2dvi-o dvips'
+required='makeinfo tex texi2dvi dvips'
 . ./defs || Exit 1
 
 mkdir sub

diff --git a/t/vtexi4.sh b/t/vtexi4.sh
index 6038444b5cbbaabd72a088c9c3877a6e924bc3c9..bba1b5a67499bc2435704d5797e1627a3fa74b24 100755 (executable)
--- a/t/vtexi4.sh
+++ b/t/vtexi4.sh
@@ -21,7 +21,7 @@
 # for more vers*.texi files, and does not require makeinfo, tex and
 # texi2dvi.
 
-required='makeinfo tex texi2dvi-o'
+required='makeinfo tex texi2dvi'
 . ./defs || Exit 1
 
 case `LC_ALL=C date '+%u'` in