[PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too

public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed

From: Murphy Zhou <xzhou@redhat.com>
To: fstests@vger.kernel.org
Cc: darrick.wong@oracle.com, Murphy Zhou <xzhou@redhat.com>
Subject: [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too
Date: Mon, 20 May 2019 14:28:18 +0800	[thread overview]
Message-ID: <20190520062818.12421-1-xzhou@redhat.com> (raw)

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

next             reply	other threads:[~2019-05-20  6:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20  6:28 Murphy Zhou [this message]
2019-05-20 14:21 ` [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too Chuck Lever
2019-05-20 14:32 ` Darrick J. Wong

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:65a71f2 dfblob:dc4d948 dfblob:e7e19be dfblob:fcb5d56
dfblob:c416ab6 dfblob:62b32cb dfblob:50a51f8 dfblob:cc7ee53 )
 OR (
bs:"[PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too" )
	(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=20190520062818.12421-1-xzhou@redhat.com \
    --to=xzhou@redhat.com \
    --cc=darrick.wong@oracle.com \
    --cc=fstests@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox