From patchwork Mon Jun 21 23:10:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 12335953 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81103C4743C for ; Mon, 21 Jun 2021 23:10:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69005611BD for ; Mon, 21 Jun 2021 23:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231417AbhFUXMz (ORCPT ); Mon, 21 Jun 2021 19:12:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:32918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231303AbhFUXMy (ORCPT ); Mon, 21 Jun 2021 19:12:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B524261042; Mon, 21 Jun 2021 23:10:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1624317039; bh=fJpokN53tpLYp7Wo6Sg+nVHbzCp4syjZc/OV3TKwFlE=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=M1vAdVF/a+Bra+VndTlA8+UFqI4GYmKKrlvynhzhBzocSOtFGdVIC5PiPQ4VJM2wz 77Ubj8CVYSrQZEh1OPDf5z5Hb3bULV+7hjWsCP7SbrCEe5mDUORawcpDtne7KyCG2d vBinz8Yf0Y9M9UL05gjltSt0t/e3Z/oq3hdjEjXhRmINgwLd/vuQ32sT7uoGYU19Um kYTjNGdpAD4jYtHuidTlq5PEiE0RBIrpq1LW79Qy7OWEfDsxdF5cT/Zi6yTwspti1n sZTvh1jkJ5z8Dxihu+a1N/LKcg5ukutgVMsTi0tMbITo6Uhfdv06S5MOYrH4FrD6xD NsN3B7EybO4Bw== Subject: [PATCH 06/13] fstests: move test group info to test files From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: Allison Henderson , Eric Biggers , linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me, amir73il@gmail.com, ebiggers@kernel.org Date: Mon, 21 Jun 2021 16:10:39 -0700 Message-ID: <162431703944.4090790.8160038305801433822.stgit@locust> In-Reply-To: <162431700639.4090790.11684371602638166127.stgit@locust> References: <162431700639.4090790.11684371602638166127.stgit@locust> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Darrick J. Wong Refactor every test in the entire test suite to use the new boilerplate functions. This also migrates all the test group information into the test files. This patch has been autogenerated via the command: ./tools/convert-group btrfs ceph cifs ext4 f2fs generic nfs ocfs2 overlay perf shared udf xfs NOTE: This patch submission only contains diffs of the first seven btrfs tests because vger rejects 1.5MB patches. The full conversion is in the git branch linked from the cover letter. Signed-off-by: Darrick J. Wong Reviewed-by: Allison Henderson Reviewed-by: Eric Biggers --- tests/btrfs/001 | 19 +++---------------- tests/btrfs/002 | 19 +++---------------- tests/btrfs/003 | 15 ++++----------- tests/btrfs/004 | 15 ++++----------- tests/btrfs/005 | 21 +++------------------ tests/btrfs/006 | 21 +++------------------ 6 files changed, 20 insertions(+), 90 deletions(-) diff --git a/tests/btrfs/001 b/tests/btrfs/001 index fb051e8a..000aeb34 100755 --- a/tests/btrfs/001 +++ b/tests/btrfs/001 @@ -6,23 +6,10 @@ # # Test btrfs's subvolume and snapshot support # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/preamble +_begin_fstest auto quick subvol snapshot -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! - -_cleanup() -{ - rm -f $tmp.* -} - -trap "_cleanup ; exit \$status" 0 1 2 3 15 - -# get standard environment, filters and checks -. ./common/rc +# Import common functions. . ./common/filter . ./common/filter.btrfs diff --git a/tests/btrfs/002 b/tests/btrfs/002 index 66775562..58f0cdcd 100755 --- a/tests/btrfs/002 +++ b/tests/btrfs/002 @@ -6,23 +6,10 @@ # # Extented btrfs snapshot test cases # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/preamble +_begin_fstest auto snapshot -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! - -_cleanup() -{ - rm -f $tmp.* -} - -trap "_cleanup ; exit \$status" 0 1 2 3 15 - -# get standard environment, filters and checks -. ./common/rc +# Import common functions. . ./common/filter _supported_fs btrfs diff --git a/tests/btrfs/003 b/tests/btrfs/003 index fbb313fb..d241ec6e 100755 --- a/tests/btrfs/003 +++ b/tests/btrfs/003 @@ -6,16 +6,11 @@ # # btrfs vol tests # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/preamble +_begin_fstest auto replace volume balance -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! dev_removed=0 removed_dev_htl="" -trap "_cleanup; exit \$status" 0 1 2 3 15 # Check if all scratch dev pools are deletable deletable_scratch_dev_pool() @@ -32,6 +27,7 @@ deletable_scratch_dev_pool() return 0 } +# Override the default cleanup function. _cleanup() { cd / @@ -42,8 +38,7 @@ _cleanup() fi } -# get standard environment, filters and checks -. ./common/rc +# Import common functions. . ./common/filter _supported_fs btrfs @@ -51,8 +46,6 @@ _require_scratch _require_scratch_dev_pool 4 _require_command "$WIPEFS_PROG" wipefs -rm -f $seqres.full - # Test cases related to raid in btrfs _test_raid0() { diff --git a/tests/btrfs/004 b/tests/btrfs/004 index 0458d2b6..4e767a2f 100755 --- a/tests/btrfs/004 +++ b/tests/btrfs/004 @@ -9,25 +9,20 @@ # run filefrag to get the extent mapping and follow the backrefs. # We check to end up back at the original file with the correct offset. # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/preamble +_begin_fstest auto rw metadata -here=`pwd` -tmp=/tmp/$$ -status=1 noise_pid=0 +# Override the default cleanup function. _cleanup() { rm $tmp.running wait rm -f $tmp.* } -trap "_cleanup; exit \$status" 0 1 2 3 15 -# get standard environment, filters and checks -. ./common/rc +# Import common functions. . ./common/filter # real QA test starts here @@ -38,8 +33,6 @@ _require_btrfs_command inspect-internal logical-resolve _require_btrfs_command inspect-internal inode-resolve _require_command "$FILEFRAG_PROG" filefrag -rm -f $seqres.full - FILEFRAG_FILTER=' if (/blocks? of (\d+) bytes/) { $blocksize = $1; diff --git a/tests/btrfs/005 b/tests/btrfs/005 index ff20a638..878a8c7c 100755 --- a/tests/btrfs/005 +++ b/tests/btrfs/005 @@ -6,23 +6,11 @@ # # Btrfs Online defragmentation tests # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" -here="`pwd`" -tmp=/tmp/$$ +. ./common/preamble +_begin_fstest auto defrag cnt=119 filesize=48000 -status=1 # failure is the default! -trap "_cleanup; exit \$status" 0 1 2 3 15 - -_cleanup() -{ - cd / - rm -f $tmp.* -} - _create_file() { if [ $1 -ne 2 ]; then @@ -111,8 +99,7 @@ _rundefrag() _check_scratch_fs } -# get standard environment, filters and checks -. ./common/rc +# Import common functions. . ./common/filter . ./common/defrag @@ -120,8 +107,6 @@ _rundefrag() _supported_fs btrfs _require_scratch -rm -f $seqres.full - _scratch_mkfs >/dev/null 2>&1 _scratch_mount _require_defrag diff --git a/tests/btrfs/006 b/tests/btrfs/006 index 8168992f..fd0f89e2 100755 --- a/tests/btrfs/006 +++ b/tests/btrfs/006 @@ -7,23 +7,10 @@ # run basic btrfs information commands in various ways # sanity tests: filesystem show, label, sync, and device stats # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/preamble +_begin_fstest auto quick volume -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! -trap "_cleanup; exit \$status" 0 1 2 3 15 - -_cleanup() -{ - cd / - rm -f $tmp.* -} - -# get standard environment, filters and checks -. ./common/rc +# Import common functions. . ./common/filter.btrfs # real QA test starts here @@ -33,8 +20,6 @@ _supported_fs btrfs _require_scratch _require_scratch_dev_pool -rm -f $seqres.full - FIRST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'` LAST_POOL_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $NF}'` TOTAL_DEVS=`echo $SCRATCH_DEV_POOL | wc -w`