[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_2-36-g9652277

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


commit 9652277837d7f3cf66ef33dbea1f069109e2ac6d
Author: Mats Erik Andersson <address@hidden>
Date:   Mon Aug 11 02:16:31 2014 +0200

    libls.sh: Better failure diagnostic.
    
    The build daemon at NixOS reports a failure
    where better reporting on our side would help.

diff --git a/ChangeLog b/ChangeLog
index b75ed48..4b5eb0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-08-11  Mats Erik Andersson  <address@hidden>
+
+       * tests/libls.sh: Improve failure diagnostic when testing
+       the switches `-a' and `-A'.  The build daemon at NixOS had
+       an issue during this subcase.
+
 2014-08-03  Mats Erik Andersson  <address@hidden>
 
        Support libshishi with Sun Studio.
diff --git a/tests/libls.sh b/tests/libls.sh
index a8ed8eb..29a4f41 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -66,10 +66,25 @@ REPLY_n=`$LS -n`
 REPLY_Ccts=`$LS -Ccts ..`
 REPLY_Cuts=`$LS -Cuts ..`
 
+# All the following failure causes are checked and possibly
+# brought to attention, independently of the other instances.
+#
 errno=0
 
 test $REPLY_a1 -eq `expr $REPLY_A1 + 2` ||
-  { errno=1; echo >&2 'Failed to suppress "." and "..".'; }
+  { 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
+      cat >&2 <<-EOT
+       --- File list difference with '-a' and with '-A'. ---
+       `echo "$diff" | $SED -e 's,^,    ,'`
+       --- End of list ---
+       EOT
+    fi
+  }
 
 test x"$REPLY_C" != x"$REPLY_Cf" ||
   { errno=1; echo >&2 'Failed to disable sorting with "-f".'; }

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

Summary of changes:
 ChangeLog      |    6 ++++++
 tests/libls.sh |   17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils