branch master updated: * contrib/nontests/run_test_utils.sh (EGREP, FGREP), contrib/nontests/defs.in: remove unused EGREP and FGREP and remove copyright notice from defs.in as it is now trivial (and unused). Do not read nor find defs and defs.in from run_test_utils.sh.

[Patrice Dumas]

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

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 80c218f1de * contrib/nontests/run_test_utils.sh (EGREP, FGREP), 
contrib/nontests/defs.in: remove unused EGREP and FGREP and remove copyright 
notice from defs.in as it is now trivial (and unused). Do not read nor find 
defs and defs.in from run_test_utils.sh.
80c218f1de is described below

commit 80c218f1de3056c8c23e74bf83862c8e3d903eb9
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 8 12:36:10 2024 +0100

    * contrib/nontests/run_test_utils.sh (EGREP, FGREP),
    contrib/nontests/defs.in: remove unused EGREP and FGREP and remove
    copyright notice from defs.in as it is now trivial (and unused).
    Do not read nor find defs and defs.in from run_test_utils.sh.
---
 ChangeLog                          |  7 +++++++
 contrib/nontests/defs.in           | 29 ++---------------------------
 contrib/nontests/run_test_utils.sh | 20 ++------------------
 3 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5dcb96ac8a..5e269003ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-11-08  Patrice Dumas  <pertusus@free.fr>
+
+       * contrib/nontests/run_test_utils.sh (EGREP, FGREP),
+       contrib/nontests/defs.in: remove unused EGREP and FGREP and remove
+       copyright notice from defs.in as it is now trivial (and unused).
+       Do not read nor find defs and defs.in from run_test_utils.sh.
+
 2024-11-04  Gavin Smith <gavinsmith0123@gmail.com>
 
        Ease index files format change
diff --git a/contrib/nontests/defs.in b/contrib/nontests/defs.in
index a5629511f9..5fdb3ea326 100644
--- a/contrib/nontests/defs.in
+++ b/contrib/nontests/defs.in
@@ -1,29 +1,4 @@
-# -*- shell-script -*-
-# @configure_input@
-#
-# Copyright (C) 1996-2023 Free Software Foundation, Inc.
-#
-# (This file was originally part of GNU Automake.)
-#
-# 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 3 of the License, 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 we override the user shell.
+# NOTE: this file is not currently listed in configure.ac and therefore
+# not used to generate a defs file.
 SHELL='@SHELL@'
 export SHELL
-
-# POSIX no longer requires 'egrep' and 'fgrep',
-# but some hosts lack 'grep -E' and 'grep -F'.
-#EGREP='@EGREP@'
-#FGREP='@FGREP@'
-
diff --git a/contrib/nontests/run_test_utils.sh 
b/contrib/nontests/run_test_utils.sh
index da0509f262..29e6d0881d 100644
--- a/contrib/nontests/run_test_utils.sh
+++ b/contrib/nontests/run_test_utils.sh
@@ -41,30 +41,14 @@ esac ;;
 esac
 fi
 
-if test -f ./defs ; then
-  . ./defs
-#else
-#  # Ensure we are running from the right directory.
-#  echo "defs: not found in current directory" 1>&2
-#  exit 1
-fi
-
 # Ensure $srcdir is set correctly.
-test -f $srcdir/defs.in || {
-   echo "$srcdir/defs.in not found, check \$srcdir" 1>&2
+test -f $srcdir/run_test_utils.sh || {
+   echo "$srcdir/run_test_utils.sh not found, check \$srcdir" 1>&2
    exit 1
 }
 
 me=`echo "$0" | sed -e 's,.*[\\/],,;s/\.test$//'`
 
-if test z"$EGREP" = z ; then
-  EGREP='grep -e'
-fi
-
-if test z"$FGREP" = z ; then
-  FGREP='grep -f'
-fi
-
 # See how redirections should work.  User can set VERBOSE to see all
 # output.
 test -z "$VERBOSE" && {