tests/08imsm-overlap - remove duplicated code

This test contains a lot of code that is also in env-imsm-template.
So remove it and simple source the other.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/tests/08imsm-overlap b/tests/08imsm-overlap
index 37e04618a9132a4110ea23fb54dd2f14a0d2111d..f55c84e10f6be31664ecd77bf667eaa3a6452147 100644 (file)
--- a/tests/08imsm-overlap
+++ b/tests/08imsm-overlap
@@ -1,54 +1,6 @@
-imsm_check() {
-   case $1 in
-    container )
-      grep -s " blocks super external:imsm" /proc/mdstat > /dev/null || {
-               echo >&2 "ERROR correctly formed container not found"; cat /proc/mdstat; exit 1;}
-      ;;
-    member )
-      member=$2
-      num_disks=$3
-      level=$4
-      size=$5
-      offset=$6
-      err=0
 
-      eval `stat -L -c "let major=0x%t; let minor=0x%T;" $member`
-      sysfs=/sys/dev/block/${major}:${minor}
-      if [ ! -f ${sysfs}/md/array_state ]; then
-           echo "member array $member not found" >&2
-           cat /proc/mdstat >&2
-           exit 1
-      fi
-      for i in `seq 0 $((num_disks-1))`
-      do
-         _offset=`cat ${sysfs}/md/rd${i}/offset`
-         if [ $offset -ne $((_offset/2)) ]; then
-           echo "offset mismatch expected $offset got $_offset" >&2
-            err=$((err+1))
-         fi
-         _size=`cat ${sysfs}/md/rd${i}/size`
-         if [ $size -ne $_size ]; then
-           echo "offset mismatch expected $size got $_size" >&2
-            err=$((err+1))
-         fi
-      done
+. tests/env-imsm-template
 
-      if [ $err -gt 0 ]; then
-          echo "$member failed check" >&2
-          cat /proc/mdstat >&2
-         mdadm -E /dev/loop0 >&2
-          exit 1
-      fi
-      ;;
-    * ) echo >&2 ERROR unknown check $1 ; exit 1;
-   esac
-}
-
-export IMSM_DEVNAME_AS_SERIAL=1
-export IMSM_NO_PLATFORM=1
-container=/dev/md/container
-member0=/dev/md/vol0
-member1=/dev/md/vol1
 member2=/dev/md/vol2
 member3=/dev/md/vol3
 member4=/dev/md/vol4
@@ -70,14 +22,14 @@ mdadm -CR $member4 $dev4 $dev5 -n $num_disks -l $level -z $size
 udevadm settle
 
 offset=0
-imsm_check member $member0 $num_disks $level $size $offset
+imsm_check member $member0 $num_disks $level $size 1024 $offset
 offset=$((offset+size+2048))
-imsm_check member $member1 $num_disks $level $size $offset
+imsm_check member $member1 $num_disks $level $size 1024 $offset
 offset=$((offset+size+2048))
-imsm_check member $member2 $num_disks $level $size $offset
+imsm_check member $member2 $num_disks $level $size 1024 $offset
 # at this point there should be more freespace at the start of the disk
 # than the end
 offset=0
-imsm_check member $member3 $num_disks $level $size $offset
+imsm_check member $member3 $num_disks $level $size 1024 $offset
 offset=$((offset+size+2048))
-imsm_check member $member4 $num_disks $level $size $offset
+imsm_check member $member4 $num_disks $level $size 1024 $offset