Fixed merge problems

[xfstests-dev.git] / 051

diff --git a/051 b/051
index 2e91304135a67fda4a311822bec95744ad8c8cb8..b16adb1c327a3d7de47fa552957963690df374e9 100755 (executable)
--- a/051
+++ b/051
@@ -1,5 +1,5 @@
 #! /bin/sh
-# XFS QA Test No. 051
+# FS QA Test No. 051
 #
 # Test out ACLs.
 #
@@ -53,8 +53,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
+    cd /
     rm -f $tmp.*
-    rm -rf $TEST_DIR/$seq.dir1
+    [ -n "$testdir" ] && rm -rf $testdir/$seq.dir1
+    _cleanup_testdir
 }
 
 # -----
@@ -80,23 +82,29 @@ _cleanup()
 #   -> this would be done by simultaneously matching on ACEs
 #   -> interesting if it allows user to specify ACEs in any order
 #
+
+# real QA test starts here
+_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
 
+_setup_testdir
+
 _need_to_be_root
 _acl_setup_ids
 _acl_requirements
-[ -x $runas ] || _notrun "$runas executable not found"
 
 # get dir
-cd $TEST_DIR
+cd $testdir
 rm -rf $seq.dir1
 mkdir $seq.dir1
 cd $seq.dir1
 
-#-------------------------------------------------------
-# real QA test starts here
 echo "QA output created by $seq"
-
 echo ""
 echo "=== Test minimal ACE ==="