xfs
[Top] [All Lists]

[PATCH 05/12] 105: use TEST_DIR instead of a SCRATCH_DEV

To: xfs@xxxxxxxxxxx
Subject: [PATCH 05/12] 105: use TEST_DIR instead of a SCRATCH_DEV
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Tue, 10 Dec 2013 23:34:50 -0800
Cc: Stanislav Kholmanskikh <stanislav.kholmanskikh@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
References: <20131211073445.353655850@xxxxxxxxxxxxxxxxxxxxxx>
User-agent: quilt/0.60-1
The test does not require a fresh file system.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
 tests/generic/105 |   31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/tests/generic/105 b/tests/generic/105
index 2f99401..341d0b8 100755
--- a/tests/generic/105
+++ b/tests/generic/105
@@ -52,48 +52,39 @@ _supported_os IRIX Linux
 
 rm -f $seqres.full
 
-_require_scratch
 _require_acls
 
 _acl_setup_ids
 
-umount $SCRATCH_DEV >/dev/null 2>&1
-echo "*** MKFS ***"                         >>$seqres.full
-echo ""                                     >>$seqres.full
-_scratch_mkfs                               >>$seqres.full 2>&1 \
-       || _fail "mkfs failed"
-_scratch_mount                              >>$seqres.full 2>&1 \
-       || _fail "mount failed"
-
-cd $SCRATCH_MNT
+cd $TESTDIR
 
 # create a dir with out execute perms
-mkdir -m 600 subdir
+mkdir -m 600 subdir105
 
 # make it owned by $acl1
-chown $acl1 subdir
+chown $acl1 subdir105
 
 # put a file in the directory
-echo data > subdir/file
-_ls_l subdir/file | awk '{ print $1, $3 }'
+echo data > subdir105/file
+_ls_l subdir105/file | awk '{ print $1, $3 }'
 
 # add an ACL with a user ACE which has no exec permission 
 if [ "$HOSTOS" == "Linux" ]; then
-    setfacl -m u:$acl1:r subdir
+    setfacl -m u:$acl1:r subdir105
 elif [ "$HOSTOS" == "IRIX" ]; then
-    chacl u:$acl:r--,g::---,o::--- subdir
+    chacl u:$acl:r--,g::---,o::--- subdir105
 else
     echo "Unknown OS!"
     exit 1
 fi
 
-# With the bug this gives: `ls: subdir/file: Permission denied'
+# With the bug this gives: `ls: subdir105/file: Permission denied'
 # because one needs at least an exec perm somewhere in acl
 # However, this should not hold true for directories.
-_ls_l subdir/file | awk '{ print $1, $3 }'
+_ls_l subdir105/file | awk '{ print $1, $3 }'
 
-# With the bug this gives: `subdir/file2: Permission denied'.
-echo data2 > subdir/file2
+# With the bug this gives: `subdir105/file2: Permission denied'.
+echo data2 > subdir105/file2
 
 # success, all done
 status=0
-- 
1.7.10.4


<Prev in Thread] Current Thread [Next in Thread>