btrfs-progs: tests: check for kernel support for reiserfs

Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/tests/common.convert b/tests/common.convert
index 7d9a5be..1be804c 100644 (file)
--- a/tests/common.convert
+++ b/tests/common.convert
@@ -275,3 +275,17 @@ convert_test() {
 
        convert_test_post_rollback "$fstype"
 }
+
+load_module_reiserfs()
+{
+       $SUDO_HELPER modprobe reiserfs
+}
+
+check_kernel_support_reiserfs()
+{
+       if ! grep -iq 'reiserfs' /proc/filesystems; then
+               echo "WARNING: reiserfs filesystem not listed in /proc/filesystems, some tests might be skipped"
+               return 1
+       fi
+       return 0
+}

diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh
index 8e97b22..2a92a58 100755 (executable)
--- a/tests/convert-tests.sh
+++ b/tests/convert-tests.sh
@@ -22,6 +22,7 @@ export TEST_DEV
 rm -f "$RESULTS"
 
 check_kernel_support
+check_kernel_support_reiserfs
 # anything expected by common.convert
 check_global_prereq getfacl
 check_global_prereq setfacl

diff --git a/tests/convert-tests/010-reiserfs-basic/test.sh b/tests/convert-tests/010-reiserfs-basic/test.sh
index 32e15de..261f870 100755 (executable)
--- a/tests/convert-tests/010-reiserfs-basic/test.sh
+++ b/tests/convert-tests/010-reiserfs-basic/test.sh
@@ -3,6 +3,10 @@
 source "$TOP/tests/common"
 source "$TOP/tests/common.convert"
 
+if ! check_kernel_support_reiserfs >/dev/null; then
+       _not_run "no reiserfs support"
+fi
+
 setup_root_helper
 prepare_test_dev 512M
 check_prereq btrfs-convert

diff --git a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
index 98dc5d6..c6c3119 100755 (executable)
--- a/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
+++ b/tests/convert-tests/011-reiserfs-delete-all-rollback/test.sh
@@ -4,6 +4,10 @@
 source "$TOP/tests/common"
 source "$TOP/tests/common.convert"
 
+if ! check_kernel_support_reiserfs >/dev/null; then
+       _not_run "no reiserfs support"
+fi
+
 setup_root_helper
 prepare_test_dev 512M
 check_prereq btrfs-convert

diff --git a/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh b/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
index d9abbd8..7a8d497 100755 (executable)
--- a/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
+++ b/tests/convert-tests/012-reiserfs-large-hole-extent/test.sh
@@ -8,6 +8,10 @@
 source "$TOP/tests/common"
 source "$TOP/tests/common.convert"
 
+if ! check_kernel_support_reiserfs >/dev/null; then
+       _not_run "no reiserfs support"
+fi
+
 setup_root_helper
 prepare_test_dev 512M
 check_prereq btrfs-convert

diff --git a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
index d620a05..e242a3b 100755 (executable)
--- a/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
+++ b/tests/convert-tests/013-reiserfs-common-inode-flags/test.sh
@@ -4,6 +4,10 @@
 source "$TOP/tests/common"
 source "$TOP/tests/common.convert"
 
+if ! check_kernel_support_reiserfs >/dev/null; then
+       _not_run "no reiserfs support"
+fi
+
 setup_root_helper
 prepare_test_dev 512M
 check_prereq btrfs-convert

diff --git a/tests/convert-tests/014-reiserfs-tail-handling/test.sh b/tests/convert-tests/014-reiserfs-tail-handling/test.sh
index aba5337..f6131d9 100755 (executable)
--- a/tests/convert-tests/014-reiserfs-tail-handling/test.sh
+++ b/tests/convert-tests/014-reiserfs-tail-handling/test.sh
@@ -9,6 +9,10 @@
 source "$TOP/tests/common"
 source "$TOP/tests/common.convert"
 
+if ! check_kernel_support_reiserfs >/dev/null; then
+       _not_run "no reiserfs support"
+fi
+
 setup_root_helper
 prepare_test_dev 512M
 check_prereq btrfs-convert