xfs/111: fix golden output

In commit f4eee5126, this test was changed to run xfs_fsr to
bulkstat its way through the filesystem until it finds the corrupt
inode.  The golden output was changed to capture xfs_fsr's output,
but neglects the fact that when fsr's output is not a tty, all the
status and error messages are sent to syslog, not stdout.
Therefore, this test consistently fails because it expects output of
"$SCRATCH_MNT start inode=0" but this never appears.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/xfs/111 b/tests/xfs/111
index 2ef69f078018f2ed7c73763120dac82eb6412456..965eb625ada5b5746268df197fb55ffd6e285902 100755 (executable)
--- a/tests/xfs/111
+++ b/tests/xfs/111
@@ -58,7 +58,7 @@ _try_scratch_mount || _fail "Couldn't mount after itrash"
 
 echo Attempting bulkstat
 #src/bstat -q $SCRATCH_MNT
-$XFS_FSR_PROG $SCRATCH_MNT | _filter_scratch
+$XFS_FSR_PROG -g $SCRATCH_MNT | _filter_scratch
 
 # Fix up intentional corruption so test can pass
 _scratch_unmount

diff --git a/tests/xfs/111.out b/tests/xfs/111.out
index fd56c3c8c1cd05c2b9af276faa15bd464d5537a8..41fa48f826ba6105218cff7902c8e7895933fed8 100644 (file)
--- a/tests/xfs/111.out
+++ b/tests/xfs/111.out
@@ -10,4 +10,3 @@ Blat inode clusters
 Starting overwrite
 Overwrite complete
 Attempting bulkstat
-SCRATCH_MNT start inode=0