[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-156-g1bf2a40

[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  1bf2a40a9b36d84c0931b0308f163d4ba7cb8576 (commit)
      from  ca404fb90885aa8d36f689936513295add317e16 (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=1bf2a40a9b36d84c0931b0308f163d4ba7cb8576


commit 1bf2a40a9b36d84c0931b0308f163d4ba7cb8576
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Aug 24 11:43:12 2012 +0200

    Test script update.

diff --git a/ChangeLog b/ChangeLog
index fd41f82..9cf0df7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-24  Mats Erik Andersson  <address@hidden>
+
+       * tests/tftp.sh (silence, bucket): New variables.
+       Make the script silent in standard case.
+
 2012-08-24  Petr Malát  <address@hidden>  (tiny change)
 
        * telnetd/utility.c (terminaltypeok): Use 2kb buffer, as suggested
diff --git a/tests/tftp.sh b/tests/tftp.sh
index c9c66dc..65e6b77 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -36,7 +36,12 @@ $need_dd || exit_no_dd
 $need_mktemp || exit_no_mktemp
 $need_netstat || exit_no_netstat
 
-if [ "$VERBOSE" ]; then
+if test -z "${VERBOSE+set}"; then
+    silence=:
+    bucket='>/dev/null'
+fi
+
+if test -n "$VERBOSE"; then
     set -x
 fi
 
@@ -295,15 +300,15 @@ SUCCESSES=0
 EFFORTS=0
 RESULT=0
 
-echo "Looking into '`echo $ADDRESSES | tr "\n" ' '`'."
+$silence echo "Looking into '`echo $ADDRESSES | tr "\n" ' '`'."
 
 for addr in $ADDRESSES; do
-    echo "trying address '$addr'..." >&2
+    $silence echo "trying address '$addr'..." >&2
 
     for name in $FILELIST; do
        EFFORTS=`expr $EFFORTS + 1`
        rm -f $name
-       echo "get $name" | "$TFTP" ${VERBOSE:+-v} "$addr" $PORT
+       echo "get $name" | eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
 
        cmp "$TMPDIR/tftp-test/$name" "$name" 2>/dev/null
        result=$?
@@ -335,10 +340,10 @@ locate_port $PROTO $PORT &&
        locate_port $PROTO $PORT && do_conf_reload=false
     }
 
-echo
+$silence echo >&2
 
 if $do_conf_reload; then
-    echo >&2 'Testing altered and reloaded configuration.'
+    $silence echo >&2 'Testing altered and reloaded configuration.'
     write_conf ||
        {
            echo >&2 'Could not rewrite configuration file for Inetd.  Failing.'
@@ -350,7 +355,7 @@ if $do_conf_reload; then
     for addr in $ADDRESSES; do
        EFFORTS=`expr $EFFORTS + 1`
        test -f "$name" && rm "$name"
-       echo "get $name" | "$TFTP" ${VERBOSE:+-v} "$addr" $PORT
+       echo "get $name" | eval "$TFTP" ${VERBOSE:+-v} "$addr" $PORT $bucket
        cmp "$TMPDIR/tftp-test/$name" "$name" 2>/dev/null
        result=$?
        if test $result -ne 0; then
@@ -362,11 +367,12 @@ if $do_conf_reload; then
        fi
     done
 else
-    echo >&2 'Informational: Inhibiting config reload test.'
+    $silence echo >&2 'Informational: Inhibiting config reload test.'
 fi
 
 # Minimal clean up. Main work in posttesting().
-echo
-echo Tests in $0 had $SUCCESSES successes out of $EFFORTS cases.
+$silence echo
+test $RESULT -eq 0 && $silence false \
+    || echo Test had $SUCCESSES successes out of $EFFORTS cases.
 
 exit $RESULT

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

Summary of changes:
 ChangeLog     |    5 +++++
 tests/tftp.sh |   26 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU Inetutils