mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
xfs/005: filter _scratch_mount output to match golden image
Failure message of mount has been changed since util-linux v2.21, to something like: mount: mount /dev/sda5 on /mnt/scratch failed: Structure needs cleaning Filter the output to match the golden image for newer mount binary so that both old and new version of mount work correctly. Signed-off-by: Eryu Guan <eguan@redhat.com> Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
+6
-1
@@ -40,6 +40,11 @@ _cleanup()
|
||||
rm -f $tmp.*
|
||||
}
|
||||
|
||||
filter_mount()
|
||||
{
|
||||
sed -e "s/mount .* failed: //"
|
||||
}
|
||||
|
||||
# get standard environment, filters and checks
|
||||
. ./common/rc
|
||||
. ./common/filter
|
||||
@@ -59,7 +64,7 @@ _scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail "mkfs failed"
|
||||
$XFS_IO_PROG -c "pwrite 224 4" $SCRATCH_DEV | _filter_xfs_io
|
||||
|
||||
# should FAIL, the crc is bad; golden output contains mount failure
|
||||
_scratch_mount
|
||||
_scratch_mount 2>&1 | filter_mount
|
||||
|
||||
# success, all done
|
||||
status=0
|
||||
|
||||
Reference in New Issue
Block a user