[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-11-g8c1fd8b

[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  8c1fd8b773d969056f2c2edf6eef274133fdb4a3 (commit)
      from  87b60f3f47dbd274e847e3fee306cb1dbe116173 (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=8c1fd8b773d969056f2c2edf6eef274133fdb4a3


commit 8c1fd8b773d969056f2c2edf6eef274133fdb4a3
Author: Mats Erik Andersson <address@hidden>
Date:   Thu Jan 26 15:51:32 2012 +0100

    Prerequisites for test execution.

diff --git a/ChangeLog b/ChangeLog
index 894ef42..f44e743 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-01-26  Mats Erik Andersson <address@hidden>
+
+       * tests/ftp-localhost.sh, tests/ping-localhost.sh,
+       tests/syslogd.sh, tests/tftp.sh, tests/traceroute-localhost.sh:
+       Test the availability of compiled resources.
+       * tests/syslogd.sh (LOGGER): Rename from IU_LOGGER.
+       (SYSLOGD): Rename from IU_SYSLOGD.
+       * tests/tftp.sh (IFCONFIG_SIMPLE): New helper variable.
+
 2012-01-25  Mats Erik Andersson <address@hidden>
 
        * tests/syslogd.sh: Substantial rewrite.  Early verbosity.
diff --git a/tests/ftp-localhost.sh b/tests/ftp-localhost.sh
index 01135e7..431ecaa 100755
--- a/tests/ftp-localhost.sh
+++ b/tests/ftp-localhost.sh
@@ -36,6 +36,17 @@ TARGET=${TARGET:-127.0.0.1}
 TARGET6=${TARGET6:-::1}
 TARGET46=${TARGET46:-::ffff:127.0.0.1}
 
+if [ ! -x $FTP ]; then
+    echo "No FTP client '$FTP' present.  Skipping test" >&2
+    exit 77
+elif [ ! -x $FTPD ]; then
+    echo "No FTP server '$FTPD' present.  Skipping test" >&2
+    exit 77
+elif [ ! -x $INETD ]; then
+    echo "No inetd superserver '$INETD' present.  Skipping test" >&2
+    exit 77
+fi
+
 if [ $VERBOSE ]; then
     set -x
     $FTP --version | head -1
diff --git a/tests/ping-localhost.sh b/tests/ping-localhost.sh
index 8f0b87a..0bda2fc 100755
--- a/tests/ping-localhost.sh
+++ b/tests/ping-localhost.sh
@@ -23,6 +23,11 @@ TARGET=${TARGET:-127.0.0.1}
 PING6=${PING6:-../ping/ping6$EXEEXT}
 TARGET6=${TARGET6:-::1}
 
+if [ ! -x $PING ]; then
+    echo 'No executable "$PING" available.  Skipping test.' >&2
+    exit 77
+fi
+
 if [ $VERBOSE ]; then
     set -x
     $PING --version
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 3fc11dd..0eecfa4 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -52,8 +52,8 @@ do_socket_length=true
 
 # The executables under test.
 #
-IU_SYSLOGD=../src/syslogd$EXEEXT
-IU_LOGGER=../src/logger$EXEEXT
+SYSLOGD=../src/syslogd$EXEEXT
+LOGGER=../src/logger$EXEEXT
 
 # Step into `tests/', should the invokation
 # have been made outside of it.
@@ -62,17 +62,17 @@ IU_LOGGER=../src/logger$EXEEXT
 
 if [ $VERBOSE ]; then
     set -x
-    $IU_SYSLOGD --version
-    $IU_LOGGER --version
+    $SYSLOGD --version
+    $LOGGER --version
 fi
 
-if [ ! -x $IU_SYSLOGD ]; then
-    echo "Missing executable 'syslogd'.  Failing."
+if [ ! -x $SYSLOGD ]; then
+    echo "Missing executable '$SYSLOGD'.  Failing." >&2
     exit 77
 fi
 
-if [ ! -x $IU_LOGGER ]; then
-    echo "Missing executable 'logger'.  Failing."
+if [ ! -x $LOGGER ]; then
+    echo "Missing executable '$LOGGER'.  Failing." >&2
     exit 77
 fi
 
@@ -297,7 +297,7 @@ IU_OPTIONS="$IU_OPTIONS $OPTIONS"
 
 # The eval-construct allows white space in file names,
 # based on the use of single quotes in IU_OPTIONS.
-eval $IU_SYSLOGD $IU_OPTIONS
+eval $SYSLOGD $IU_OPTIONS
 
 # Wait a moment in order to avoid an obvious
 # race condition with the server daemon on
@@ -330,20 +330,20 @@ fi
 # Send messages on two sockets: IPv4 and UNIX.
 #
 TESTCASES=`expr $TESTCASES + 1`
-$IU_LOGGER -h "$SOCKET" -p user.info -t "$TAG" \
+$LOGGER -h "$SOCKET" -p user.info -t "$TAG" \
     "Sending BSD message. (pid $$)"
 
 if $do_socket_length; then
     TESTCASES=`expr $TESTCASES + 1`
-    $IU_LOGGER -h "$IU_LONG_SOCKET" -p user.info \
+    $LOGGER -h "$IU_LONG_SOCKET" -p user.info \
        -t "$TAG" "Sending via long socket name. (pid $$)"
 fi
 
 if [ `id -u` -eq 0 ]; then
     TESTCASES=`expr $TESTCASES + 2`
-    $IU_LOGGER -4 -h "$TARGET" -p user.info -t "$TAG" \
+    $LOGGER -4 -h "$TARGET" -p user.info -t "$TAG" \
        "Sending IPv4 message. (pid $$)"
-    $IU_LOGGER -6 -h "$TARGET6" -p user.info -t "$TAG" \
+    $LOGGER -6 -h "$TARGET6" -p user.info -t "$TAG" \
        "Sending IPv6 message. (pid $$)"
 fi
 
diff --git a/tests/tftp.sh b/tests/tftp.sh
index 06b72b7..e43dacc 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -29,6 +29,21 @@ TFTP="${TFTP:-../src/tftp$EXEEXT}"
 TFTPD="${TFTPD:-$PWD/../src/tftpd$EXEEXT}"
 INETD="${INETD:-../src/inetd$EXEEXT}"
 IFCONFIG="${IFCONFIG:-../ifconfig/ifconfig$EXEEXT --format=unix}"
+IFCONFIG_SIMPLE=`expr X"$IFCONFIG" : X'\([^ ]*\)'`     # Remove options
+
+if [ ! -x $TFTP ]; then
+    echo "No TFTP client '$TFTP' present.  Skipping test" >&2
+    exit 77
+elif [ ! -x $TFTPD ]; then
+    echo "No TFTP server '$TFTPD' present.  Skipping test" >&2
+    exit 77
+elif [ ! -x $INETD ]; then
+    echo "No inetd superserver '$INETD' present.  Skipping test" >&2
+    exit 77
+elif [ ! -x $IFCONFIG_SIMPLE ]; then   # Remove options
+    echo "No ifconfig '$IFCONFIG_SIMPLE' present.  Skipping test" >&2
+    exit 77
+fi
 
 AF=${AF:-inet}
 PROTO=${PROTO:-udp}
diff --git a/tests/traceroute-localhost.sh b/tests/traceroute-localhost.sh
index 9003c0f..a9f9e4c 100755
--- a/tests/traceroute-localhost.sh
+++ b/tests/traceroute-localhost.sh
@@ -20,6 +20,11 @@
 TRACEROUTE=${TRACEROUTE:-../src/traceroute$EXEEXT}
 TARGET=${TARGET:-127.0.0.1}
 
+if [ ! -x $TRACEROUTE ]; then
+    echo 'No executable "$TRACEROUTE" available.  Skipping test.' >&2
+    exit 77
+fi
+
 if [ $VERBOSE ]; then
     set -x
     $TRACEROUTE --version

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

Summary of changes:
 ChangeLog                     |    9 +++++++++
 tests/ftp-localhost.sh        |   11 +++++++++++
 tests/ping-localhost.sh       |    5 +++++
 tests/syslogd.sh              |   26 +++++++++++++-------------
 tests/tftp.sh                 |   15 +++++++++++++++
 tests/traceroute-localhost.sh |    5 +++++
 6 files changed, 58 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU Inetutils