From: Zhao Lei <zhao...@cn.fujitsu.com> When using loop device for test, fsck-tests/013-extent-tree-rebuild failed with following error message: # ./fsck-tests.sh ... [TEST] 013-extent-tree-rebuild failed: mount /data/btrfsprogs/tests/test.img /data/btrfsprogs/tests/mnt test failed for case 013-extent-tree-rebuild #
Considering that $TEST_DEV can be block or loop device, we need determine our mount option in a condition for both case. This patch make above request to a common function, to solve current problem in 013-extent-tree-rebuild, and support similar request in future. Signed-off-by: Zhao Lei <zhao...@cn.fujitsu.com> --- tests/common | 24 ++++++++++++++++++++++++ tests/fsck-tests/013-extent-tree-rebuild/test.sh | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/tests/common b/tests/common index ba0b78a..381ff96 100644 --- a/tests/common +++ b/tests/common @@ -165,3 +165,27 @@ init_env() mkdir -p "$TEST_MNT" || { echo "Failed mkdir -p $TEST_MNT"; exit 1; } } init_env + +mount_test_dev() +{ + local loop_opt + if [[ -b "$TEST_DEV" ]]; then + loop_opt=() + elif [[ -f "$TEST_DEV" ]]; then + loop_opt=(-o loop) + else + _fail "Invalid \$TEST_DEV: $TEST_DEV" + fi + + [[ -d "$TEST_MNT" ]] || { + _fail "Invalid \$TEST_MNT: $TEST_MNT" + } + + mount "${loop_opt[@]}" "$TEST_DEV" "$TEST_MNT" || _fail "mount $TEST_DEV to $TEST_MNT failed" +} + +umount_test_dev() +{ + umount "$TEST_DEV" +} + diff --git a/tests/fsck-tests/013-extent-tree-rebuild/test.sh b/tests/fsck-tests/013-extent-tree-rebuild/test.sh index b7909d2..ff3c922 100755 --- a/tests/fsck-tests/013-extent-tree-rebuild/test.sh +++ b/tests/fsck-tests/013-extent-tree-rebuild/test.sh @@ -12,14 +12,14 @@ test_extent_tree_rebuild() { run_check $SUDO_HELPER $TOP/mkfs.btrfs -f $TEST_DEV - run_check $SUDO_HELPER mount $TEST_DEV $TEST_MNT + run_check $SUDO_HELPER mount_test_dev run_check $SUDO_HELPER cp -aR /lib/modules/`uname -r`/ $TEST_MNT for i in `seq 1 100`;do run_check $SUDO_HELPER $TOP/btrfs sub snapshot $TEST_MNT \ $TEST_MNT/snapaaaaaaa_$i done - run_check $SUDO_HELPER umount $TEST_DEV + run_check $SUDO_HELPER umount_test_dev # get extent root bytenr extent_root_bytenr=`$SUDO_HELPER $TOP/btrfs-debug-tree -r $TEST_DEV | \ -- 1.8.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html