[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-63-g7026c69

[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  7026c695a0ccaabf8a223852f22291d8bf98220e (commit)
      from  485bcb20768a867c3f06b912634f658d8b934dde (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=7026c695a0ccaabf8a223852f22291d8bf98220e


commit 7026c695a0ccaabf8a223852f22291d8bf98220e
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Apr 10 00:18:08 2015 +0200

    Incomplete test of syslogd.
    
    The recent addition to `tests/syslogd.sh' can cause
    a false negative.

diff --git a/ChangeLog b/ChangeLog
index 8e58e57..78ac9d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-04-09  Mats Erik Andersson  <address@hidden>
+
+       Incomplete test of syslogd.
+       Whenever message passing via local socket is disabled,
+       the wrapping test caused a false negative.  Fix this by
+       letting it fall back to an INET socket.
+
+       * tests/syslogd.sh: Include the `wrapping message' whenever
+       either of $do_unix_socket or $do_inet_socket is true.  Fix the
+       counter COUNT_WRAP to be set under the same prerequisite only.
+
 2015-04-08  Mats Erik Andersson  <address@hidden>
 
        syslogd: Overlapping string locations.
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 0ba984d..a0996ea 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -424,11 +424,6 @@ if $do_unix_socket; then
     TESTCASES=`expr $TESTCASES + 1`
     $LOGGER -h "$SOCKET" -p user.info -t "$TAG" \
        "Sending BSD message. (pid $$)"
-
-    # Presence is checked in $OUT and $OUT_NOTICE, so merit value is 2.
-    TESTCASES=`expr $TESTCASES + 2`
-    $LOGGER -h "$SOCKET" -p daemon.notice -t "$TAG" \
-       "Attemping to locate wrapped configuration. (pid $$)"
 fi
 
 if $do_socket_length; then
@@ -448,6 +443,19 @@ if $do_inet_socket; then
     fi
 fi
 
+# Send message of priority notice, either via local socket or IPv4,
+# but not both.  The presence is checked in $OUT and in $OUT_NOTICE,
+# so merit value is 2.
+if $do_unix_socket; then
+    TESTCASES=`expr $TESTCASES + 2`
+    $LOGGER -h "$SOCKET" -p daemon.notice -t "$TAG" \
+       "Attemping to locate wrapped configuration. (pid $$)"
+elif $do_inet_socket; then
+    TESTCASES=`expr $TESTCASES + 2`
+    $LOGGER -4 -h "$TARGET:$PORT" -p daemon.notice -t "$TAG" \
+       "Attemping to locate wrapped configuration. (pid $$)"
+fi
+
 # Generate a more elaborate message routing, aimed at confirming
 # discrimination of severity and facility.  This is made active
 # by sending SIGHUP to the server process.
@@ -586,7 +594,9 @@ COUNT_NOTICE=`$SED -n '$=' "$OUT_NOTICE"`
 wrapped=`$GREP -c -f "$OUT_NOTICE" "$OUT"`
 
 COUNT_WRAP=0
-test $COUNT_NOTICE -ne $wrapped || COUNT_WRAP=1
+if $do_unix_socket || $do_inet_socket; then
+    test $COUNT_NOTICE -ne $wrapped || COUNT_WRAP=1
+fi
 
 # Second set-up after SIGHUP.
 COUNT2=`$GREP -c "$TAG2" "$OUT_USER"`

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

Summary of changes:
 ChangeLog        |   11 +++++++++++
 tests/syslogd.sh |   22 ++++++++++++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU Inetutils