Default to --auto=yes

[thirdparty/mdadm.git] / test

diff --git a/test b/test
index b505fa9d107ad24a7254e77654433c524e957723..75c53d87b794a7b60489e3e9dd42d74d1dd56ebc 100644 (file)
--- a/test
+++ b/test
@@ -24,17 +24,18 @@ md0=/dev/md0 md1=/dev/md1 md2=/dev/md2
 
 # We test mdadm on loop-back block devices.
 # dir for storing files should be settable by command line maybe
-targetdir=/tmp
+targetdir=/var/tmp
 size=20000
 mdsize0=19904
-mdsize1=19928
-mdsize11=19935
-mdsize12=19931
+mdsize1=19992
+mdsize11=19996
+mdsize12=19992
 
 cleanup() {
        $mdadm -Ss
        for d in 0 1 2 3 4 5 6 7
-       do losetup -d /dev/loop$d ; # rm -f $targetdir/mdtest$d
+       do
+           losetup -d /dev/loop$d ; # rm -f $targetdir/mdtest$d
         done
 }
 
@@ -44,6 +45,7 @@ devlist=
 for d in 0 1 2 3 4 5 6 7
 do
    [ -f $targetdir/mdtest$d ] || dd if=/dev/zero of=$targetdir/mdtest$d count=$size bs=1K > /dev/null 2>&1
+   [ -b /dev/loop$d ] || mknod /dev/loop$d b 7 $d
    if [ $d -eq 7 ]
    then
      losetup /dev/loop$d $targetdir/mdtest6 # for multipath use
@@ -57,21 +59,34 @@ done
 path0=$dev6
 path1=$dev7
 
+if [ " $1" = " setup" ]
+then trap 0 ; exit 0
+fi
 
 # mdadm always adds --quiet, and we want to see any unexpected messages
 mdadm() {
-    $mdadm 2>&1 --quiet "$@"
+    case $* in
+       *-C* ) $mdadm --quiet "$@" --auto=yes;;
+        * )   $mdadm --quiet "$@"
+    esac
 }
 
 # check various things
 check() {
    case $1 in
+    spares )
+       spares=`tr '] ' '\012\012' < /proc/mdstat | grep -c '(S)' || exit 0`
+       if [ $spares -ne $2 ]
+       then
+          echo >&2 "ERROR expected $2 spares, found $spares"; exit 1;
+       fi
+      ;;
     raid* | linear )
       grep -s "active $1 " /proc/mdstat > /dev/null || {
                echo >&2 "ERROR active $1 not found" ; cat /proc/mdstat ; exit 1;}
      ;;
     resync | recovery )
-      sleep 0.1
+      sleep 0.5
       grep -s $1 /proc/mdstat > /dev/null || {
                echo >&2 ERROR no $1 happening; cat /proc/mdstat; exit 1; }
      ;;
@@ -121,10 +136,10 @@ testdev() {
    mkfs -j $dev > /dev/null 2>&1 && fsck -fn $dev >&2
    dsize=$[dvsize/chunk]
    dsize=$[dsize*chunk]
-   rasize=$[dsize*1024*cnt]
-   if [ $rasize -ne `/sbin/blockdev --getsize64 $dev` ]
+   rasize=$[dsize*2*cnt]
+   if [ $rasize -ne `/sbin/blockdev --getsize $dev` ]
    then
-     echo "ERROR: size is wrong for $dev: $cnt * $dvsize (chunk=$chunk) = $rasize, not `/sbin/blockdev --getsize64 $dev`"
+     echo "ERROR: size is wrong for $dev: $cnt * $dvsize (chunk=$chunk) = $rasize, not `/sbin/blockdev --getsize $dev`"
      exit 1
    fi
 }