xfstests: rename _acl_requirements to _require_acls

Most requirement tests are named _require_foo, so just
make this more consistent.

Also remove a few redundant tests for /usr/bin/chacl
since _require_acls covers that.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/051 b/051
index 238abe971ca0f5c49e6f2d33bcc35d1f754b7470..12febd3c0cecad36e00d081570b84286dc641938 100755 (executable)
--- a/051
+++ b/051
@@ -73,7 +73,6 @@ _cleanup()
 _supported_fs xfs udf
 _supported_os Linux
 
-[ -x /usr/bin/chacl ] || _notrun "chacl executable not found"
 [ -x $runas ] || _notrun "$runas executable not found"
 
 rm -f $seq.full
@@ -82,7 +81,7 @@ _setup_testdir
 
 _need_to_be_root
 _acl_setup_ids
-_acl_requirements
+_require_acls
 
 # get dir
 cd $testdir

diff --git a/053 b/053
index 439cbe6523d49a8a67437a623e3c091c9e3ca87a..ac2162d5288b5bfe144469084c87986337e1851f 100755 (executable)
--- a/053
+++ b/053
@@ -42,7 +42,7 @@ _supported_fs generic
 _supported_os Linux
 
 _require_scratch
-_acl_requirements
+_require_acls
 _acl_setup_ids
 _do_die_on_error=y
 test=$SCRATCH_MNT/test

diff --git a/067 b/067
index 5ab743e3747e6058fa9c4af5dc0795ec12abcd65..f1c211f895223950547b7d40d3cf76b6d9f5ba62 100755 (executable)
--- a/067
+++ b/067
@@ -41,10 +41,8 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 _supported_fs xfs
 _supported_os Linux
 
-[ -x /usr/bin/chacl ] || _notrun "chacl executable not found"
-
 _need_to_be_root
-_acl_requirements
+_require_acls
 _require_scratch
 
 # set up fs for 1K inodes

diff --git a/077 b/077
index a3d93348d463ca829fa3336a72290ac2140be7fc..ea81c078ff50bcbc04ebf60f4fb6119ea84b5044 100755 (executable)
--- a/077
+++ b/077
@@ -53,7 +53,7 @@ _supported_os Linux
 [ ! -d $filler ] && _notrun "No directory to source files from"
 
 _require_scratch
-_acl_requirements
+_require_acls
 
 echo "*** create filesystem"
 

diff --git a/099 b/099
index 90af18fa09bc5aaf24e5b0c32338d3ea881600e1..b68bfcd41a7f0f80686d097b518bcd9c49b3062c 100755 (executable)
--- a/099
+++ b/099
@@ -81,7 +81,8 @@ _supported_fs generic
 _supported_os IRIX
 
 _acl_setup_ids
-_acl_requirements
+_require_acls
+
 [ -x $runas ] || _notrun "$runas executable not found"
 
 # get dir

diff --git a/105 b/105
index 9544c66379fa623f425f29ba454c27a609cf22eb..aba1f6df677bd1acbab16632204d8e9de2956460 100755 (executable)
--- a/105
+++ b/105
@@ -56,7 +56,7 @@ rm -f $seq.full
 _require_scratch
 
 _acl_setup_ids
-_acl_requirements
+_require_acls
 
 umount $SCRATCH_DEV >/dev/null 2>&1
 echo "*** MKFS ***"                         >>$seq.full

diff --git a/common.attr b/common.attr
index d12cc02bf4a7f97e6b8fcd7c0dd04a75e0a86a14..5019884a5bcb9c3d86cc9881f971d5fea30d2c8a 100644 (file)
--- a/common.attr
+++ b/common.attr
@@ -112,7 +112,7 @@ _filter_aces_notypes()
 
 # test if acl code will work
 #
-_acl_requirements()
+_require_acls()
 {
     xfsdir=$TEST_DIR