From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 D9063C432C0 for ; Tue, 19 Nov 2019 22:32:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7ED022461 for ; Tue, 19 Nov 2019 22:32:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574202756; bh=jGkgOHwjYn49iNvx9nypYCXSDYBQdiX85lA20cImo+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gOUGl8Wqwvv88O+SRmNRBTBgQpmS31OPsXdEtPuSGaR4bpFf7hsjllgAC1a4i0Yh0 e5dT8+31OeSbAU8DCPkTjXmV8V+mymMviou9DVllxNPN9oqi4ucma8RE2PuOI4WZoB eQn0F9sKB7K5wMRqcTU/bFBjb7wuoEIPiW3yagYg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727357AbfKSWcg (ORCPT ); Tue, 19 Nov 2019 17:32:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:42680 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726346AbfKSWcg (ORCPT ); Tue, 19 Nov 2019 17:32:36 -0500 Received: from ebiggers-linuxstation.mtv.corp.google.com (unknown [104.132.1.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7A60A22459; Tue, 19 Nov 2019 22:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574202755; bh=jGkgOHwjYn49iNvx9nypYCXSDYBQdiX85lA20cImo+Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n2mVGahSU2sMJ1ewRLM827y2N4x6tPIMVhLVqF03roequ7yUPEHx2iw8z1oegzP+8 RkZYFb11trZc70QQ1QNQayreZwgyaBb9uzAHm1GdMToxZjUK8yBLPlaQIJVXcbuEL7 GaPJsq85qP1/Gala31kx8vyoIybzLPmkUawWXflA= From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, keyrings@vger.kernel.org, Jarkko Sakkinen Subject: [RFC PATCH 1/3] common/rc: handle option with argument in _require_xfs_io_command() Date: Tue, 19 Nov 2019 14:31:28 -0800 Message-Id: <20191119223130.228341-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog In-Reply-To: <20191119223130.228341-1-ebiggers@kernel.org> References: <20191119223130.228341-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org From: Eric Biggers Fix _require_xfs_io_command() to handle options that take arguments when the argument is shown in the help text. E.g., it didn't work to run: _require_xfs_io_command "add_enckey" "-k" because the relevant line of the help text is: -k KEY_ID -- ID of fscrypt-provisioning key containing the raw key ... but the grep command only matched "-k --", not "-k KEY_ID --". Signed-off-by: Eric Biggers --- common/rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/rc b/common/rc index b988e912..8d9479c0 100644 --- a/common/rc +++ b/common/rc @@ -2216,7 +2216,7 @@ _require_xfs_io_command() [ -n "$param" ] || return if [ -z "$param_checked" ]; then - $XFS_IO_PROG -c "help $command" | grep -q "^ $param --" || \ + $XFS_IO_PROG -c "help $command" | grep -E -q "^ $param ([a-zA-Z_]+ )?--" || \ _notrun "xfs_io $command doesn't support $param" else # xfs_io could result in "command %c not supported" if it was -- 2.24.0.432.g9d3f5f5b63-goog