diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rwxr-xr-x | tests/mv/acl | 10 |
2 files changed, 10 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2006-12-30 Jim Meyering <jim@meyering.net> + * tests/mv/acl (skip): Skip this test also if the destination + directory, which is on a different file system, lacks ACL support. + * src/copy.c (copy_reg): Rewrite a comment that was rendered inaccurate by the 2006-10-18 change. diff --git a/tests/mv/acl b/tests/mv/acl index df3bb012d..9128686ee 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -54,6 +54,8 @@ mkdir -p $tmp || framework_failure=1 cd $tmp || framework_failure=1 touch file || framework_failure=1 +t1=$other_partition_tmpdir/t1 +touch $t1 || framework_failure=1 if test $framework_failure = 1; then echo 'failure in testing framework' @@ -62,12 +64,14 @@ fi skip=no # Ensure that setfacl and getfacl work on this file system. -setfacl -m user:bin:rw file 2> /dev/null || skip=yes +setfacl -m user:bin:rw file 2> /dev/null || skip=. +# And on the destination file system. +setfacl -m user:bin:rw $t1 || skip=$other_partition_tmpdir acl1=`getfacl file` || skip=yes -test $skip = yes && +test $skip != no && { - echo "$0: '.' is not on a suitable file system for this test" 1>&2 + echo "$0: '$skip' is not on a suitable file system for this test" 1>&2 echo "$0: skipping this test" 1>&2 (exit 77); exit 77 } |