From patchwork Wed Sep 1 00:12:57 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: 12467985 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 DB40FC4320A for ; Wed, 1 Sep 2021 00:12:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8C1A61008 for ; Wed, 1 Sep 2021 00:12:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243259AbhIAANx (ORCPT ); Tue, 31 Aug 2021 20:13:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:47270 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243255AbhIAANx (ORCPT ); Tue, 31 Aug 2021 20:13:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 743006102A; Wed, 1 Sep 2021 00:12:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630455177; bh=uzrJuvAexq7Vha9Ux6CnGAP6zIYRGWaVJRhiEHwuOjI=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=YQ4D+6sq2ew06V9yr8dFy8Mz6KRRnkIkMMhvsUscCnLVuQGIEEeC9TcMy8Sgsy7R6 5Lri0N0nH03ET1XXb/Jck+V+BGIOesuSAGoYV9MxtiJJZsNsKB9IdCgqRBH72ozete OYgwhFIAFfYR3AsTUP++VP13sJsOxiiIyjhGRAk6f19IKiciHFqVrwrSktQ8+/B++0 XeqZWXFiRYQozzhcvgIXCa+NEYFvP+Af06XkcARmfmbVUXCmviuwaAQrxsWkVwqnxs /LmnsXQ2x+lWN9BbR13qQqbp90KTC3gGNj16UgNJnKl+J2diIeBfrRBd1+j9muWgWj oHMNvN22rzNAg== Subject: [PATCH 5/5] new: only allow documented test group names From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Tue, 31 Aug 2021 17:12:57 -0700 Message-ID: <163045517721.771564.12357505876401888990.stgit@magnolia> In-Reply-To: <163045514980.771564.6282165259140399788.stgit@magnolia> References: <163045514980.771564.6282165259140399788.stgit@magnolia> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong Now that we require all group names to be listed in doc/group-names.txt, we can use that (instead of running mkgroupfile) to check if the group name(s) supplied by the user actually exist. This has the secondary effect of being a second nudge towards keeping the description of groups up to date. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- new | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/new b/new index 2097a883..44777bd6 100755 --- a/new +++ b/new @@ -83,6 +83,14 @@ then exit 1 fi +# Extract group names from the documentation. +group_names() { + grep '^[[:lower:][:digit:]_]' doc/group-names.txt | awk ' +{if ($1 != "" && $1 != "Group" && $2 != "Name:" && $1 != "all") + printf("%s\n", $1); +}' +} + if [ $# -eq 0 ] then @@ -93,16 +101,7 @@ then [ -z "$ans" ] && ans=other if [ "X$ans" = "X?" ] then - for d in $SRC_GROUPS; do - (cd "tests/$d/" ; ../../tools/mkgroupfile "$tmpfile") - l=$(sed -n < "$tmpfile" \ - -e 's/#.*//' \ - -e 's/$/ /' \ - -e 's;\(^[0-9][0-9][0-9]\)\(.*$\);\2;p') - grpl="$grpl $l" - done - lst=`for word in $grpl; do echo $word; done | sort| uniq ` - echo $lst + echo $(group_names) else # only allow lower cases, spaces, digits and underscore in group inval=`echo $ans | tr -d '[:lower:][:space:][:digit:]_'` @@ -120,11 +119,10 @@ then else # expert mode, groups are on the command line # - (cd "$tdir" ; ../../tools/mkgroupfile "$tmpfile") for g in $* do - if ! grep -q "[[:space:]]$g" "$tmpfile"; then - echo "Warning: group \"$g\" not defined in $tdir tests" + if ! grep -q "^$g" doc/group-names.txt; then + echo "Warning: group \"$g\" not defined in documentation" fi done ans="$*"