xfs
[Top] [All Lists]

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

To: xfs@xxxxxxxxxxx
Subject: [PATCH 12/12] 319: use TEST_DIR instead of a SCRATCH_DEV
From: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Date: Tue, 10 Dec 2013 23:34:57 -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/319     |   12 +++++-------
 tests/generic/319.out |    4 ++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/tests/generic/319 b/tests/generic/319
index 046969f..c382bae 100755
--- a/tests/generic/319
+++ b/tests/generic/319
@@ -51,20 +51,18 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
 _supported_os Linux
 _supported_fs generic
 _require_acls
-_require_scratch
 _need_to_be_root
 
 rm -f $seqres.full
 
-_scratch_mkfs > /dev/null 2>&1
-_scratch_mount
+testdir="$TEST_DIR/testdir319"
 
-mkdir $SCRATCH_MNT/testdir
-setfacl -d --set u::rwx,g::rwx,o::- $SCRATCH_MNT/testdir
-getfacl --absolute-names $SCRATCH_MNT/testdir | _filter_scratch
+mkdir $testdir
+setfacl -d --set u::rwx,g::rwx,o::- $testdir
+getfacl --absolute-names $testdir | _filter_test_dir
 
 mkdir $SCRATCH_MNT/testdir/testsubdir
-getfacl --absolute-names $SCRATCH_MNT/testdir/testsubdir | _filter_scratch
+getfacl --absolute-names $testdir/testsubdir | _filter_test_dir
 
 # success, all done
 status=0
diff --git a/tests/generic/319.out b/tests/generic/319.out
index b090bfa..7897647 100644
--- a/tests/generic/319.out
+++ b/tests/generic/319.out
@@ -1,5 +1,5 @@
 QA output created by 319
-# file: SCRATCH_MNT/testdir
+# file: TEST_DIR/testdir319
 # owner: root
 # group: root
 user::rwx
@@ -9,7 +9,7 @@ default:user::rwx
 default:group::rwx
 default:other::---
 
-# file: SCRATCH_MNT/testdir/testsubdir
+# file: TEST_DIR/testdir319/testsubdir
 # owner: root
 # group: root
 user::rwx
-- 
1.7.10.4


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