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
-1
@@ -57,7 +57,8 @@ $XFS_IO_PROG -f $SCRATCH_MNT/testfile1 -c "pwrite 0 1m" | _filter_xfs_io
|
||||
|
||||
# Create a large non-extent-based file filling the fs; this will run out & fail
|
||||
echo "Create testfile2 to fill the fs"
|
||||
$XFS_IO_PROG -f $SCRATCH_MNT/testfile2 -c "pwrite 0 512m" | _filter_xfs_io
|
||||
$XFS_IO_PROG -f $SCRATCH_MNT/testfile2 -c "pwrite 0 512m" 2>&1 | \
|
||||
_filter_xfs_io_error
|
||||
df -h $SCRATCH_MNT >> $seqres.full
|
||||
|
||||
# Grow fs by 512m
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ Create 1m testfile1
|
||||
wrote 1048576/1048576 bytes at offset 0
|
||||
XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
||||
Create testfile2 to fill the fs
|
||||
pwrite64: No space left on device
|
||||
pwrite: No space left on device
|
||||
Resize to 1g
|
||||
append 2m to testfile1
|
||||
wrote 2097152/2097152 bytes at offset 1048576
|
||||
|
||||
Reference in New Issue
Block a user