mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
filter: xfs_io output has dropped "64" from error messages
Upstream xfs_io has been converted to always use LFS compliant (i.e. 64 bit) pwrite() rather than pwrite64(). Similar changes have been made for multiple syscalls that have "*64" variants. hence the error output of all these commands has changed, such as "pwrite64: ..." to "pwrite: ....". Make a filter to catch the *64 variants and strip it, and convert all the golden output to use the non-*64 variant. This will make all golden output matching work correctly regardless of what version of xfs_io is in use. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
+2
-2
@@ -62,8 +62,8 @@ _run_btrfs_util_prog qgroup limit 512K 0/5 $SCRATCH_MNT
|
||||
# so redirect stdout to seqres.full.
|
||||
# Also, EDQUOTA is expected, which can't be redirected due to the limitation
|
||||
# of _filter_xfs_io, so golden output will include EDQUOTA error message
|
||||
_pwrite_byte 0xcdcdcdcd 0 1M $SCRATCH_MNT/test_file | _filter_xfs_io \
|
||||
>> $seqres.full
|
||||
_pwrite_byte 0xcdcdcdcd 0 1M $SCRATCH_MNT/test_file 2>&1 >> $seqres.full | \
|
||||
_filter_xfs_io_error
|
||||
|
||||
# Fstests will umount the fs, and at umount time, kernel warning will be
|
||||
# triggered
|
||||
|
||||
Reference in New Issue
Block a user