From patchwork Tue Jun 8 17:19:38 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: 12307673 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.2 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 127CFC47082 for ; Tue, 8 Jun 2021 17:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EC8CE61359 for ; Tue, 8 Jun 2021 17:19:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233009AbhFHRVd (ORCPT ); Tue, 8 Jun 2021 13:21:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:54798 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232516AbhFHRVc (ORCPT ); Tue, 8 Jun 2021 13:21:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id E568161351; Tue, 8 Jun 2021 17:19:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1623172779; bh=3XNfN7uOTluRDYJzoDuYpGpAHdgau+Z6pxsp0ucDAZ4=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=mstGzaPAsNzK1wTfM4Q6WAIUUBqKFuqSoxy2NC0ewFWDNfCTWC9P/qKO3CoLIb2i+ Xce+X0hEfq7GtFfJWp/4Gg0BuEpKeMBm69zljxzF8yicFNFSBvHwNvAifekmz3uqps SfqBjQXPFnESVNlN+0NyC7RetPPdgKVHF/dJmPS+prdznNF48kv4ZmuaZFuquvmVKK QKzVD7HH20GCgftEl6GYzlIMeKtCRp+n6dMj5drLoAB0+I598BLpLZ4GNoxzVG/qz6 h6R7UBSPe943FsxqpEsbKURiMSfosbgWHtrFnEDr7MDruOSTjEBKES4+L1kkDUvQy4 CrHRMv4xkuOeQ== Subject: [PATCH 03/13] fstests: refactor test boilerplate code From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me, amir73il@gmail.com, ebiggers@kernel.org Date: Tue, 08 Jun 2021 10:19:38 -0700 Message-ID: <162317277866.653489.1612159248973350500.stgit@locust> In-Reply-To: <162317276202.653489.13006238543620278716.stgit@locust> References: <162317276202.653489.13006238543620278716.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 Create two new helper functions to deal with boilerplate test code: A helper function to set the seq and seqnum variables. We will expand on this in the next patch so that fstests can autogenerate group files from now on. A helper function to register cleanup code that will run if the test exits or trips over a standard range of signals. Signed-off-by: Darrick J. Wong Reviewed-by: Chandan Babu R Reviewed-by: Allison Henderson --- common/preamble | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ new | 33 ++++++++++++--------------------- 2 files changed, 61 insertions(+), 21 deletions(-) create mode 100644 common/preamble diff --git a/common/preamble b/common/preamble new file mode 100644 index 00000000..63f66957 --- /dev/null +++ b/common/preamble @@ -0,0 +1,49 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2021 Oracle. All Rights Reserved. + +# Boilerplate fstests functionality + +# Standard cleanup function. Individual tests should override this. +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# Install the supplied cleanup code as a signal handler for HUP, INT, QUIT, +# TERM, or when the test exits. Extra signals can be specified as subsequent +# parameters. +_register_cleanup() +{ + local cleanup="$1" + shift + + test -n "$cleanup" && cleanup="${cleanup}; " + trap "${cleanup}exit \$status" EXIT HUP INT QUIT TERM $* +} +# Initialize the global seq, seqres, here, tmp, and status variables to their +# defaults. Group memberships are the only arguments to this helper. +_begin_fstest() +{ + if [ -n "$seq" ]; then + echo "_begin_fstest can only be called once!" + exit 1 + fi + + seq=`basename $0` + seqres=$RESULT_DIR/$seq + echo "QA output created by $seq" + + here=`pwd` + tmp=/tmp/$$ + status=1 # failure is the default! + + _register_cleanup _cleanup + + . ./common/rc + + # remove previous $seqres.full before test + rm -f $seqres.full + +} diff --git a/new b/new index 357983d9..16e7c782 100755 --- a/new +++ b/new @@ -153,27 +153,18 @@ cat <$tdir/$id # # what am I here for? # -seq=\`basename \$0\` -seqres=\$RESULT_DIR/\$seq -echo "QA output created by \$seq" - -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 -. ./common/filter - -# remove previous \$seqres.full before test -rm -f \$seqres.full +. ./common/preamble +_begin_fstest group list here + +# Override the default cleanup function. +# _cleanup() +# { +# cd / +# rm -f \$tmp.* +# } + +# Import common functions. +# . ./common/filter # real QA test starts here