From: David Sterba Date: Thu, 10 Nov 2016 17:57:38 +0000 (+0100) Subject: btrfs-progs: tests: check if kernel has btrfs support X-Git-Tag: upstream/4.16.1~1024 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ad7a967d1bcbb77b12b610b9db3ee07518ddb83;p=platform%2Fupstream%2Fbtrfs-progs.git btrfs-progs: tests: check if kernel has btrfs support Add some sanity checks, reported among other issues via bugzilla. References: https://bugzilla.kernel.org/show_bug.cgi?id=177141 Signed-off-by: David Sterba --- diff --git a/tests/cli-tests.sh b/tests/cli-tests.sh index 72f7865..86dda87 100755 --- a/tests/cli-tests.sh +++ b/tests/cli-tests.sh @@ -20,6 +20,7 @@ export TEST_DEV rm -f $RESULTS check_prereq btrfs +check_kernel_support # The tests are driven by their custom script called 'test.sh' diff --git a/tests/common b/tests/common index 420286d..c20fec8 100644 --- a/tests/common +++ b/tests/common @@ -280,10 +280,20 @@ run_check_umount_test_dev() run_check $SUDO_HELPER umount "$@" "$TEST_DEV" } +check_kernel_support() +{ + if ! grep -iq 'btrfs' /proc/filesystems; then + echo "WARNING: btrfs filesystem not listed in /proc/filesystems, some tests might fail" + return 1 + fi + return 0 +} + init_env() { TEST_MNT="${TEST_MNT:-$TOP/tests/mnt}" export TEST_MNT mkdir -p "$TEST_MNT" || { echo "Failed mkdir -p $TEST_MNT"; exit 1; } + } init_env diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh index 0e025f9..db14972 100755 --- a/tests/convert-tests.sh +++ b/tests/convert-tests.sh @@ -21,6 +21,8 @@ export TEST_DEV rm -f $RESULTS +check_kernel_support + run_one_test() { local testdir local testname diff --git a/tests/fsck-tests.sh b/tests/fsck-tests.sh index d1cd732..69ec57a 100755 --- a/tests/fsck-tests.sh +++ b/tests/fsck-tests.sh @@ -23,6 +23,7 @@ rm -f $RESULTS check_prereq btrfs-corrupt-block check_prereq btrfs-image check_prereq btrfs +check_kernel_support run_one_test() { local testname diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh index eefe8a8..fd19c2f 100755 --- a/tests/misc-tests.sh +++ b/tests/misc-tests.sh @@ -24,6 +24,7 @@ check_prereq btrfs-corrupt-block check_prereq btrfs-image check_prereq btrfstune check_prereq btrfs +check_kernel_support # The tests are driven by their custom script called 'test.sh' diff --git a/tests/mkfs-tests.sh b/tests/mkfs-tests.sh index 1afc028..3c5465f 100755 --- a/tests/mkfs-tests.sh +++ b/tests/mkfs-tests.sh @@ -21,6 +21,7 @@ rm -f $RESULTS check_prereq mkfs.btrfs check_prereq btrfs +check_kernel_support # The tests are driven by their custom script called 'test.sh'