Try to simplify log QA with mnt and mkfs options.

[xfstests-dev.git] / 082

diff --git a/082 b/082
index d44eccbae9d4aea557005afecdc1b23e3ce90c4c..11707e4f718f56883d801c2248309dcdc44d56e9 100755 (executable)
--- a/082
+++ b/082
@@ -64,7 +64,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # prelim
 rm -f $seq.full $tmp.*
 _require_scratch
-_clear_opts
 echo "*** init FS"
 umount $SCRATCH_DEV >/dev/null 2>&1
 
@@ -93,41 +92,45 @@ for s in sync nosync ; do
     cat $tmp.seq.params \
     | while read mkfs mnt start restofline
     do
-       if [ "$mkfs" != "#" ]; then 
-           echo "--- mkfs=$mkfs, mnt=$mnt, start=$start, sync=$s ---"
-           _mkfs_log $mkfs
-           if [ $s = "sync" ]; then
-               _create_log_sync $mnt
-           else
-               _create_log $mnt
-           fi
-           _check_log
+       if [ "$mkfs" = "#" ]; then 
+           continue
+       fi
+       echo "--- mkfs=$mkfs, mnt=$mnt, start=$start, sync=$s ---"
+       export MOUNT_OPTIONS=$mnt
+       export MKFS_OPTIONS=$mkfs
+       if ! _mkfs_log; then
+           continue
+       fi      
+       if [ $s = "sync" ]; then
+           _create_log_sync
+       else
+           _create_log
+       fi
+       if [ $? -ne 0 ]; then
+           continue
+       fi
+       _check_log
 
-           sync_suffix=".$s"
+       sync_suffix=".$s"
 
-           if [ $s = "sync" ]; then
-               # if sync then we have chance of DATA FORK EXTENTS items
-                # not hanging around very long due to inode syncing to disk
-               # (see comment in xfs_iflush_int())
-               # and this is to hard to reconcile in the op output
-               :
-           else
-               _print_operation
-               _cmp_op_output $seq.op $filtered
-           fi
+       if [ $s = "sync" ]; then
+           # if sync then we have chance of DATA FORK EXTENTS items
+           # not hanging around very long due to inode syncing to disk
+           # (see comment in xfs_iflush_int())
+           # and this is to hard to reconcile in the op output
+           :
+       else
+           _print_operation
+           _cmp_op_output $seq.op $filtered
+       fi
 
-           _print_transaction_inode $start
-           _cmp_output $seq.trans_inode $filtered
+       _print_transaction_inode $start
+       _cmp_output $seq.trans_inode $filtered
 
-           _print_transaction_buf $start
-           _cmp_output $seq.trans_buf $filtered
-       fi
+       _print_transaction_buf $start
+       _cmp_output $seq.trans_buf $filtered
     done
 done
 
-# got thru it all so we may have success
-if [ ! -e $tmp.error ]; then
-    status=0
-fi
-
+status=0
 exit