public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] fstests: filter: Introduce filter to filter out offset for xfs_io
@ 2018-01-11  6:55 Qu Wenruo
  2018-01-11  6:55 ` [PATCH 2/5] fstests: btrfs/140: Filter out offset to handle mkfs chunk layout change Qu Wenruo
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Qu Wenruo @ 2018-01-11  6:55 UTC (permalink / raw)
  To: linux-btrfs, fstests; +Cc: dsterba

Some test cases (AFAIK, btrfs RAID recovery test cases) read out certain
location to verify its data.

Such read is mostly OK, but the golden output contains the on-disk
offset, which can differ due to underlying chunk change.
(This time is mkfs chunk layout change for btrfs)

So introduce macro _filter_xfs_io_offset to filter out the offset part
wrote 65536/65536 bytes at offset 136708096
                       ^^^^^^^^^^^^^^^^^^^^
And offset from "pread -v"
08260000:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
^^^^^^^^^

Reported-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 common/filter | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/filter b/common/filter
index 9c33efac..77afcbc4 100644
--- a/common/filter
+++ b/common/filter
@@ -226,6 +226,15 @@ _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)/"
 }
 
+# Also filter out the offset part of xfs_io output
+# Some test cases may be affected by underlaying extent/chunk layout change,
+# so wipe out this part to avoid golden output difference
+_filter_xfs_io_offset()
+{
+    # filter out " at offset XXX" and offset of "pread -v"
+    sed -e "s/ at offset [0-9]*$//" -e "s/^[0-9a-f]\+:/XXXXXXXX:/"
+}
+
 # stderr filter for xfs_io to handle change of error output format (e.g.
 # pwrite64 -> pwrite).
 _filter_xfs_io_error()
@@ -277,7 +286,6 @@ _filter_xfs_io_pages_modified()
 	_filter_xfs_io_units_modified "Page" $PAGE_SIZE
 }
 
-
 _filter_test_dir()
 {
 	# TEST_DEV may be a prefix of TEST_DIR (e.g. /mnt, /mnt/ovl-mnt)
-- 
2.15.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-01-11  7:50 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-11  6:55 [PATCH 1/5] fstests: filter: Introduce filter to filter out offset for xfs_io Qu Wenruo
2018-01-11  6:55 ` [PATCH 2/5] fstests: btrfs/140: Filter out offset to handle mkfs chunk layout change Qu Wenruo
2018-01-11  6:55 ` [PATCH 3/5] fstests: btrfs/141: " Qu Wenruo
2018-01-11  6:56 ` [PATCH 4/5] fstests: btrfs/142: " Qu Wenruo
2018-01-11  6:56 ` [PATCH 5/5] fstests: btrfs/143: " Qu Wenruo
2018-01-11  7:23 ` [PATCH 1/5] fstests: filter: Introduce filter to filter out offset for xfs_io Eryu Guan
2018-01-11  7:50   ` Qu Wenruo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox