linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org
Subject: [RFC PATCH 1/4] fstests: Add support to check btrfs sysfs features
Date: Tue,  2 Feb 2016 10:44:16 +0800	[thread overview]
Message-ID: <1454381059-27870-2-git-send-email-quwenruo@cn.fujitsu.com> (raw)
In-Reply-To: <1454381059-27870-1-git-send-email-quwenruo@cn.fujitsu.com>

Btrfs has its sysfs interface showing what features current kernel/btrfs
module support.

Add _require_btrfs_kernel_feature() to check such interface.

Also rename _require_btrfs() to _require_btrfs_subcommand() to avoid
confusion.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
---
 common/rc       | 12 +++++++++++-
 tests/btrfs/004 |  2 +-
 tests/btrfs/048 |  2 +-
 tests/btrfs/059 |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/common/rc b/common/rc
index 5135260..f95cd34 100644
--- a/common/rc
+++ b/common/rc
@@ -2583,7 +2583,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
@@ -2594,6 +2594,16 @@ _require_btrfs()
 	[ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support $cmd)"
 }
 
+# We check if the kernel support given btrfs feature from its sysfs interface
+_require_btrfs_kernel_feature()
+{
+	feat=$1
+	# Use /dev/btrfs-control to ensure btrfs is loaded
+	touch /dev/btrfs-control
+	[[ ! -f /sys/fs/btrfs/features/$feat ]] && \
+		_notrun "kernel does not support $feat feature"
+}
+
 # Check that fio is present, and it is able to execute given jobfile
 _require_fio()
 {
diff --git a/tests/btrfs/004 b/tests/btrfs/004
index d588c5b..b5686ec 100755
--- a/tests/btrfs/004
+++ b/tests/btrfs/004
@@ -52,7 +52,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 dc7386d..9ddd23f 100755
--- a/tests/btrfs/048
+++ b/tests/btrfs/048
@@ -47,7 +47,7 @@ _supported_fs btrfs
 _supported_os Linux
 _require_test
 _require_scratch
-_require_btrfs "property"
+_require_btrfs_subcommand "property"
 _need_to_be_root
 
 send_files_dir=$TEST_DIR/btrfs-test-$seq
diff --git a/tests/btrfs/059 b/tests/btrfs/059
index 3379ead..21d246c 100755
--- a/tests/btrfs/059
+++ b/tests/btrfs/059
@@ -50,7 +50,7 @@ _supported_fs btrfs
 _supported_os Linux
 _require_test
 _require_scratch
-_require_btrfs "property"
+_require_btrfs_subcommand "property"
 _need_to_be_root
 
 rm -f $seqres.full
-- 
2.7.0




  reply	other threads:[~2016-02-02  2:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-02  2:44 [RFC PATCH 0/4] fstests for basic btrfs inband de-duplication Qu Wenruo
2016-02-02  2:44 ` Qu Wenruo [this message]
2016-02-02  2:44 ` [RFC PATCH 2/4] fstests: btrfs: Add basic test for btrfs in-band de-duplication Qu Wenruo
2016-02-02  2:44 ` [RFC PATCH 3/4] fstests: btrfs: Add testcase for btrfs dedup enable disable race test Qu Wenruo
2016-02-02  2:44 ` [RFC PATCH 4/4] fstests: btrfs: Add per inode dedup flag test Qu Wenruo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1454381059-27870-2-git-send-email-quwenruo@cn.fujitsu.com \
    --to=quwenruo@cn.fujitsu.com \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).