check for mount and mkfs failures and exit if failure occurs, rather than fill qa...

Merge of master-melb:xfs-cmds:27324a by kenmcd.

diff --git a/041 b/041
index 3eca05e1e778a165c796ffa08e6946b7b70c28f9..94036e0e4b67ebd26dc6f467d1201932a06c7212 100755 (executable)
--- a/041
+++ b/041
@@ -50,10 +50,9 @@ _do_die_on_error=message_only
 rm -f $seq.full
 agsize=32
 echo -n "Make $agsize megabyte filesystem on SCRATCH_DEV and mount... "
-_do "_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1"
-[ $? -ne 0 ] && exit
-_do "_scratch_mount"
-[ $? -ne 0 ] && exit
+_scratch_mkfs_xfs -dsize=${agsize}m,agcount=1 2>&1 >/dev/null || _fail "mkfs failed"
+_scratch_mount || _fail "mount failed"
+
 echo "done"
 
 # full allocation group -> partial; partial -> expand partial + new partial;

diff --git a/042 b/042
index 47a5f4edaeaafe52ee5dbce426a38139d0c5b70e..7c2bcac4778922411e287dfc681f070cb228ea77 100755 (executable)
--- a/042
+++ b/042
@@ -76,8 +76,9 @@ rm -f $seq.full
 _do_die_on_error=message_only
 
 echo -n "Make a 48 megabyte filesystem on SCRATCH_DEV and mount... "
-_do "_scratch_mkfs_xfs -dsize=48m,agcount=3"
-_do "_scratch_mount"
+_scratch_mkfs_xfs -dsize=48m,agcount=3 2>&1 >/dev/null || _fail "mkfs failed"
+_scratch_mount || _fail "mount failed" 
+
 echo "done"
 
 echo -n "Reserve 16 1Mb unfragmented regions... "