On Tue, Nov 22, 2016 at 04:38:09PM +0800, Qu Wenruo wrote: > 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 <quwenruo@xxxxxxxxxxxxxx> > --- > common/rc | 2 +- > tests/btrfs/004 | 2 +- > tests/btrfs/048 | 2 +- > tests/btrfs/059 | 2 +- > tests/btrfs/131 | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/common/rc b/common/rc > index e3b54ec..6d333dd 100644 > --- a/common/rc > +++ b/common/rc > @@ -3017,7 +3017,7 @@ _require_deletable_scratch_dev_pool() > } > > # We check for btrfs and (optionally) features of the btrfs command > -_require_btrfs() > +_require_btrfs_subcommand() _require_btrfs_command seems good enough. And it should be improved to handle subcommands like dump-tree (like what _require_xfs_io_command does), otherwise tests fail if old version of btrfs-progs is installed where inspect-internal doesn't have dump-tree support. Thanks, Eryu -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html