[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-59-g0c86f00

[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  0c86f004feb5fb21ab871dff983ec390d78a2f7b (commit)
      from  fbf995f5233506addac7a430580227e185416638 (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=0c86f004feb5fb21ab871dff983ec390d78a2f7b


commit 0c86f004feb5fb21ab871dff983ec390d78a2f7b
Author: Mats Erik Andersson <address@hidden>
Date:   Tue Jan 14 15:02:01 2020 +0100

    Test running ftp-parser checks enhanced path.
    
    On Darwin systems the local directory is prepended with a path,
    independent of user wish.  Reported by Assaf Gordon.

diff --git a/ChangeLog b/ChangeLog
index e5b6651..e0438ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2020-01-14  Mats Erik Andersson  <address@hidden>
+
+       Make test of ftp-parser slightly more forgiving.  Darwin systems
+       might prepend a path stem to local directory.  Assaf Gordon reported
+       https://lists.gnu.org/archive/html/bug-inetutils/2020-01/msg00005.html
+
+       * tests/ftp-parser.sh: Check number of responses to mixed command
+       list, and extract any prepended path resulting from `lcd'.
+       (DIR_STEM): New variable.  This modifies matching test after `lpwd'.
+
 2020-01-13  Mats Erik Andersson  <address@hidden>
 
        The Gnulib module `regex' requires linking that was not made
diff --git a/tests/ftp-parser.sh b/tests/ftp-parser.sh
index e95bc5d..f7491b7 100755
--- a/tests/ftp-parser.sh
+++ b/tests/ftp-parser.sh
@@ -97,7 +97,15 @@ reply=`echo "$tell" | $FTP`
 
 test `echo "$reply" | $SED -n '$='` \
      -eq `echo "$tell" | $SED -n '$='` \
-&& test `echo "$reply" | $GREP -c 'Local directory is /tmp'` -eq 1 \
+|| { errno=1; echo >&2 'Some command in mixed list produced no response.'; }
+
+# At least Darwin has been known to prepend a directory stem.
+DIR_STEM=`echo "$reply" | $SED -n 's,Local directory now \([^ ]*\)/tmp$,\1,p'`
+
+test -z "$DIR_STEM" \
+|| $silence echo "This system prepends a directory stem: $DIR_STEM"
+
+test `echo "$reply" | $GREP -c "Local directory is $DIR_STEM/tmp"` -eq 1 \
 || { errno=1; echo >&2 'Failed to set local directory.'; }
 
 # Summary of work.

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

Summary of changes:
 ChangeLog           | 10 ++++++++++
 tests/ftp-parser.sh | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
GNU Inetutils