[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-66-g186074c

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  186074c449d606dc8149af8071d9b9eaff0e9d9d (commit)
      from  cf037d79f05ad4e6b713b44f53ae86f5dd1eac62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=186074c449d606dc8149af8071d9b9eaff0e9d9d


commit 186074c449d606dc8149af8071d9b9eaff0e9d9d
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Jan 27 12:46:13 2020 +0100

    Portability to an old Bourne shell.

diff --git a/ChangeLog b/ChangeLog
index 767b8a4..5f38929 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2020-01-27  Mats Erik Andersson  <address@hidden>
+
+       Portability to an old Solaris shell.
+
+       * tests/tools.sh.in (EGREP, FGREP, RUNTIME_IPV4, RUNTIME_IPV6):
+       Inside parameter substitution, put value between quotes, since
+       some old shells stumble on non-quoted space characters.
+       * tests/ifconfig.sh (evaluation of FORMAT): Likewise.
+
+       Make sure that scripts are individually executable.
+
+       * tests/ftp-parser.sh (EXEEXT): Test empty before reading tools.sh.
+       * tests/libls.sh (EXEEXT): Likewise.
+       * tests/ifconfig_modes.sh: Read tools.sh.
+
 2020-01-26  Mats Erik Andersson  <address@hidden>
 
        Examination of testing scripts.
diff --git a/tests/ftp-parser.sh b/tests/ftp-parser.sh
index f7491b7..1be8319 100755
--- a/tests/ftp-parser.sh
+++ b/tests/ftp-parser.sh
@@ -23,9 +23,10 @@
 
 set -u
 
+: ${EXEEXT:=}
+
 . ./tools.sh
 
-: ${EXEEXT:=}
 silence=
 bucket=
 
diff --git a/tests/ifconfig.sh b/tests/ifconfig.sh
index 26523c7..2fdbcd5 100755
--- a/tests/ifconfig.sh
+++ b/tests/ifconfig.sh
@@ -104,7 +104,7 @@ errno=0
 # Check for loopback address in all formats displaying the
 # standard address $TARGET, commonly 127.0.0.1.
 #
-for fmt in ${FORMAT:-gnu gnu-one-entry net-tools osf unix}; do
+for fmt in ${FORMAT:-"gnu gnu-one-entry net-tools osf unix"}; do
     $silence echo "Checking format $fmt."
     find_lo_addr $fmt || { errno=1; echo >&2 "Failed with format '$fmt'."; }
 done
diff --git a/tests/ifconfig_modes.sh b/tests/ifconfig_modes.sh
index cbd8521..3c1a81e 100644
--- a/tests/ifconfig_modes.sh
+++ b/tests/ifconfig_modes.sh
@@ -49,6 +49,8 @@ set -u
 
 : ${EXEEXT:=}
 
+. ./tools.sh
+
 silence=
 if test -z "${VERBOSE+set}"; then
   silence=:
diff --git a/tests/libls.sh b/tests/libls.sh
index d379cdb..b8d048d 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -22,9 +22,10 @@
 
 set -u
 
+: ${EXEEXT:=}
+
 . ./tools.sh
 
-: ${EXEEXT:=}
 silence=
 bucket=
 
diff --git a/tests/tools.sh.in b/tests/tools.sh.in
index 403ffca..44b47c9 100644
--- a/tests/tools.sh.in
+++ b/tests/tools.sh.in
@@ -18,8 +18,8 @@
 # Helpers and supporting functionality for test scripts.
 
 GREP=${GREP:-@GREP@}
-EGREP=${EGREP:-@EGREP@}
-FGREP=${FGREP:-@FGREP@}
+EGREP=${EGREP:-"@EGREP@"}
+FGREP=${FGREP:-"@FGREP@"}
 SED=${SED:-@SED@}
 DD=${DD:-@DD@}
 MKTEMP=${MKTEMP:-@MKTEMP@}
@@ -29,8 +29,8 @@ TARGET6=${TARGET6:-@TARGET6@}
 TEST_IPV4=${TEST_IPV4:-@TEST_IPV4@}
 TEST_IPV6=${TEST_IPV6:-@TEST_IPV6@}
 
-RUNTIME_IPV4="${RUNTIME_IPV4:-./runtime-ipv6$EXEEXT -4}"
-RUNTIME_IPV6="${RUNTIME_IPV6:-./runtime-ipv6$EXEEXT}"
+RUNTIME_IPV4=${RUNTIME_IPV4:-"./runtime-ipv6$EXEEXT -4"}
+RUNTIME_IPV6=${RUNTIME_IPV6:-"./runtime-ipv6$EXEEXT -6"}
 
 # Avoid IPv4 when not functional.
 if test "$TEST_IPV4" = "auto"; then

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               | 15 +++++++++++++++
 tests/ftp-parser.sh     |  3 ++-
 tests/ifconfig.sh       |  2 +-
 tests/ifconfig_modes.sh |  2 ++
 tests/libls.sh          |  3 ++-
 tests/tools.sh.in       |  8 ++++----
 6 files changed, 26 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
GNU Inetutils