[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-37-g4a46c58

[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  4a46c58ba2f722e5142e5d72d69018eb52254a6a (commit)
      from  9652277837d7f3cf66ef33dbea1f069109e2ac6d (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=4a46c58ba2f722e5142e5d72d69018eb52254a6a


commit 4a46c58ba2f722e5142e5d72d69018eb52254a6a
Author: Mats Erik Andersson <address@hidden>
Date:   Wed Aug 13 23:40:43 2014 +0200

    tests/libls.sh: Update testing method.
    
    Avoid a line enumeration using `sed', which seemingly
    caused a false negative in the build daemon of NixOS.

diff --git a/ChangeLog b/ChangeLog
index 4b5eb0d..c4dd37b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-08-13  Mats Erik Andersson  <address@hidden>
+
+       * tests/libls.sh <VERBOSE>: Execute `set -x'.
+       (REPLY_a1, REPLY_A1, diff): Changed.  Update the check
+       based on these, thus avoiding `sed -n '$='' which could
+       not be trusted on NixOS' build daemon.
+
 2014-08-11  Mats Erik Andersson  <address@hidden>
 
        * tests/libls.sh: Improve failure diagnostic when testing
diff --git a/tests/libls.sh b/tests/libls.sh
index 29a4f41..f69a559 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -42,11 +42,15 @@ if test -z "${VERBOSE+set}"; then
     bucket='>/dev/null'
 fi
 
+if test -n "${VERBOSE:+set}"; then
+    set -x
+fi
+
 # Several runs with different switches are compared by
 # a simple count of printed lines.
 #
-REPLY_a1=`$LS -a1 | $SED -n '$='`
-REPLY_A1=`$LS -A1 | $SED -n '$='`
+REPLY_a1=`$LS -a1`
+REPLY_A1=`$LS -A1`
 
 REPLY_C=`$LS -C`
 REPLY_Cf=`$LS -Cf`
@@ -71,10 +75,12 @@ REPLY_Cuts=`$LS -Cuts ..`
 #
 errno=0
 
-test $REPLY_a1 -eq `expr $REPLY_A1 + 2` ||
+diff=`{ echo "$REPLY_a1"; echo "$REPLY_A1"; } | sort | uniq -u`
+
+test `echo "$diff" | wc -l` -eq 2 &&
+test `echo "$diff" | grep -c -v -e '^\.\{1,2\}$'` -eq 0 ||
   { errno=1; echo >&2 'Failed to tell switch -a apart from -A.'
     # Attempt a diagnosis.
-    diff=`{ $LS -a1 && $LS -A1; } | sort | uniq -u`
     if test -z "$diff"; then
       echo >&2 'Flags -a and -A produce identical lists.'
     else

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

Summary of changes:
 ChangeLog      |    7 +++++++
 tests/libls.sh |   14 ++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU Inetutils