Create: cleanup after failed create in duplicated array member case

[thirdparty/mdadm.git] / test

diff --git a/test b/test
index 133f8ff41a33b41d46fe0cfe8860207a881f6fa8..a31ad40fd379470d15829c2d2bcb4a8f933698d0 100644 (file)
--- a/test
+++ b/test
@@ -34,9 +34,15 @@ mdsize0=19904
 mdsize00=19840
 # super1.0 round down to multiple of 2, subtract 8
 mdsize1=19992
+mdsize1a=19988
+mdsize12=19988
+# super1.2 for linear: round to multiple of 2, subtract 4
+mdsize1_l=18976
+mdsize2_l=18976
 # subtract another 4 for bitmaps
 mdsize1b=19988
 mdsize11=19992
+mdsize11a=18944
 mdsize12=19988
 
 # ddf needs bigger devices as 32Meg is reserved!
@@ -161,14 +167,22 @@ no_errors() {
 # basic device test
 
 testdev() {
+   udevadm settle
    dev=$1
    cnt=$2
    dvsize=$3
    chunk=$4
-   mkfs -j $dev > /dev/null 2>&1 && fsck -fn $dev >&2
+   if [ -z "$5" ]; then
+      mkfs -j $dev > /dev/null 2>&1 && fsck -fn $dev >&2
+   fi
    dsize=$[dvsize/chunk]
    dsize=$[dsize*chunk]
    rasize=$[dsize*2*cnt]
+   # rasize is in sectors
+   if [ -n "$DEV_ROUND_K" ]; then
+      rasize=$[rasize/DEV_ROUND_K/2]
+      rasize=$[rasize*DEV_ROUND_K*2]
+   fi
    if [ `/sbin/blockdev --getsize $dev` -eq 0 ]; then sleep 2 ; fi
    if [ $rasize -ne `/sbin/blockdev --getsize $dev` ]
    then