From patchwork Thu Sep 2 23:53:07 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: 12473413 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 7E7E7C433FE for ; Thu, 2 Sep 2021 23:53:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A20A60F9C for ; Thu, 2 Sep 2021 23:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345801AbhIBXyG (ORCPT ); Thu, 2 Sep 2021 19:54:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:59464 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231311AbhIBXyG (ORCPT ); Thu, 2 Sep 2021 19:54:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 56AA760555; Thu, 2 Sep 2021 23:53:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1630626787; bh=GRcPOIw1lNn1TdWhOuyKf5aex8PKCEBHDTJwOCI6KVw=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=gAZCg91trrrMJ2SwtM2sUod6B3nBDrrU6IISpysCdN+qYhc9uiD2k4J2H78Wvm4pb pUujPrdEDVw4rRinDzrejkQHAb52NB2ZabtOq5pHUY2Ps437RPAjyZPzuovkVcT1Yk Eeu9LFPsavDZeGp1xtQFE8FNC60FTCQ5O0KMKEF9HhzxU5/LOvDTM7MCm5GhGHu6px xai8NbQdi+F8Q/cuJnJYkYGv4NMrpKlVOPRx7HR7WOVfw9Dq4b8j8Jqua2WqaCGk1m Y3d3WbLXHcXwrwJ/gJdcX3V98vDg6RZGwirQPyektWF01zrlRGuUr3EdU8JyARzlFu j+X69hoYh7INA== Subject: [PATCH 8/8] new: only allow documented test group names From: "Darrick J. Wong" To: djwong@kernel.org, guaneryu@gmail.com Cc: Christoph Hellwig , linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me Date: Thu, 02 Sep 2021 16:53:07 -0700 Message-ID: <163062678708.1579659.15462141943907232473.stgit@magnolia> In-Reply-To: <163062674313.1579659.11141504872576317846.stgit@magnolia> References: <163062674313.1579659.11141504872576317846.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..6b7dc5d4 100755 --- a/new +++ b/new @@ -83,6 +83,14 @@ then exit 1 fi +# Extract group names from the documentation. +group_names() { + awk '/^[[:lower:][:digit:]_]/ { + if ($1 != "" && $1 != "Group" && $2 != "Name:" && $1 != "all") + printf("%s\n", $1); + }' doc/group-names.txt +} + 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="$*"