[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-67-gd7a15ce

[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  d7a15cef57b689eb448faeeecfb4eb1073ebe34a (commit)
      from  055ea0a73f8a54f2278a7526dcffd81662eb3eba (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=d7a15cef57b689eb448faeeecfb4eb1073ebe34a


commit d7a15cef57b689eb448faeeecfb4eb1073ebe34a
Author: Mats Erik Andersson <address@hidden>
Date:   Sat May 2 00:41:07 2015 +0200

    Check two test requirements for inetd.

diff --git a/ChangeLog b/ChangeLog
index ef75489..0f527d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-05-02  Mats Erik Andersson  <address@hidden>
+
+       * tests/inetd.sh (PASSWD, PWDDB, PROTOCOLS): New variables.
+       Check for system files required by `inetd'.  Skip test when
+       not found, which can happen in incomplete chroots.
+
 2015-04-17  Mats Erik Andersson  <address@hidden>
 
        * ftpd/conf.c, ftpd/ftpd.c, ifconfig/system/bsd.c,
diff --git a/tests/inetd.sh b/tests/inetd.sh
index ab51945..8a9b180 100755
--- a/tests/inetd.sh
+++ b/tests/inetd.sh
@@ -37,6 +37,30 @@ USER=${USER:-`func_id_user`}
 #
 $need_mktemp || exit_no_mktemp
 
+PASSWD=/etc/passwd
+PWDDB=/etc/pwd.db
+PROTOCOLS=/etc/protocols
+
+# Keep the following two tests separate for better diagnosis!
+#
+if test ! -r $PROTOCOLS; then
+    cat <<-EOT >&2
+       This test requires the availability of "$PROTOCOLS",
+       a file which can not be found in the current system.
+       Therefore skipping this test.
+       EOT
+    exit 77
+fi
+
+if test ! -r $PASSWD && test ! -r $PWDDB; then
+    cat <<-EOT >&2
+       This test requires availability of either "$PASSWD"
+       or "$PWDDB".  The requirement can not be met in the
+       current system.  Therefore skipping this test.
+       EOT
+    exit 77
+fi
+
 # Execution control.  Initialise early!
 #
 do_cleandir=false

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

Summary of changes:
 ChangeLog      |    6 ++++++
 tests/inetd.sh |   24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU Inetutils