diff options
| -rw-r--r-- | init.cfg | 9 | ||||
| -rwxr-xr-x | tests/cp/existing-perm-race.sh | 2 | ||||
| -rwxr-xr-x | tests/mkdir/parents.sh | 1 | ||||
| -rwxr-xr-x | tests/mkdir/perm.sh | 1 |
4 files changed, 13 insertions, 0 deletions
@@ -60,6 +60,15 @@ getlimits_() test "$INT_MAX" || fatal_ "running getlimits" } +require_no_default_acl_() +{ + if getfacl --version < /dev/null > /dev/null 2>&1; then + getfacl "$1" | grep '^default:' && skip_ 'Default ACL detected' + else + ls -ld "$1" | grep '.........+' && skip_ 'ACL detected' + fi +} + require_acl_() { getfacl --version < /dev/null > /dev/null 2>&1 \ diff --git a/tests/cp/existing-perm-race.sh b/tests/cp/existing-perm-race.sh index f48369cd5..318986639 100755 --- a/tests/cp/existing-perm-race.sh +++ b/tests/cp/existing-perm-race.sh @@ -24,6 +24,8 @@ require_membership_in_two_groups_ # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least require_local_dir_ +require_no_default_acl_ . + set _ $groups; shift g1=$1 g2=$2 diff --git a/tests/mkdir/parents.sh b/tests/mkdir/parents.sh index ebdb52713..53eab8b36 100755 --- a/tests/mkdir/parents.sh +++ b/tests/mkdir/parents.sh @@ -19,6 +19,7 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_setgid_ +require_no_default_acl_ . mkdir -m 700 e-dir || framework_failure_ diff --git a/tests/mkdir/perm.sh b/tests/mkdir/perm.sh index ff0a57dce..d7d2efcef 100755 --- a/tests/mkdir/perm.sh +++ b/tests/mkdir/perm.sh @@ -20,6 +20,7 @@ . "${srcdir=.}/tests/init.sh"; path_prepend_ ./src print_ver_ mkdir skip_if_setgid_ +require_no_default_acl_ . working_umask_or_skip_ |