branch master updated: * contrib/nontests/latex2html.test: Remove. * contrib/nontests/bibtex.test, contrib/nontests/defs.in: Remove checks using hevea. * configure.ac: Delete commented-out AC_CHECK_PROGS line for hevea. * contrib/nontests/Makefile.am: Remove as file is unused.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 4a249c948a * contrib/nontests/latex2html.test: Remove. * 
contrib/nontests/bibtex.test, contrib/nontests/defs.in: Remove checks using 
hevea. * configure.ac: Delete commented-out AC_CHECK_PROGS line for hevea. * 
contrib/nontests/Makefile.am: Remove as file is unused.
4a249c948a is described below

commit 4a249c948ad58a5f9c8bb3cae7357e6d7d0cac65
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Thu Nov 16 17:03:15 2023 +0000

    * contrib/nontests/latex2html.test: Remove.
    * contrib/nontests/bibtex.test, contrib/nontests/defs.in:
    Remove checks using hevea.
    * configure.ac: Delete commented-out AC_CHECK_PROGS line for hevea.
    * contrib/nontests/Makefile.am: Remove as file is unused.
---
 ChangeLog                        |  8 ++++
 configure.ac                     |  1 -
 contrib/nontests/Makefile.am     | 11 ------
 contrib/nontests/bibtex.test     |  9 ++---
 contrib/nontests/defs.in         |  7 +---
 contrib/nontests/latex2html.test | 79 ----------------------------------------
 6 files changed, 12 insertions(+), 103 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f4274e469..84d4bcac9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-11-16  Gavin Smith <gavinsmith0123@gmail.com>
+
+       * contrib/nontests/latex2html.test: Remove.
+       * contrib/nontests/bibtex.test, contrib/nontests/defs.in:
+       Remove checks using hevea.
+       * configure.ac: Delete commented-out AC_CHECK_PROGS line for hevea.
+       * contrib/nontests/Makefile.am: Remove as file is unused.
+
 2023-11-16  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (_convert_text, convert, output),
diff --git a/configure.ac b/configure.ac
index 4b0e9a56bd..9cbdddf2dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -484,7 +484,6 @@ AC_CONFIG_FILES([install-info/tests/defs])
 dnl We cannot enable the TeX-related tests, so don't waste time
 dnl configuring them.  See contrib/nontests/README.
 dnl AC_CONFIG_FILES([util/tests/defs])
-dnl AC_CHECK_PROGS([HEVEA], [hevea], [])
 dnl AC_CHECK_PROGS([TEX], [tex], [])
 
 AC_CHECK_PROGS([PROVE], [prove], [])
diff --git a/contrib/nontests/Makefile.am b/contrib/nontests/Makefile.am
deleted file mode 100644
index a444fc20fc..0000000000
--- a/contrib/nontests/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-# Makefile.am for texinfo/util/tests.
-#
-# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/contrib/nontests/bibtex.test b/contrib/nontests/bibtex.test
index 0bb29a0596..465f8d5cf4 100755
--- a/contrib/nontests/bibtex.test
+++ b/contrib/nontests/bibtex.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2006-2023 Free Software Foundation, Inc.
 #
 # This file is part of GNU Texinfo.
 #
@@ -16,8 +16,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-required='hevea'
-
 . ./defs || exit 1
 
 set -e
@@ -37,7 +35,7 @@ cat >sample.bib <<EOF
 EOF
 
 
-# check HTML|INFO|TEXT|DVI|PDF
+# check DVI|PDF
 # ----------------------------
 check ()
 {
@@ -50,8 +48,7 @@ check ()
   rm input.$out
 }
 
-# Currently we don't use bibtex with hevea.  This is to be fixed.
-for out in dvi pdf # html info text
+for out in dvi pdf
 do
   check $out
 done
diff --git a/contrib/nontests/defs.in b/contrib/nontests/defs.in
index f70b1e71a8..971fcec8ff 100644
--- a/contrib/nontests/defs.in
+++ b/contrib/nontests/defs.in
@@ -1,8 +1,7 @@
 # -*- shell-script -*-
 # @configure_input@
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
-# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996-2023 Free Software Foundation, Inc.
 #
 # (This file was originally part of GNU Automake.)
 #
@@ -87,10 +86,6 @@ then
   do
     # Check that each required tool is present.
     case $tool in
-      hevea)
-        # HeVeA supports -version only.  Use configure to find it.
-        test -n "@HEVEA@" || exit 77
-       ;;
       tex)
         # No all versions of Tex support `--version', so we use
         # a configure check.
diff --git a/contrib/nontests/latex2html.test b/contrib/nontests/latex2html.test
deleted file mode 100755
index d52bf2f708..0000000000
--- a/contrib/nontests/latex2html.test
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2006, 2007  Free Software Foundation, Inc.
-#
-# This file is part of GNU Texinfo.
-#
-# GNU Texinfo 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 3 of the License,
-# or (at your option) any later version.
-#
-# GNU Texinfo 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/>.
-
-required='hevea'
-
-. ./defs || exit 1
-
-set -e
-
-# Force the creation of auxiliary files.
-# Force it to be big enough to trigger the info file splitting.
-{
-  echo "\tableofcontents"
-  for section in 1 2 3 4 5 6
-  do
-    echo "\section{$i}"
-    for subsection in 1 2 3 4 5 6
-    do
-      echo "\subsection{$i}"
-      echo "$latex_paragraph"
-    done
-  done
-} |
-create_input_tex
-
-
-# run_hevea_check FORMAT OPTIONS
-# ------------------------------
-run_hevea_check ()
-{
-  title "$@"
-
-  format="$1"
-  shift
-
-  # Testing the local build mode.
-  TEXI2DVI_pass --batch --$format "$@" input.tex
-
-  # Compute the expected output.
-  outfiles=input.$out
-  case $format in
-     info) outfiles="$outfiles input.info-1 input.info-2";;
-  esac
-
-  # Compute the aux files.
-  case $format:$@ in
-    *clean* ) auxfiles='';;
-     *tidy* ) auxfiles='input.t2d';;
-     html:*|text:* ) auxfiles='input.haux input.htoc';;
-      dvi:* ) auxfiles='input.aux input.log input.toc';;
-          * ) auxfiles='';;
-  esac
-  # There should only be the expected output and the source file.
-  assert_files input.tex $outfiles $auxfiles
-  rm -fr $outfiles $auxfiles
-}
-
-for opt in "" "--clean" "--tidy"
-do
-  for out in html info text
-    do
-    run_hevea_check $out $opt
-  done
-done