FIX: sync_completed_fd handler has to be closed

[thirdparty/mdadm.git] / test

diff --git a/test b/test
index 09b17ced5b6f90e1be78824a34fa4417b3b48966..d1b458263e1757dbb62ff85846f9dc6996143865 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!
@@ -47,7 +53,8 @@ cleanup() {
        $mdadm -Ssq
        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
+           losetup -d /dev/loop$d ; # rm -f $targetdir/mdtest$d
+           rm -f /dev/disk/by-path/loop*
         done
 }
 
@@ -161,6 +168,7 @@ no_errors() {
 # basic device test
 
 testdev() {
+   udevadm settle
    dev=$1
    cnt=$2
    dvsize=$3
@@ -171,6 +179,11 @@ testdev() {
    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