Default to --auto=yes

[thirdparty/mdadm.git] / test

diff --git a/test b/test
index 0a45d502982ed72afcb57ee6a2fe657d14019a70..75c53d87b794a7b60489e3e9dd42d74d1dd56ebc 100644 (file)
--- a/test
+++ b/test
@@ -34,7 +34,8 @@ 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,10 +59,16 @@ 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 --quiet "$@"
+    case $* in
+       *-C* ) $mdadm --quiet "$@" --auto=yes;;
+        * )   $mdadm --quiet "$@"
+    esac
 }
 
 # check various things
@@ -78,7 +86,7 @@ check() {
                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; }
      ;;
@@ -128,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
 }