Move setup code to a function and introduce matching cleanup argument
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
0aaecb4330
commit
572d7091f7
58
test
58
test
|
@ -68,33 +68,35 @@ cleanup() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
trap cleanup 0 1 2 3 15
|
do_setup() {
|
||||||
|
trap cleanup 0 1 2 3 15
|
||||||
|
|
||||||
devlist=
|
devlist=
|
||||||
for d in 0 1 2 3 4 5 6 7 8 9 10 11 12
|
for d in 0 1 2 3 4 5 6 7 8 9 10 11 12
|
||||||
do
|
do
|
||||||
sz=$size
|
sz=$size
|
||||||
if [ $d -gt 7 ]; then sz=$ddfsize ; fi
|
if [ $d -gt 7 ]; then sz=$ddfsize ; fi
|
||||||
[ -f $targetdir/mdtest$d ] || dd if=/dev/zero of=$targetdir/mdtest$d count=$sz bs=1K > /dev/null 2>&1
|
[ -f $targetdir/mdtest$d ] || dd if=/dev/zero of=$targetdir/mdtest$d count=$sz bs=1K > /dev/null 2>&1
|
||||||
[ -b /dev/loop$d ] || mknod /dev/loop$d b 7 $d
|
[ -b /dev/loop$d ] || mknod /dev/loop$d b 7 $d
|
||||||
if [ $d -eq 7 ]
|
if [ $d -eq 7 ]
|
||||||
then
|
then
|
||||||
losetup /dev/loop$d $targetdir/mdtest6 # for multipath use
|
losetup /dev/loop$d $targetdir/mdtest6 # for multipath use
|
||||||
else
|
else
|
||||||
losetup /dev/loop$d $targetdir/mdtest$d
|
losetup /dev/loop$d $targetdir/mdtest$d
|
||||||
fi
|
fi
|
||||||
eval dev$d=/dev/loop$d
|
eval dev$d=/dev/loop$d
|
||||||
eval file$d=$targetdir/mdtest$d
|
eval file$d=$targetdir/mdtest$d
|
||||||
eval devlist=\"\$devlist \$dev$d\"
|
eval devlist=\"\$devlist \$dev$d\"
|
||||||
#" <-- add this quote to un-confuse vim syntax highlighting
|
#" <-- add this quote to un-confuse vim syntax highlighting
|
||||||
done
|
done
|
||||||
path0=$dev6
|
path0=$dev6
|
||||||
path1=$dev7
|
path1=$dev7
|
||||||
|
|
||||||
ulimit -c unlimited
|
ulimit -c unlimited
|
||||||
[ -f /proc/mdstat ] || modprobe md_mod
|
[ -f /proc/mdstat ] || modprobe md_mod
|
||||||
echo 2000 > /proc/sys/dev/raid/speed_limit_max
|
echo 2000 > /proc/sys/dev/raid/speed_limit_max
|
||||||
echo 0 > /sys/module/md_mod/parameters/start_ro
|
echo 0 > /sys/module/md_mod/parameters/start_ro
|
||||||
|
}
|
||||||
|
|
||||||
# mdadm always adds --quiet, and we want to see any unexpected messages
|
# mdadm always adds --quiet, and we want to see any unexpected messages
|
||||||
mdadm() {
|
mdadm() {
|
||||||
|
@ -246,6 +248,7 @@ do_help() {
|
||||||
echo " --save-logs Save all logs in <logdir>"
|
echo " --save-logs Save all logs in <logdir>"
|
||||||
echo " --no-error Don't stop on error, ie. run all tests"
|
echo " --no-error Don't stop on error, ie. run all tests"
|
||||||
echo " setup Setup test environment and exit"
|
echo " setup Setup test environment and exit"
|
||||||
|
echo " cleanup Cleanup test environment"
|
||||||
echo " <prefix> Run tests with <prefix>"
|
echo " <prefix> Run tests with <prefix>"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,8 +261,13 @@ parse_args() {
|
||||||
;;
|
;;
|
||||||
setup)
|
setup)
|
||||||
echo "mdadm test environment setup"
|
echo "mdadm test environment setup"
|
||||||
|
do_setup
|
||||||
trap 0; exit 0
|
trap 0; exit 0
|
||||||
;;
|
;;
|
||||||
|
cleanup)
|
||||||
|
cleanup
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
--tests=*)
|
--tests=*)
|
||||||
TESTLIST=`expr "x$i" : 'x[^=]*=\(.*\)' | sed -e 's/,/ /g'`
|
TESTLIST=`expr "x$i" : 'x[^=]*=\(.*\)' | sed -e 's/,/ /g'`
|
||||||
;;
|
;;
|
||||||
|
@ -296,6 +304,8 @@ done
|
||||||
|
|
||||||
parse_args $@
|
parse_args $@
|
||||||
|
|
||||||
|
do_setup
|
||||||
|
|
||||||
if [ "$savelogs" == "1" ]; then
|
if [ "$savelogs" == "1" ]; then
|
||||||
echo "Saving logs to $logdir"
|
echo "Saving logs to $logdir"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue