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 5b8086046ebf9afba91e36bab3bf5997037fe980..2892ad9eea06e84e8ca5a5f460548cb42cf1d3e6 100755 (executable)
--- a/tests/xfs/089
+++ b/tests/xfs/089
@@ -1,27 +1,12 @@
 #! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2015 Oracle, Inc.  All Rights Reserved.
+#
 # FS QA Test No. 089
 #
 # Create and populate an XFS filesystem, corrupt the bnobt, then see how
 # the kernel and xfs_repair deal with it.
 #
-#-----------------------------------------------------------------------
-# Copyright (c) 2015 Oracle, Inc.  All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#-----------------------------------------------------------------------
-#
-
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
@@ -45,7 +30,6 @@ _cleanup()
 
 # real QA test starts here
 _supported_fs xfs
-_supported_os Linux
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_xfs_crc
@@ -79,7 +63,7 @@ for x in `seq 2 64`; do
        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"
@@ -91,18 +75,17 @@ for ag in $(seq 1 $((agcount - 1))) 0; do
 done
 
 # Try to append to files; this should fail
-echo "+ mount image"
+echo "+ mount image && modify files"
 if _try_scratch_mount >> $seqres.full 2>&1; then
 
-       echo "+ modify files"
        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"
-_scratch_xfs_repair >> $seqres.full 2>&1
+_repair_scratch_fs >> $seqres.full 2>&1
 
 echo "+ mount image"
 _scratch_mount
@@ -126,7 +109,7 @@ done
 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