tests: use $config to store test config path
We also need to tell Monitor where to look for Policy in 11spare-migration tests Signed-off-by: Anna Czarnowska <anna.czarnowska@intel.com> Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
7187750e8d
commit
ed02d9cc04
2
test
2
test
|
@ -48,6 +48,8 @@ mdsize12=19988
|
||||||
# ddf needs bigger devices as 32Meg is reserved!
|
# ddf needs bigger devices as 32Meg is reserved!
|
||||||
ddfsize=65536
|
ddfsize=65536
|
||||||
|
|
||||||
|
config=/tmp/mdadm.conf
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
udevadm settle
|
udevadm settle
|
||||||
$mdadm -Ssq 2> /dev/null
|
$mdadm -Ssq 2> /dev/null
|
||||||
|
|
|
@ -25,7 +25,7 @@ listfailed="yes"
|
||||||
monitor(){
|
monitor(){
|
||||||
[ -z $monitorpid ] || return
|
[ -z $monitorpid ] || return
|
||||||
if [ "$scan" == "yes" ]; then
|
if [ "$scan" == "yes" ]; then
|
||||||
$mdadm -F -d 1 --scan --mail root@localhost &
|
$mdadm -F -d 1 --scan --mail root@localhost -c $config &
|
||||||
monitorpid=$!
|
monitorpid=$!
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
@ -44,10 +44,10 @@ monitor(){
|
||||||
done
|
done
|
||||||
if [ -n "$mddevs" ]; then
|
if [ -n "$mddevs" ]; then
|
||||||
if [ "$verbose" != "yes" ]; then
|
if [ "$verbose" != "yes" ]; then
|
||||||
$mdadm -F -d 1 $mddevs >&2 &
|
$mdadm -F -d 1 $mddevs -c $config >&2 &
|
||||||
monitorpid=$!
|
monitorpid=$!
|
||||||
else
|
else
|
||||||
$mdadm -F -t -d 1 $mddevs &
|
$mdadm -F -t -d 1 $mddevs -c $config &
|
||||||
monitorpid=$!
|
monitorpid=$!
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
11
tests/utils
11
tests/utils
|
@ -15,7 +15,7 @@ devices="/dev/loop[0-9] /dev/loop10 /dev/loop11 /dev/loop12"
|
||||||
# uses testdsc and platform global variables
|
# uses testdsc and platform global variables
|
||||||
err(){
|
err(){
|
||||||
echo >&2 "ERROR: $*"
|
echo >&2 "ERROR: $*"
|
||||||
cat /tmp/mdadm.conf >&2 || true
|
cat $config >&2 || true
|
||||||
cat /proc/mdstat >&2
|
cat /proc/mdstat >&2
|
||||||
[ -z "$testdsc" ] || { echo >&2 $platform: $testdsc "- failed"; }
|
[ -z "$testdsc" ] || { echo >&2 $platform: $testdsc "- failed"; }
|
||||||
ps -e | grep mdadm >&2 || true
|
ps -e | grep mdadm >&2 || true
|
||||||
|
@ -45,7 +45,7 @@ tidyup(){
|
||||||
mdadm -Ss
|
mdadm -Ss
|
||||||
mdadm --zero-superblock $devices || true
|
mdadm --zero-superblock $devices || true
|
||||||
udevadm settle
|
udevadm settle
|
||||||
rm -f /tmp/mdadm.conf
|
rm -f $config
|
||||||
}
|
}
|
||||||
|
|
||||||
trap tidyup 0 1 2 3 15
|
trap tidyup 0 1 2 3 15
|
||||||
|
@ -167,7 +167,6 @@ chksparemoved(){
|
||||||
|
|
||||||
# for domains defined through policy
|
# for domains defined through policy
|
||||||
createconfig(){
|
createconfig(){
|
||||||
conf=/tmp/mdadm.conf
|
|
||||||
if [ "$1" != "a" ]; then
|
if [ "$1" != "a" ]; then
|
||||||
{
|
{
|
||||||
domain=$1
|
domain=$1
|
||||||
|
@ -181,12 +180,12 @@ if [ "$1" != "a" ]; then
|
||||||
echo "$echo"
|
echo "$echo"
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
} >> $conf
|
} >> $config
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
echo "DEVICES $devlist /dev/md1*"
|
echo "DEVICES $devlist /dev/md1*"
|
||||||
mdadm -Ebs
|
mdadm -Ebs
|
||||||
} > $conf
|
} > $config
|
||||||
fi
|
fi
|
||||||
#[ "$verbose" != "yes" ] || cat /tmp/mdadm.conf | grep policy || true
|
#[ "$verbose" != "yes" ] || cat $config | grep policy || true
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue