tests, imsm: Test shouldn't call grow with chunk and level in one command

[thirdparty/mdadm.git] / tests / 03r0assem

diff --git a/tests/03r0assem b/tests/03r0assem
index 55205a36f91702e62387b5e5ffea655ba655d5c7..6744e3221062943989a2a74817c88e8de90d6ca0 100644 (file)
--- a/tests/03r0assem
+++ b/tests/03r0assem
@@ -4,129 +4,128 @@
 # uuid, md-minor on command line with wildcard devices
 # mdadm.conf file
 
-mdadm -CR $md2 -l0 -n3 $dev0 $dev1 $dev2 
+mdadm -CR $md2 -l0 -n3 $dev0 $dev1 $dev2
 check raid0
-tst="testdev $md2 3 $mdsize0 64"
+tst="testdev $md2 3 $mdsize1_l 512"
 $tst
 uuid=`mdadm -Db $md2 | sed 's/.*UUID=//'`
 mdadm -S $md2
 
-mdadm -A $md2 $dev0 $dev1 $dev2  
+mdadm -A $md2 $dev0 $dev1 $dev2
 $tst
 mdadm -S $md2
 
-mdadm -A $md2 -u $uuid $devlist 
+mdadm -A $md2 -u $uuid $devlist
 $tst
 mdadm -S $md2
 
-mdadm --assemble $md2 --super-minor=2 $devlist 
+mdadm --assemble $md2 --name=2 $devlist
 $tst
 mdadm -S $md2
 
 conf=$targetdir/mdadm.conf
-{ 
+{
   echo DEVICE $devlist
   echo array $md2 UUID=$uuid
 } > $conf
 
-mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2
 $tst
 mdadm -S $md2
 
-{ 
+{
   echo DEVICE $devlist
-  echo array $md2 super-minor=2
+  echo array $md2 name=2
 } > $conf
 
-mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2
 $tst
 mdadm -S $md2
 
 
-{ 
+{
   echo DEVICE $devlist
   echo array $md2 devices=$dev0,$dev1,$dev2
 } > $conf
 
-mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2
 $tst
 
 echo "DEVICE $devlist" > $conf
 mdadm -Db $md2 >> $conf
 mdadm -S $md2
 
-mdadm --assemble --scan --config=$conf $md2 
+mdadm --assemble --scan --config=$conf $md2
 $tst
 mdadm -S $md2
 
 echo "  metadata=0.90 devices=$dev0,$dev1,$dev2" >> $conf
-mdadm --assemble --scan --config=$conf $md2 
+mdadm --assemble --scan --config=$conf $md2
 $tst
 mdadm -S $md2
 
 
-### Now for version 1...
+### Now for version 0...
 
 mdadm --zero-superblock $dev0 $dev1 $dev2
-mdadm -CR $md2 -l0 --metadata=1.0 -n3 $dev0 $dev1 $dev2 
+mdadm -CR $md2 -l0 --metadata=0.90 -n3 $dev0 $dev1 $dev2
 check raid0
-tst="testdev $md2 3 $mdsize1 64"
+tst="testdev $md2 3 $mdsize0 512"
 $tst
 
 uuid=`mdadm -Db $md2 | sed 's/.*UUID=//'`
 mdadm -S $md2
 
-mdadm -A $md2 $dev0 $dev1 $dev2  
+mdadm -A $md2 $dev0 $dev1 $dev2
 $tst
 mdadm -S $md2
 
-mdadm -A $md2 -u $uuid $devlist 
+mdadm -A $md2 -u $uuid $devlist
 $tst
 mdadm -S $md2
 
-# version 1 has no super-minor
-# mdadm --assemble $md2 --super-minor=2 $devlist # 
-# $tst
-# mdadm -S $md2
+mdadm --assemble $md2 --super-minor=2 $devlist #
+$tst
+mdadm -S $md2
 
 conf=$targetdir/mdadm.conf
-{ 
+{
   echo DEVICE $devlist
   echo array $md2 UUID=$uuid
 } > $conf
 
-mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2
 $tst
 mdadm -S $md2
 
-#{ 
-#  echo DEVICE $devlist
-#  echo array $md2 super-minor=2
-#} > $conf
-#
-#mdadm -As -c $conf $md2 
-#$tst
-#mdadm -S $md2
+{
+  echo DEVICE $devlist
+  echo array $md2 super-minor=2
+} > $conf
+
+mdadm -As -c $conf $md2
+$tst
+mdadm -S $md2
 
 
-{ 
+{
   echo DEVICE $devlist
   echo array $md2 devices=$dev0,$dev1,$dev2
 } > $conf
 
-mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2
 $tst
 
 echo "DEVICE $devlist" > $conf
 mdadm -Db $md2 >> $conf
 mdadm -S $md2
 
-mdadm --assemble --scan --config=$conf $md2 
+mdadm --assemble --scan --config=$conf $md2
 $tst
 mdadm -S $md2
 
 echo "  metadata=1 devices=$dev0,$dev1,$dev2" >> $conf
-mdadm --assemble --scan --config=$conf $md2 
+mdadm --assemble --scan --config=$conf $md2
 $tst
 mdadm -S $md2