From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cn.fujitsu.com ([222.73.24.84]:49885 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755218AbcINBzo (ORCPT ); Tue, 13 Sep 2016 21:55:44 -0400 From: Qu Wenruo Subject: [PATCH v6 2/6] fstests: common: rename _require_btrfs to _require_btrfs_subcommand Date: Wed, 14 Sep 2016 09:55:23 +0800 Message-Id: <20160914015527.10274-3-quwenruo@cn.fujitsu.com> In-Reply-To: <20160914015527.10274-1-quwenruo@cn.fujitsu.com> References: <20160914015527.10274-1-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 Sender: fstests-owner@vger.kernel.org To: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org Cc: fdmanana@gmail.com, mfasheh@suse.de List-ID: Rename _require_btrfs() to _require_btrfs_subcommand() to avoid confusion, as all other _require_btrfs_* has a quite clear suffix, like _require_btrfs_mkfs_feature() or _require_btrfs_fs_feature(). Signed-off-by: Qu Wenruo --- common/rc | 2 +- tests/btrfs/004 | 2 +- tests/btrfs/048 | 2 +- tests/btrfs/059 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/rc b/common/rc index 631397f..636cba6 100644 --- a/common/rc +++ b/common/rc @@ -3001,7 +3001,7 @@ _require_deletable_scratch_dev_pool() } # We check for btrfs and (optionally) features of the btrfs command -_require_btrfs() +_require_btrfs_subcommand() { cmd=$1 _require_command "$BTRFS_UTIL_PROG" btrfs diff --git a/tests/btrfs/004 b/tests/btrfs/004 index 905770a..2ce628e 100755 --- a/tests/btrfs/004 +++ b/tests/btrfs/004 @@ -51,7 +51,7 @@ _supported_fs btrfs _supported_os Linux _require_scratch _require_no_large_scratch_dev -_require_btrfs inspect-internal +_require_btrfs_subcommand inspect-internal _require_command "/usr/sbin/filefrag" filefrag rm -f $seqres.full diff --git a/tests/btrfs/048 b/tests/btrfs/048 index 0b907b0..ac731d1 100755 --- a/tests/btrfs/048 +++ b/tests/btrfs/048 @@ -48,7 +48,7 @@ _supported_fs btrfs _supported_os Linux _require_test _require_scratch -_require_btrfs "property" +_require_btrfs_subcommand "property" send_files_dir=$TEST_DIR/btrfs-test-$seq diff --git a/tests/btrfs/059 b/tests/btrfs/059 index 8f106d2..fd67ebb 100755 --- a/tests/btrfs/059 +++ b/tests/btrfs/059 @@ -51,7 +51,7 @@ _supported_fs btrfs _supported_os Linux _require_test _require_scratch -_require_btrfs "property" +_require_btrfs_subcommand "property" rm -f $seqres.full -- 2.7.4