summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Buchbinder <abuchbinder@google.com>2017-07-12 13:05:22 -0700
committerDavid Sterba <dsterba@suse.com>2017-07-20 19:46:11 +0200
commit5c2cf48a4cc3f2aab5a478059d3e5f593554a738 (patch)
tree9c591eaf118a8e3a43fd1d3999965a4e80d1b02b
parent18b519e694a6ef559d85072f86898ab5a61f6a05 (diff)
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>
-rw-r--r--tests/common2
-rwxr-xr-xtests/fsck-tests/012-leaf-corruption/test.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/common b/tests/common
index 7ad436e3..bed60094 100644
--- 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 43b0e6de..fc10a4ff 100755
--- 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