summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2016-12-26 13:06:57 +0000
committerPádraig Brady <P@draigBrady.com>2016-12-28 16:33:43 +0000
commitd1a1276979c4744587c8a81e2b212c244512e83b (patch)
tree41a27116209dc6d17e1e1b89eb9b4cd112a72e69
parented77fb40cae45dda078510841326e1e5ab1dd55f (diff)
downloadcoreutils-d1a1276979c4744587c8a81e2b212c244512e83b.tar.xz
tests: avoid false fails on NFS due to EPERM
* tests/chgrp/basic.sh: On some NFS setups a user is not allowed to set a group on a file even if a member of that group. Therefore skip this test on remote file systems. * tests/chgrp/default-no-deref.sh: Likewise. * tests/chgrp/no-x.sh: Likewise. * tests/chgrp/posix-H.sh: Likewise. * tests/chgrp/recurse.sh: Likewise. * tests/tail-2/inotify-rotate-resources.sh: Change to skipping on remote file systems in the standard way.
-rwxr-xr-xtests/chgrp/basic.sh2
-rwxr-xr-xtests/chgrp/default-no-deref.sh1
-rwxr-xr-xtests/chgrp/no-x.sh1
-rwxr-xr-xtests/chgrp/posix-H.sh1
-rwxr-xr-xtests/chgrp/recurse.sh1
-rwxr-xr-xtests/tail-2/inotify-rotate-resources.sh6
6 files changed, 8 insertions, 4 deletions
diff --git a/tests/chgrp/basic.sh b/tests/chgrp/basic.sh
index b237b14e1..b07b1ac2a 100755
--- a/tests/chgrp/basic.sh
+++ b/tests/chgrp/basic.sh
@@ -19,7 +19,7 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ chgrp
require_membership_in_two_groups_
-
+require_local_dir_
set _ $groups; shift
g1=$1
diff --git a/tests/chgrp/default-no-deref.sh b/tests/chgrp/default-no-deref.sh
index eac07803f..9f5af6c1c 100755
--- a/tests/chgrp/default-no-deref.sh
+++ b/tests/chgrp/default-no-deref.sh
@@ -19,6 +19,7 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ chgrp
require_membership_in_two_groups_
+require_local_dir_
set _ $groups; shift
g2=$2
diff --git a/tests/chgrp/no-x.sh b/tests/chgrp/no-x.sh
index c42a146cc..6fc7803a8 100755
--- a/tests/chgrp/no-x.sh
+++ b/tests/chgrp/no-x.sh
@@ -21,6 +21,7 @@
print_ver_ chgrp
require_membership_in_two_groups_
skip_if_root_
+require_local_dir_
set _ $groups; shift
g1=$1
diff --git a/tests/chgrp/posix-H.sh b/tests/chgrp/posix-H.sh
index 832be9abf..0cac42b6c 100755
--- a/tests/chgrp/posix-H.sh
+++ b/tests/chgrp/posix-H.sh
@@ -19,6 +19,7 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ chgrp
require_membership_in_two_groups_
+require_local_dir_
set _ $groups; shift
g1=$1
diff --git a/tests/chgrp/recurse.sh b/tests/chgrp/recurse.sh
index 3285e1f35..90ea67dbc 100755
--- a/tests/chgrp/recurse.sh
+++ b/tests/chgrp/recurse.sh
@@ -19,6 +19,7 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ chgrp
require_membership_in_two_groups_
+require_local_dir_
set _ $groups; shift
g1=$1
diff --git a/tests/tail-2/inotify-rotate-resources.sh b/tests/tail-2/inotify-rotate-resources.sh
index 5b882023b..a8fef4403 100755
--- a/tests/tail-2/inotify-rotate-resources.sh
+++ b/tests/tail-2/inotify-rotate-resources.sh
@@ -19,14 +19,14 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ tail
+# Inotify not used on remote file systems
+require_local_dir_
+
grep '^#define HAVE_INOTIFY 1' "$CONFIG_HEADER" >/dev/null \
|| skip_ 'inotify required'
require_strace_ 'inotify_add_watch,inotify_rm_watch'
-# Quickly skip on remote file systems
-is_local_dir_ . || skip_ 'inotify not used on remote file system'
-
check_tail_output()
{
local delay="$1"