From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35689 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751759AbdH3OvY (ORCPT ); Wed, 30 Aug 2017 10:51:24 -0400 From: Amir Goldstein Subject: [PATCH v2 02/14] common/rc: fix _require_xfs_io_command params check Date: Wed, 30 Aug 2017 17:51:34 +0300 Message-Id: <1504104706-11965-3-git-send-email-amir73il@gmail.com> In-Reply-To: <1504104706-11965-1-git-send-email-amir73il@gmail.com> References: <1504104706-11965-1-git-send-email-amir73il@gmail.com> Sender: fstests-owner@vger.kernel.org To: Eryu Guan Cc: Josef Bacik , "Darrick J . Wong" , Christoph Hellwig , fstests@vger.kernel.org, linux-xfs@vger.kernel.org List-ID: When _require_xfs_io_command is passed command parameters, the resulting error from invalid parameters may be ignored. For example, the following bogus params would not abort the test: _require_xfs_io_command "falloc" "-X" _require_xfs_io_command "fiemap" "-X" Fix this by looking for the relevant error message. Signed-off-by: Amir Goldstein --- common/rc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index 9d7b783..44b98f6 100644 --- a/common/rc +++ b/common/rc @@ -2212,9 +2212,14 @@ _require_xfs_io_command() echo $testio | grep -q "Function not implemented" && \ _notrun "xfs_io $command support is missing (missing syscall?)" - if [ -n "$param" -a $param_checked -eq 0 ]; then + [ -n "$param" ] || return + + if [ $param_checked -eq 0 ]; then $XFS_IO_PROG -c "help $command" | grep -q "^ $param --" || \ _notrun "xfs_io $command doesn't support $param" + else + echo $testio | grep -q "invalid option" && \ + _notrun "xfs_io $command doesn't support $param" fi } -- 2.7.4