From patchwork Mon May 20 06:28:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murphy Zhou X-Patchwork-Id: 10950023 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A2BDF76 for ; Mon, 20 May 2019 06:28:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91CDE28421 for ; Mon, 20 May 2019 06:28:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8593028685; Mon, 20 May 2019 06:28:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6453828421 for ; Mon, 20 May 2019 06:28:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730766AbfETG2b (ORCPT ); Mon, 20 May 2019 02:28:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46688 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729725AbfETG2b (ORCPT ); Mon, 20 May 2019 02:28:31 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D2C068762E; Mon, 20 May 2019 06:28:30 +0000 (UTC) Received: from localhost (dhcp-12-130.nay.redhat.com [10.66.12.130]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4550A5D9D1; Mon, 20 May 2019 06:28:30 +0000 (UTC) From: Murphy Zhou To: fstests@vger.kernel.org Cc: darrick.wong@oracle.com, Murphy Zhou Subject: [PATCH] tests/generic/54{0..3}: redirect FILEFRAG error output to .full too Date: Mon, 20 May 2019 14:28:18 +0800 Message-Id: <20190520062818.12421-1-xzhou@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 20 May 2019 06:28:30 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Darrick J. Wong --- 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