Add 'quite' option and tidy up some tests.

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

diff --git a/tests/03r0assem b/tests/03r0assem
index 96da6a56ba92548897bc94a3255bc25639cb914f..0d53901a2d1f19b6da8a9c9eeba47147eba66498 100644 (file)
--- a/tests/03r0assem
+++ b/tests/03r0assem
@@ -1,28 +1,27 @@
-set -e
 
 # create a raid0 array from 3 devices, and assemble it in a multitude of ways.
 # explicitly list devices
 # uuid, md-minor on command line with wildcard devices
 # mdadm.conf file
 
-$mdadm -CR $md2 -l0 -n3 $dev0 $dev1 $dev2 
-$check raid0
-tst="sh tests/testdev $md2 3 $mdsize0 64"
+mdadm -CR $md2 -l0 -n3 $dev0 $dev1 $dev2 
+check raid0
+tst="testdev $md2 3 $mdsize0 64"
 $tst
-uuid=`$mdadm -Db $md2 | sed 's/.*UUID=//'`
-$mdadm -S $md2
+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 -S $md2
 
-$mdadm -A $md2 -u $uuid $devlist 
+mdadm -A $md2 -u $uuid $devlist 
 $tst
-$mdadm -S $md2
+mdadm -S $md2
 
-$mdadm --assemble $md2 --super-minor=2 $devlist 
+mdadm --assemble $md2 --super-minor=2 $devlist 
 $tst
-$mdadm -S $md2
+mdadm -S $md2
 
 conf=$targetdir/mdadm.conf
 { 
@@ -30,18 +29,18 @@ conf=$targetdir/mdadm.conf
   echo array $md2 UUID=$uuid
 } > $conf
 
-$mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2 
 $tst
-$mdadm -S $md2
+mdadm -S $md2
 
 { 
   echo DEVICE $devlist
   echo array $md2 super-minor=2
 } > $conf
 
-$mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2 
 $tst
-$mdadm -S $md2
+mdadm -S $md2
 
 
 { 
@@ -49,46 +48,46 @@ $mdadm -S $md2
   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 -Db $md2 >> $conf
+mdadm -S $md2
 
-$mdadm --assemble --scan --config=$conf $md2 
+mdadm --assemble --scan --config=$conf $md2 
 $tst
-$mdadm -S $md2
+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
+mdadm -S $md2
 
 
 ### Now for version 1...
 
 
-$mdadm -CR $md2 -l0 --metadata=1.0 -n3 $dev0 $dev1 $dev2 
-$check raid0
-tst="sh tests/testdev $md2 3 $mdsize1 64"
+mdadm -CR $md2 -l0 --metadata=1.0 -n3 $dev0 $dev1 $dev2 
+check raid0
+tst="testdev $md2 3 $mdsize1 64"
 $tst
 
-uuid=`$mdadm -Db $md2 | sed 's/.*UUID=//'`
-$mdadm -S $md2
+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 -S $md2
 
-$mdadm -A $md2 -u $uuid $devlist 
+mdadm -A $md2 -u $uuid $devlist 
 $tst
-$mdadm -S $md2
+mdadm -S $md2
 
 # version 1 has now super-minor
-# $mdadm --assemble $md2 --super-minor=2 $devlist # 
+# mdadm --assemble $md2 --super-minor=2 $devlist # 
 # $tst
-# $mdadm -S $md2
+# mdadm -S $md2
 
 conf=$targetdir/mdadm.conf
 { 
@@ -96,18 +95,18 @@ conf=$targetdir/mdadm.conf
   echo array $md2 UUID=$uuid
 } > $conf
 
-$mdadm -As -c $conf $md2 
+mdadm -As -c $conf $md2 
 $tst
-$mdadm -S $md2
+mdadm -S $md2
 
 #{ 
 #  echo DEVICE $devlist
 #  echo array $md2 super-minor=2
 #} > $conf
 #
-#$mdadm -As -c $conf $md2 
+#mdadm -As -c $conf $md2 
 #$tst
-#$mdadm -S $md2
+#mdadm -S $md2
 
 
 { 
@@ -115,18 +114,18 @@ $mdadm -S $md2
   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 -Db $md2 >> $conf
+mdadm -S $md2
 
-$mdadm --assemble --scan --config=$conf $md2 
+mdadm --assemble --scan --config=$conf $md2 
 $tst
-$mdadm -S $md2
+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
+mdadm -S $md2