imsm: fix activate_spare off-by-one

[thirdparty/mdadm.git] / test

diff --git a/test b/test
index 1cd341f19b6a63a111070610543a2a7b9289497b..133f8ff41a33b41d46fe0cfe8860207a881f6fa8 100644 (file)
--- a/test
+++ b/test
@@ -39,10 +39,13 @@ mdsize1b=19988
 mdsize11=19992
 mdsize12=19988
 
+# ddf needs bigger devices as 32Meg is reserved!
+ddfsize=65536
+
 cleanup() {
        udevadm settle
        $mdadm -Ssq
-       for d in 0 1 2 3 4 5 6 7
+       for d in 0 1 2 3 4 5 6 7  8 9 10 11 12
        do
            losetup -d /dev/loop$d ; # rm -f $targetdir/mdtest$d
         done
@@ -51,9 +54,11 @@ cleanup() {
 trap cleanup 0 1 2 3 15
 
 devlist=
-for d in 0 1 2 3 4 5 6 7
+for d in 0 1 2 3 4 5 6 7 8 9 10 11 12
 do
-   [ -f $targetdir/mdtest$d ] || dd if=/dev/zero of=$targetdir/mdtest$d count=$size bs=1K > /dev/null 2>&1
+   sz=$size
+   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
    [ -b /dev/loop$d ] || mknod /dev/loop$d b 7 $d
    if [ $d -eq 7 ]
    then
@@ -69,6 +74,8 @@ done
 path0=$dev6
 path1=$dev7
 
+ulimit -c unlimited
+[ -f /proc/mdstat ] || modprobe md_mod
 echo 2000 > /proc/sys/dev/raid/speed_limit_max
 echo 0 > /sys/module/md_mod/parameters/start_ro
 
@@ -86,7 +93,9 @@ mdadm() {
        *-C* ) $mdadm 2> $targetdir/stderr --quiet "$@" --auto=yes;;
         * )   $mdadm 2> $targetdir/stderr --quiet "$@"
     esac
+    rv=$?
     cat >&2 $targetdir/stderr
+    return $rv
 }
 
 # check various things