Merge branch 'master' into devel-3.0

[thirdparty/mdadm.git] / test

diff --git a/test b/test
index f0a4388f592e5bdc0155abffd630d7c824b4c54b..a62d7e319f7343dc4c9d89006c738c893c49ce2c 100644 (file)
--- a/test
+++ b/test
@@ -21,15 +21,23 @@ fi
 
 # assume md0, md1, md2 exist in /dev
 md0=/dev/md0 md1=/dev/md1 md2=/dev/md2
+mdp0=/dev/md_d0
+mdp1=/dev/md_d1
 
 # We test mdadm on loop-back block devices.
 # dir for storing files should be settable by command line maybe
 targetdir=/var/tmp
 size=20000
+# super0, round down to multiple of 64 and substract 64
 mdsize0=19904
+# super00 is nested, subtract 128
+mdsize00=19840
+# super1.0 round down to multiple of 2, subtract 8
 mdsize1=19992
-mdsize11=19996
-mdsize12=19992
+# subtract another 4 for bitmaps
+mdsize1b=19988
+mdsize11=19992
+mdsize12=19988
 
 cleanup() {
        $mdadm -Ss
@@ -65,6 +73,7 @@ fi
 
 # mdadm always adds --quiet, and we want to see any unexpected messages
 mdadm() {
+    rm -f $targetdir/stderr
     case $* in
        *-C* ) $mdadm 2> $targetdir/stderr --quiet "$@" --auto=yes;;
         * )   $mdadm 2> $targetdir/stderr --quiet "$@"
@@ -161,6 +170,7 @@ for script in tests/$prefix tests/$prefix*[^~]
 do
   if [ -f "$script" ]
   then
+   rm -f $targetdir/stderr
    # source script in a subshell, so it has access to our
    # namespace, but cannot change it.
    if ( set -ex ; . $script )  2> $targetdir/log