xfs
[Top] [All Lists]

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

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

diff --git a/tests/generic/069 b/tests/generic/069
index c3fa862..f55da37 100755
--- a/tests/generic/069
+++ b/tests/generic/069
@@ -39,18 +39,13 @@ trap "rm -rf $tmp.*; exit \$status" 0 1 2 3 15
 _supported_fs generic
 _supported_os IRIX Linux
 
-_require_scratch
 rm -f $seqres.full
 
-umount $SCRATCH_DEV >/dev/null 2>&1
+dir="$TEST_DIR/append"
 
-echo "*** mkfs"
-_scratch_mkfs >/dev/null 2>&1 || _fail "mkfs failed"
-
-echo "*** mount FS"
-_scratch_mount >/dev/null || _fail "mount failed"
-
-cd $SCRATCH_MNT
+rm -rf $dir
+mkdir $dir
+cd $dir
 
 sizes="1 20 300 40000 3000000 12345"
 for size in $sizes ; do
@@ -61,18 +56,18 @@ done
 cd $here
 
 wait
-ls -lh $SCRATCH_MNT >> $seqres.full
+ls -lh $dir >> $seqres.full
 echo "*** PIDs file" >> $seqres.full
-cat $SCRATCH_MNT/pids >> $seqres.full
+cat $dir/pids >> $seqres.full
 
-cat $SCRATCH_MNT/pids | while read pid size
+cat $dir/pids | while read pid size
 do
        echo "*** checking file with $size integers"
        echo checking pid=$pid size=$size >> $seqres.full
-       $here/src/append_reader $SCRATCH_MNT/testfile.$pid
+       $here/src/append_reader $dir/testfile.$pid
        status=$?
        [ $status -ne 0 ] && \
-               echo "maybe corrupt O_APPEND to $SCRATCH_MOUNT/testfile.$pid!"
+               echo "maybe corrupt O_APPEND to $dir/testfile.$pid!"
        echo status: $status >> $seqres.full
 done
 
diff --git a/tests/generic/069.out b/tests/generic/069.out
index 0d7b23c..491ea57 100644
--- a/tests/generic/069.out
+++ b/tests/generic/069.out
@@ -1,6 +1,4 @@
 QA output created by 069
-*** mkfs
-*** mount FS
 *** checking file with 1 integers
 *** checking file with 20 integers
 *** checking file with 300 integers
-- 
1.7.10.4


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