[PATCH 4/5] fstests: btrfs/142: Filter out offset to handle mkfs chunk layout change

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org
Cc: dsterba@suse.cz
Subject: [PATCH 4/5] fstests: btrfs/142: Filter out offset to handle mkfs chunk layout change
Date: Thu, 11 Jan 2018 14:56:00 +0800	[thread overview]
Message-ID: <20180111065601.5831-4-wqu@suse.com> (raw)
In-Reply-To: <20180111065601.5831-1-wqu@suse.com>

Due to recent mkfs.btrfs chunk layout change, offset in golden output is
not flex to handle different mkfs chunk layout.

So use _filter_xfs_io_offset to filter out offset so golden output can
handle any chunk layout.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 tests/btrfs/142     |  9 ++++---
 tests/btrfs/142.out | 70 ++++++++++++++++++++++++++---------------------------
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/tests/btrfs/142 b/tests/btrfs/142
index 5bd8b728..267bdfac 100755
--- a/tests/btrfs/142
+++ b/tests/btrfs/142
@@ -99,7 +99,8 @@ _scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1
 # chunk
 _scratch_mount -o nospace_cache,nodatasum
 
-$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" | _filter_xfs_io
+$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" |\
+	_filter_xfs_io | _filter_xfs_io_offset
 
 # step 2, corrupt the first 64k of one copy (on SCRATCH_DEV which is the first
 # one in $SCRATCH_DEV_POOL
@@ -110,7 +111,8 @@ logical_in_btrfs=`${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar | _filter_filefrag | c
 physical_on_scratch=`get_physical ${logical_in_btrfs}`
 
 _scratch_unmount
-$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV | _filter_xfs_io
+$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV |\
+	_filter_xfs_io | _filter_xfs_io_offset
 
 _scratch_mount -o nospace_cache
 
@@ -135,7 +137,8 @@ stop_fail
 _scratch_unmount
 
 # check if the repair works
-$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV | _filter_xfs_io
+$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV |\
+	_filter_xfs_io | _filter_xfs_io_offset
 
 _scratch_dev_pool_put
 # success, all done
diff --git a/tests/btrfs/142.out b/tests/btrfs/142.out
index d8be7fbf..0f32ffbe 100644
--- a/tests/btrfs/142.out
+++ b/tests/btrfs/142.out
@@ -1,39 +1,39 @@
 QA output created by 142
-wrote 131072/131072 bytes at offset 0
+wrote 131072/131072 bytes
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-wrote 65536/65536 bytes at offset 136708096
+wrote 65536/65536 bytes
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-08260000:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260010:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260020:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260030:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260040:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260050:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260060:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260070:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260080:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260090:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082600a0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082600b0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082600c0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082600d0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082600e0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082600f0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260100:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260110:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260120:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260130:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260140:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260150:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260160:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260170:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260180:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-08260190:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082601a0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082601b0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082601c0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082601d0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082601e0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-082601f0:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
-read 512/512 bytes at offset 136708096
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+XXXXXXXX:  aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa  ................
+read 512/512 bytes
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-- 
2.15.1

next prev parent reply	other threads:[~2018-01-11  6:56 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` Qu Wenruo [this message]
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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:5bd8b72 dfblob:267bdfa dfblob:d8be7fb dfblob:0f32ffb )
 OR (
bs:"[PATCH 4/5] fstests: btrfs/142: Filter out offset to handle mkfs chunk layout change" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180111065601.5831-4-wqu@suse.com \
    --to=wqu@suse.com \
    --cc=dsterba@suse.cz \
    --cc=fstests@vger.kernel.org \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.