[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-23-gc4f4c25

[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  c4f4c250a60fd67bd8b16686f531f7b2ad6e3d4f (commit)
      from  3ce1d4da27e6986ac3428f6057630fb6801d6893 (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=c4f4c250a60fd67bd8b16686f531f7b2ad6e3d4f


commit c4f4c250a60fd67bd8b16686f531f7b2ad6e3d4f
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Feb 3 02:12:33 2012 +0100

    False negatives in test evaluations.

diff --git a/ChangeLog b/ChangeLog
index 8247445..49f5020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2012-02-03  Mats Erik Andersson <address@hidden>
 
+       Do not use which(1) in test scripts.
+       * tests/ftp-localhost.sh: Use a trivial match to detect grep(1)
+       and a trivial invokation of netstat(1).  Use `sysctl -a', while
+       discarding STDOUT and STDERR, to sense for sysctl(8).
+       * tests/tftp.sh: Likewise with grep(1).
+
+2012-02-03  Mats Erik Andersson <address@hidden>
+
        Attempt full detection of any intermediary step failing.
        * tests/ftp-localhost.sh: Test presence of grep(1), netstat(1).
        Capture failing mktemp(1).
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index cb7a1df..f85cd3f 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -59,13 +59,14 @@ elif [ ! -x $INETD ]; then
     exit 77
 fi
 
-which grep >/dev/null 2>&1 ||
-    {
+# Use a trivial test to detect grep(1).
+echo 'Good luck.' | grep 'ood' >/dev/null 2>&1 \
+    || {
        echo 'No available grep(1), used for diagnosis.  Skipping test.' >&2
        exit 77
     }
 
-which netstat >/dev/null 2>&1 ||
+netstat -na >/dev/null 2>&1 ||
     {
        echo 'No available netstat(1), used for diagnosis.  Skipping test.' >&2
        exit 77
@@ -324,7 +325,7 @@ if $have_address_mapping; then
     :
 else
     # Do we have sysctl(1) available?
-    if which sysctl >/dev/null 2>&1; then
+    if sysctl -a >/dev/null 2>&1; then
        have_sysctl=true
     else
        echo "Warning: Not testing IPv4-mapped addresses." >&2
diff --git a/tests/tftp.sh b/tests/tftp.sh
index b787021..40d68a6 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -54,8 +54,8 @@ if [ $? -ne 0 ]; then
 fi
 
 # And grep!
-which grep > /dev/null 2>&1 ||
-    {
+echo 'Good luck.' | grep 'ood' > /dev/null 2>&1 \
+    || {
        echo 'grep(1) is not available.  Skipping test.' >&2
        exit 77
     }

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

Summary of changes:
 ChangeLog              |    8 ++++++++
 tests/ftp-localhost.sh |    9 +++++----
 tests/tftp.sh          |    4 ++--
 3 files changed, 15 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils