btrfs-progs: tests: Use '-t btrfs' mount option in tests

Without it, mount (at least from util-linux 2.20.1) tries (and fails) to
mount some filesystems as NTFS.

Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/tests/common b/tests/common
index 7ad436e..bed6009 100644 (file)
--- a/tests/common
+++ b/tests/common
@@ -387,7 +387,7 @@ run_check_mount_test_dev()
                _fail "Invalid \$TEST_MNT: $TEST_MNT"
        }
 
-       run_check $SUDO_HELPER mount $loop_opt "$@" "$TEST_DEV" "$TEST_MNT"
+       run_check $SUDO_HELPER mount -t btrfs $loop_opt "$@" "$TEST_DEV" "$TEST_MNT"
 }
 
 run_check_umount_test_dev()

diff --git a/tests/fsck-tests/012-leaf-corruption/test.sh b/tests/fsck-tests/012-leaf-corruption/test.sh
index 43b0e6d..fc10a4f 100755 (executable)
--- a/tests/fsck-tests/012-leaf-corruption/test.sh
+++ b/tests/fsck-tests/012-leaf-corruption/test.sh
@@ -90,7 +90,7 @@ check_inode()
 check_leaf_corrupt_no_data_ext()
 {
        image=$1
-       $SUDO_HELPER mount -o loop "$image" -o ro "$TEST_MNT"
+       $SUDO_HELPER mount -o loop -t btrfs "$image" -o ro "$TEST_MNT"
 
        i=0
        while [ $i -lt ${#leaf_no_data_ext_list[@]} ]; do