btrfs-progs: print-tree: Remove btrfs_root parameter

[platform/upstream/btrfs-progs.git] / tests / common.convert

diff --git a/tests/common.convert b/tests/common.convert
index 1d98cda..1be804c 100644 (file)
--- a/tests/common.convert
+++ b/tests/common.convert
@@ -218,9 +218,21 @@ convert_test_post_checks_all() {
 }
 
 # do rollback and fsck
+# $1: filesystem name or alias (ext2 includes ext3 and ext4),
 convert_test_post_rollback() {
+       local types
+
        run_check "$TOP/btrfs-convert" --rollback "$TEST_DEV"
-       run_check fsck -n -t ext2,ext3,ext4 "$TEST_DEV"
+       if [ -z "$1" ]; then
+               _fail "missing filesystem type to check"
+       fi
+       case "$1" in
+               ext[234]) types=ext2,ext3,ext4 ;;
+               reiserfs) types=reiserfs ;;
+               *) _fail "unknown filesystem type to check: $1" ;;
+       esac
+
+       run_check fsck -n -t "$types" "$TEST_DEV"
 }
 
 # simple wrapper for a convert test
@@ -261,5 +273,19 @@ convert_test() {
        rm -- "$EXT_PERMTMP"
        rm -- "$EXT_ACLTMP"
 
-       convert_test_post_rollback
+       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
 }