make 225 use SCRATCH_DEV

Use the scratch device for test 225 so that both custom mkfs and
mount options impact the test (e.g. filesystem block size). This
exposes test failures when using 512 byte block sizes, which
currently not tested unless the test device is specifically created
with a 512 byte block size.

Also clean up the file names to include the test number, and don't
remove the test files after the test has finished so that it leaves
behind a corpse that can be dissected when the test fails.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Dave Chinner
2011-10-10 02:14:14 +00:00
committed by Alex Elder
parent 3196f530a8
commit 3571a1a195
+15 -18
View File
@@ -45,21 +45,18 @@ _cleanup()
# real QA test starts here # real QA test starts here
_supported_fs generic _supported_fs generic
_supported_os Linux _supported_os Linux
_require_scratch
_setup_testdir _scratch_mkfs > /dev/null 2>&1
_scratch_mount > /dev/null 2>&1
rm -f $seq.full
fiemapfile=$SCRATCH_MNT/$seq.fiemap
fiemaplog=$SCRATCH_MNT/$seq.log
fiemapfile=$TEST_DIR/fiemap.$$
fiemaplog=$TEST_DIR/fiemap.$$.log
[ -x $here/src/fiemap-tester ] || _notrun "fiemap-tester not built" [ -x $here/src/fiemap-tester ] || _notrun "fiemap-tester not built"
_cleanup()
{
rm -f $fiemapfile
rm -f $fiemaplog
}
trap "_cleanup; exit \$status" 0 1 2 3 15
seed=`date +%s` seed=`date +%s`
echo "using seed $seed" >> $fiemaplog echo "using seed $seed" >> $fiemaplog
@@ -67,16 +64,16 @@ echo "using seed $seed" >> $fiemaplog
echo "fiemap run without preallocation, with sync" echo "fiemap run without preallocation, with sync"
$here/src/fiemap-tester -q -S -s $seed -p 0 -r 200 $fiemapfile 2>&1 | tee -a $fiemaplog $here/src/fiemap-tester -q -S -s $seed -p 0 -r 200 $fiemapfile 2>&1 | tee -a $fiemaplog
if [ $? -ne 0 ]; then
if grep -q "Operation not supported" $fiemaplog; then
_notrun "FIEMAP not supported by this filesystem type: $FSTYP"
fi
status=$?
exit
fi
echo "fiemap run without preallocation or sync" echo "fiemap run without preallocation or sync"
$here/src/fiemap-tester -q -s $seed -p 0 -r 200 $fiemapfile 2>&1 | tee -a $fiemaplog $here/src/fiemap-tester -q -s $seed -p 0 -r 200 $fiemapfile 2>&1 | tee -a $fiemaplog
if grep -q "Operation not supported" $fiemaplog; then
_notrun "FIEMAP not supported by this filesystem type: $FSTYP"
fi
rm -f $fiemapfile
rm -f $fiemaplog
rm -f $seq.full
status=0 status=0
exit exit