On 18/01/16 19:27, Pádraig Brady wrote:
> I'll do further testing on NFS.

2 more false failure avoidance patches for NFS attached.
With those:

Centos 6.7, x86_64, GCC 4.4.7, NFS
 coreutils
  TOTAL: 584
  PASS:  442
  SKIP:  138

The release is good to go with those I think.

cheers,
Pádraig
From 7c2e4234093542c61c6c0c7e2a91878f602dbf22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]>
Date: Tue, 19 Jan 2016 17:49:11 +0000
Subject: [PATCH 1/2] tests: avoid false failure due to remove() ignoring u-w
 on NFS

* tests/rm/rm1.sh: Also remove the group write bit which
was required on one NFS setup at least.  Note u-w was
enough to deny file creation, g-w was also required to
deny file removal.
* tests/rm/cycle.sh: Likewise.
* tests/mv/perm-1.sh: Likewise.
---
 tests/mv/perm-1.sh | 2 +-
 tests/rm/cycle.sh  | 2 +-
 tests/rm/rm1.sh    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/mv/perm-1.sh b/tests/mv/perm-1.sh
index f793c01..6518568 100755
--- a/tests/mv/perm-1.sh
+++ b/tests/mv/perm-1.sh
@@ -22,7 +22,7 @@ print_ver_ mv
 skip_if_root_
 
 mkdir -p no-write/dir || framework_failure_
-chmod u-w no-write || framework_failure_
+chmod ug-w no-write || framework_failure_
 
 
 mv no-write/dir . > out 2>&1 && fail=1
diff --git a/tests/rm/cycle.sh b/tests/rm/cycle.sh
index d5dbb9e..483b748 100755
--- a/tests/rm/cycle.sh
+++ b/tests/rm/cycle.sh
@@ -22,7 +22,7 @@ skip_if_root_
 
 mkdir -p a/b
 touch a/b/file
-chmod u-w a/b
+chmod ug-w a/b
 
 
 rm -rf a a 2>&1 | sed 's/:[^:]*$//' > out || fail=1
diff --git a/tests/rm/rm1.sh b/tests/rm/rm1.sh
index 85a5b27..7893958 100755
--- a/tests/rm/rm1.sh
+++ b/tests/rm/rm1.sh
@@ -21,7 +21,7 @@ print_ver_ rm
 skip_if_root_
 
 mkdir -p b/a/p b/c b/d || framework_failure_
-chmod u-w b/a || framework_failure_
+chmod ug-w b/a || framework_failure_
 
 
 # This should fail.
-- 
2.5.0


From f967d5bf058cd5fe7f5ed38758d97655f4ad35fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]>
Date: Tue, 19 Jan 2016 18:45:07 +0000
Subject: [PATCH 2/2] tests: avoid false failure in tail inotify test

* tests/tail-2/wait.sh: Restrict inotify specific test portion
to local file systems and also not with ---disable-inotify specified.
Failure noticed on NFS.
---
 tests/tail-2/wait.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tail-2/wait.sh b/tests/tail-2/wait.sh
index 008f9f5..59f796a 100755
--- a/tests/tail-2/wait.sh
+++ b/tests/tail-2/wait.sh
@@ -65,7 +65,7 @@ for mode in '' '---disable-inotify'; do
   >tail.err
 done
 
-if test "$HAVE_INOTIFY"; then
+if test "$HAVE_INOTIFY" && test -z "$mode" && is_local_dir_ .; then
   # Ensure -F never follows a descriptor after rename
   # either with tiny or significant delays between operations
   tail_F()
-- 
2.5.0

Reply via email to