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  1175f48255a7f046ca587aff41082bfc8752f991 (commit)
      from  3ce348e63c3934958a2665ef8289d28a12150948 (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=1175f48255a7f046ca587aff41082bfc8752f991


commit 1175f48255a7f046ca587aff41082bfc8752f991
Author: Simon Josefsson <[email protected]>
Date:   Thu Jan 28 15:54:01 2021 +0100

    tests/libls.sh (LSDIR): Fix parallel testing.
    
    Found on Guix and Debian, solution is to not use CWD as test directory
    for libls.  Inspired by trivial patch by Guillem Jover
    <[email protected]>.

diff --git a/ChangeLog b/ChangeLog
index c0832d2..adeab3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2021-01-28  Simon Josefsson  <[email protected]>
 
+       * tests/libls.sh (LSDIR): Fix parallel testing.  Found on Guix and
+       Debian, solution is to not use CWD as test directory for libls.
+       Inspired by trivial patch by Guillem Jover <[email protected]>.
+
+2021-01-28  Simon Josefsson  <[email protected]>
+
        ping, ping6: Fix unchecked setuid return.
 
        * ping/ping.c (main): Fail if setuid fail.  Trivial patch from
diff --git a/tests/libls.sh b/tests/libls.sh
index 3817ab2..7edf728 100755
--- a/tests/libls.sh
+++ b/tests/libls.sh
@@ -48,36 +48,40 @@ if test -n "${VERBOSE:+set}"; then
     set -x
 fi
 
+# Don't use CWD . because parallel testing may create and remove files
+# here while we work.
+LSDIR=..
+
 # IMPORTANT: Execute an initial call to $LS, just to get going.
 # In case this is a coverage run, as NixOS does, this very first
 # call will create `ls.gcda', whose creation would interfere with
 # the counting after `$LS -a1' and `$LS -A1'.
 #
-$LS -alTt >/dev/null 2>&1
+$LS -alTt $LSDIR >/dev/null 2>&1
 
 # Several runs with different switches are compared by
 # a simple count of printed lines.
 #
-REPLY_a1=`$LS -a1`
-REPLY_A1=`$LS -A1`
+REPLY_a1=`$LS -a1 $LSDIR`
+REPLY_A1=`$LS -A1 $LSDIR`
 
-REPLY_C=`$LS -C`
-REPLY_Cf=`$LS -Cf`
-REPLY_Cr=`$LS -Cr`
-REPLY_Ct=`$LS -Ct`
-REPLY_x=`$LS -x`
-REPLY_m=`$LS -m`
+REPLY_C=`$LS -C $LSDIR`
+REPLY_Cf=`$LS -Cf $LSDIR`
+REPLY_Cr=`$LS -Cr $LSDIR`
+REPLY_Ct=`$LS -Ct $LSDIR`
+REPLY_x=`$LS -x $LSDIR`
+REPLY_m=`$LS -m $LSDIR`
 
-REPLY_l=`$LS -l`
-REPLY_lT=`$LS -l`
-REPLY_n=`$LS -n`
+REPLY_l=`$LS -l $LSDIR`
+REPLY_lT=`$LS -l $LSDIR`
+REPLY_n=`$LS -n $LSDIR`
 
 # In an attempt to counteract lack of subsecond accuracy,
 # probe the parent directory where timing is known to be more
 # varied, than in the subdirectory "tests/".
 #
-REPLY_Ccts=`$LS -Ccts ..`
-REPLY_Cuts=`$LS -Cuts ..`
+REPLY_Ccts=`$LS -Ccts $LSDIR`
+REPLY_Cuts=`$LS -Cuts $LSDIR`
 
 # All the following failure causes are checked and possibly
 # brought to attention, independently of the other instances.

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

Summary of changes:
 ChangeLog      |  6 ++++++
 tests/libls.sh | 32 ++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 

_______________________________________________
Commit-inetutils mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/commit-inetutils

Reply via email to