diff options
| author | Dave Chinner <dchinner@redhat.com> | 2016-11-03 08:15:25 +1100 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2016-11-03 10:41:41 +0800 |
| commit | c52086226bc6713439b159700a0df6e0eddc279a (patch) | |
| tree | 3fe06302a897b41c9e6592ae77cfea8428744fe2 /tests/f2fs | |
| parent | efef020df5b257085831106847d318c93d46531c (diff) | |
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>
Diffstat (limited to 'tests/f2fs')
| -rwxr-xr-x | tests/f2fs/001 | 6 | ||||
| -rw-r--r-- | tests/f2fs/001.out | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/f2fs/001 b/tests/f2fs/001 index c84dbde6..c02363a8 100755 --- a/tests/f2fs/001 +++ b/tests/f2fs/001 @@ -69,10 +69,8 @@ $XFS_IO_PROG -t -f -c "falloc 0 5g" $dummyfile | _filter_xfs_io # -ENOSPC should be triggered without any panic echo "==== change i_size & write data ====" -$XFS_IO_PROG \ - -c "truncate 96" \ - -c "pwrite -S 0x58 8192 4096" \ -$testfile | _filter_xfs_io +$XFS_IO_PROG -c "truncate 96" -c "pwrite -S 0x58 8192 4096" $testfile 2>&1 \ + | _filter_xfs_io_error echo "==== check data contents ====" hexdump -C $testfile diff --git a/tests/f2fs/001.out b/tests/f2fs/001.out index 593f82aa..997aa5b2 100644 --- a/tests/f2fs/001.out +++ b/tests/f2fs/001.out @@ -5,7 +5,7 @@ XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) ==== Fullfill the partition ==== fallocate: No space left on device ==== change i_size & write data ==== -pwrite64: No space left on device +pwrite: No space left on device ==== check data contents ==== 00000000 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 58 |XXXXXXXXXXXXXXXX| * |