* [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too
@ 2019-05-20 6:28 Murphy Zhou
2019-05-20 14:21 ` Chuck Lever
2019-05-20 14:32 ` Darrick J. Wong
0 siblings, 2 replies; 3+ messages in thread
From: Murphy Zhou @ 2019-05-20 6:28 UTC (permalink / raw)
To: fstests; +Cc: darrick.wong, Murphy Zhou
NFSv4.2 supports reflink but does not support FIBMAP. These 4 tests
about file content can pass on NFSv4.2, but FILEFRAG complaint :
+/mnt/testarea/scratch/test-542/file2: FIBMAP unsupported
is breaking golden output.
Signed-off-by: Murphy Zhou <xzhou@redhat.com>
---
tests/generic/540 | 8 ++++----
tests/generic/541 | 8 ++++----
tests/generic/542 | 8 ++++----
tests/generic/543 | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/tests/generic/540 b/tests/generic/540
index 65a71f22..dc4d9485 100755
--- a/tests/generic/540
+++ b/tests/generic/540
@@ -72,16 +72,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
# now reflink into the rainbow
echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file2 $roff $roff $rsz" $testdir/file3 >> $seqres.full
_pwrite_byte 0x64 $roff $rsz $testdir/file3.chk >> $seqres.full
_scratch_cycle_mount
echo "Compare files"
echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
md5sum $testdir/file1 | _filter_scratch
md5sum $testdir/file2 | _filter_scratch
md5sum $testdir/file3 | _filter_scratch
diff --git a/tests/generic/541 b/tests/generic/541
index e7e19be4..fcb5d567 100755
--- a/tests/generic/541
+++ b/tests/generic/541
@@ -74,8 +74,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
# now reflink the rainbow
echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file3 $roff $roff $rsz" $testdir/file2 >> $seqres.full
cp $testdir/file3.chk $testdir/file2.chk
_pwrite_byte 0x64 0 $roff $testdir/file2.chk >> $seqres.full
@@ -84,8 +84,8 @@ _scratch_cycle_mount
echo "Compare files"
echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
md5sum $testdir/file1 | _filter_scratch
md5sum $testdir/file2 | _filter_scratch
md5sum $testdir/file2.chk | _filter_scratch
diff --git a/tests/generic/542 b/tests/generic/542
index c416ab69..62b32cb5 100755
--- a/tests/generic/542
+++ b/tests/generic/542
@@ -73,16 +73,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
# now reflink into the rainbow
echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file2 $soff $doff $rsz" $testdir/file3 >> $seqres.full
_pwrite_byte 0x64 $doff $rsz $testdir/file3.chk >> $seqres.full
_scratch_cycle_mount
echo "Compare files"
echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
md5sum $testdir/file1 | _filter_scratch
md5sum $testdir/file2 | _filter_scratch
md5sum $testdir/file3 | _filter_scratch
diff --git a/tests/generic/543 b/tests/generic/543
index 50a51f89..cc7ee532 100755
--- a/tests/generic/543
+++ b/tests/generic/543
@@ -75,8 +75,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
# now reflink the rainbow
echo "before reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
$XFS_IO_PROG -f -c "reflink $testdir/file3 $soff $doff $rsz" $testdir/file2 >> $seqres.full
$XFS_IO_PROG -c "truncate $doff" $testdir/file2.chk
dd if=$testdir/file3.chk skip=$((soff / blksz)) count=$((rsz / blksz)) bs=$blksz >> $testdir/file2.chk 2> /dev/null
@@ -84,8 +84,8 @@ _scratch_cycle_mount
echo "Compare files"
echo "after reflink" >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
-$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
+$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
+$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
md5sum $testdir/file1 | _filter_scratch
md5sum $testdir/file2 | _filter_scratch
md5sum $testdir/file2.chk | _filter_scratch
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too
2019-05-20 6:28 [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too Murphy Zhou
@ 2019-05-20 14:21 ` Chuck Lever
2019-05-20 14:32 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Chuck Lever @ 2019-05-20 14:21 UTC (permalink / raw)
To: Murphy Zhou; +Cc: fstests, darrick.wong
> On May 20, 2019, at 2:28 AM, Murphy Zhou <xzhou@redhat.com> wrote:
>
> NFSv4.2 supports reflink but does not support FIBMAP. These 4 tests
> about file content can pass on NFSv4.2, but FILEFRAG complaint :
> +/mnt/testarea/scratch/test-542/file2: FIBMAP unsupported
> is breaking golden output.
>
> Signed-off-by: Murphy Zhou <xzhou@redhat.com>
> ---
> tests/generic/540 | 8 ++++----
> tests/generic/541 | 8 ++++----
> tests/generic/542 | 8 ++++----
> tests/generic/543 | 8 ++++----
> 4 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/tests/generic/540 b/tests/generic/540
> index 65a71f22..dc4d9485 100755
> --- a/tests/generic/540
> +++ b/tests/generic/540
> @@ -72,16 +72,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink into the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file2 $roff $roff $rsz" $testdir/file3 >> $seqres.full
> _pwrite_byte 0x64 $roff $rsz $testdir/file3.chk >> $seqres.full
> _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file3 | _filter_scratch
> diff --git a/tests/generic/541 b/tests/generic/541
> index e7e19be4..fcb5d567 100755
> --- a/tests/generic/541
> +++ b/tests/generic/541
> @@ -74,8 +74,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file3 $roff $roff $rsz" $testdir/file2 >> $seqres.full
> cp $testdir/file3.chk $testdir/file2.chk
> _pwrite_byte 0x64 0 $roff $testdir/file2.chk >> $seqres.full
> @@ -84,8 +84,8 @@ _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file2.chk | _filter_scratch
> diff --git a/tests/generic/542 b/tests/generic/542
> index c416ab69..62b32cb5 100755
> --- a/tests/generic/542
> +++ b/tests/generic/542
> @@ -73,16 +73,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink into the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file2 $soff $doff $rsz" $testdir/file3 >> $seqres.full
> _pwrite_byte 0x64 $doff $rsz $testdir/file3.chk >> $seqres.full
> _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file3 | _filter_scratch
> diff --git a/tests/generic/543 b/tests/generic/543
> index 50a51f89..cc7ee532 100755
> --- a/tests/generic/543
> +++ b/tests/generic/543
> @@ -75,8 +75,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file3 $soff $doff $rsz" $testdir/file2 >> $seqres.full
> $XFS_IO_PROG -c "truncate $doff" $testdir/file2.chk
> dd if=$testdir/file3.chk skip=$((soff / blksz)) count=$((rsz / blksz)) bs=$blksz >> $testdir/file2.chk 2> /dev/null
> @@ -84,8 +84,8 @@ _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file2.chk | _filter_scratch
> --
> 2.21.0
>
Hi -
No comment on the content of this patch, but please do cross-post NFS-related
fstests fixes to linux-nfs@vger.kernel.org. Thank you!
--
Chuck Lever
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too
2019-05-20 6:28 [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too Murphy Zhou
2019-05-20 14:21 ` Chuck Lever
@ 2019-05-20 14:32 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2019-05-20 14:32 UTC (permalink / raw)
To: Murphy Zhou; +Cc: fstests, linux-nfs
On Mon, May 20, 2019 at 02:28:18PM +0800, Murphy Zhou wrote:
> NFSv4.2 supports reflink but does not support FIBMAP. These 4 tests
> about file content can pass on NFSv4.2, but FILEFRAG complaint :
> +/mnt/testarea/scratch/test-542/file2: FIBMAP unsupported
> is breaking golden output.
>
> Signed-off-by: Murphy Zhou <xzhou@redhat.com>
Looks ok to me,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> tests/generic/540 | 8 ++++----
> tests/generic/541 | 8 ++++----
> tests/generic/542 | 8 ++++----
> tests/generic/543 | 8 ++++----
> 4 files changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/tests/generic/540 b/tests/generic/540
> index 65a71f22..dc4d9485 100755
> --- a/tests/generic/540
> +++ b/tests/generic/540
> @@ -72,16 +72,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink into the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file2 $roff $roff $rsz" $testdir/file3 >> $seqres.full
> _pwrite_byte 0x64 $roff $rsz $testdir/file3.chk >> $seqres.full
> _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file3 | _filter_scratch
> diff --git a/tests/generic/541 b/tests/generic/541
> index e7e19be4..fcb5d567 100755
> --- a/tests/generic/541
> +++ b/tests/generic/541
> @@ -74,8 +74,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file3 $roff $roff $rsz" $testdir/file2 >> $seqres.full
> cp $testdir/file3.chk $testdir/file2.chk
> _pwrite_byte 0x64 0 $roff $testdir/file2.chk >> $seqres.full
> @@ -84,8 +84,8 @@ _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file2.chk | _filter_scratch
> diff --git a/tests/generic/542 b/tests/generic/542
> index c416ab69..62b32cb5 100755
> --- a/tests/generic/542
> +++ b/tests/generic/542
> @@ -73,16 +73,16 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink into the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file2 $soff $doff $rsz" $testdir/file3 >> $seqres.full
> _pwrite_byte 0x64 $doff $rsz $testdir/file3.chk >> $seqres.full
> _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file3 | _filter_scratch
> diff --git a/tests/generic/543 b/tests/generic/543
> index 50a51f89..cc7ee532 100755
> --- a/tests/generic/543
> +++ b/tests/generic/543
> @@ -75,8 +75,8 @@ _weave_reflink_rainbow_delalloc $blksz $nr $testdir/file3 >> $seqres.full
>
> # now reflink the rainbow
> echo "before reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> $XFS_IO_PROG -f -c "reflink $testdir/file3 $soff $doff $rsz" $testdir/file2 >> $seqres.full
> $XFS_IO_PROG -c "truncate $doff" $testdir/file2.chk
> dd if=$testdir/file3.chk skip=$((soff / blksz)) count=$((rsz / blksz)) bs=$blksz >> $testdir/file2.chk 2> /dev/null
> @@ -84,8 +84,8 @@ _scratch_cycle_mount
>
> echo "Compare files"
> echo "after reflink" >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full
> -$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full
> +$FILEFRAG_PROG -v $testdir/file2 >> $seqres.full 2>&1
> +$FILEFRAG_PROG -v $testdir/file3 >> $seqres.full 2>&1
> md5sum $testdir/file1 | _filter_scratch
> md5sum $testdir/file2 | _filter_scratch
> md5sum $testdir/file2.chk | _filter_scratch
> --
> 2.21.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-20 14:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-20 6:28 [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too Murphy Zhou
2019-05-20 14:21 ` Chuck Lever
2019-05-20 14:32 ` Darrick J. Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox