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:
@@ -226,6 +226,13 @@ _filter_xfs_io()
|
||||
sed -e "s/[0-9/.]* [GMKiBbytes]*, [0-9]* ops\; [0-9/:. sec]* ([infa0-9/.]* [EPGMKiBbytes]*\/sec and [infa0-9/.]* ops\/sec)/XXX Bytes, X ops\; XX:XX:XX.X (XXX YYY\/sec and XXX ops\/sec)/"
|
||||
}
|
||||
|
||||
# stderr filter for xfs_io to handle change of error output format (e.g.
|
||||
# pwrite64 -> pwrite).
|
||||
_filter_xfs_io_error()
|
||||
{
|
||||
sed -e "s/^\(.*\)64\(: .*$\)/\1\2/"
|
||||
}
|
||||
|
||||
_filter_xfs_io_unique()
|
||||
{
|
||||
common_line_filter | _filter_xfs_io
|
||||
|
||||
Reference in New Issue
Block a user