xfstests: remove fio config files after finished test

After finished test, temporarily fio config file should be removed.
This commit tries to fix this problem in the following test cases:
  - generic/299-300
  - ext4/301-304
  - shared/305

Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Acked-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Zheng Liu
2013-05-14 08:35:44 -05:00
committed by Rich Johnston
parent ef6b444461
commit 05aab5cf04
7 changed files with 36 additions and 28 deletions
+5 -4
View File
@@ -30,6 +30,7 @@ echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -47,7 +48,7 @@ NUM_JOBS=$((4*LOAD_FACTOR))
BLK_DEV_SIZE=`blockdev --getsz $SCRATCH_DEV`
FILE_SIZE=$((BLK_DEV_SIZE * 512))
cat >$tmp-$seq.fio <<EOF
cat >$fio_config <<EOF
###########
# $seq test fio activity
# Filenames derived from jobsname and jobid like follows:
@@ -108,15 +109,15 @@ rw=randrw
filename=buffered-aio-verifier
EOF
_require_fio $tmp-$seq.fio
_require_fio $fio_config
_workout()
{
echo ""
echo "Run fio with random aio-dio pattern"
echo ""
cat $tmp-$seq.fio >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio &
cat $fio_config >> $seqres.full
run_check $FIO_PROG $fio_config &
pid=$!
echo "Start fallocate/truncate loop"
+5 -4
View File
@@ -30,6 +30,7 @@ echo "QA output created by $seq"
here=`pwd`
tmp=/tmp/$$
fio_config=$tmp.fio
status=1 # failure is the default!
trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
@@ -51,7 +52,7 @@ then
fi
FS_SIZE=$((BLK_DEV_SIZE * 512))
cat >$tmp-$seq.fio <<EOF
cat >$fio_config <<EOF
###########
# $seq test fio activity
# Run DIO, fallocate and punch_hole threads on a single in parallel
@@ -128,11 +129,11 @@ _workout()
echo ""
echo "Run fio with random aio-dio pattern"
echo ""
cat $tmp-$seq.fio >> $seqres.full
run_check $FIO_PROG $tmp-$seq.fio
cat $fio_config >> $seqres.full
run_check $FIO_PROG $fio_config
}
_require_fio $tmp-$seq.fio
_require_fio $fio_config
_scratch_mkfs_sized $FS_SIZE >> $seqres.full 2>&1
_scratch_mount