xfs: fix old fuzz test invocations of xfs_repair

[xfstests-dev.git] / tests / xfs / 089

diff --git a/tests/xfs/089 b/tests/xfs/089
index 5c39829969bfda0c2ac93defa108788a546a195c..2892ad9eea06e84e8ca5a5f460548cb42cf1d3e6 100755 (executable)
--- a/tests/xfs/089
+++ b/tests/xfs/089
@@ -30,7 +30,6 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
 
 # real QA test starts here
 _supported_fs xfs

-_supported_os Linux

 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc


@@ -64,7 +63,7 @@ for x in `seq 2 64`; do
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"
        touch "${TESTFILE}.${x}"
 done
 inode="$(stat -c '%i' "${TESTFILE}.1")"

-agcount="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep agcount= | sed -e 's/^.*agcount=\([0-9]*\),.*$/\1/g')"
+agcount="$(_xfs_mount_agcount $SCRATCH_MNT)"

 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"
 umount "${SCRATCH_MNT}"
 
 echo "+ check fs"


@@ -80,13 +79,13 @@ echo "+ mount image && modify files"
 if _try_scratch_mount >> $seqres.full 2>&1; then
 
        for x in `seq 1 64`; do
 if _try_scratch_mount >> $seqres.full 2>&1; then
 
        for x in `seq 1 64`; do

-               $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full
+               $XFS_IO_PROG -f -c "pwrite -S 0x62 0 ${blksz}" "${TESTFILE}.${x}" >> $seqres.full 2>> $seqres.full

        done
        umount "${SCRATCH_MNT}"
 fi
 
 echo "+ repair fs"
        done
        umount "${SCRATCH_MNT}"
 fi
 
 echo "+ repair fs"

-_scratch_xfs_repair >> $seqres.full 2>&1
+_repair_scratch_fs >> $seqres.full 2>&1

 
 echo "+ mount image"
 _scratch_mount
 
 echo "+ mount image"
 _scratch_mount


@@ -110,7 +109,7 @@ done
 umount "${SCRATCH_MNT}"
 
 echo "+ repair fs"
 umount "${SCRATCH_MNT}"
 
 echo "+ repair fs"

-_scratch_xfs_repair >> $seqres.full 2>&1
+_repair_scratch_fs >> $seqres.full 2>&1

 
 echo "+ mount image"
 _scratch_mount
 
 echo "+ mount image"
 _scratch_mount