From a69c1917c255c453cecf8d693471324a77d8a1aa Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 10 Oct 2017 14:57:26 +0200 Subject: btrfs-progs: tests: fsck/007 fix so check --force works Signed-off-by: David Sterba --- tests/cli-tests/007-check-force/test.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'tests/cli-tests/007-check-force/test.sh') diff --git a/tests/cli-tests/007-check-force/test.sh b/tests/cli-tests/007-check-force/test.sh index 8b60033f..12b30205 100755 --- a/tests/cli-tests/007-check-force/test.sh +++ b/tests/cli-tests/007-check-force/test.sh @@ -8,9 +8,15 @@ check_prereq mkfs.btrfs check_prereq btrfs setup_root_helper -prepare_test_dev -run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV" +# we need to use a real block device, because the check opens the device in +# exclusive mode, that unfortunatelly behaves differently for direct file +# access and for the real /dev/loop0 device +setup_loopdevs 1 +prepare_loopdevs +TEST_DEV=${loopdevs[1]} + +run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV" run_check_mount_test_dev run_mustfail "checking mounted filesystem without --force" \ $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" @@ -22,3 +28,5 @@ run_check $SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV" run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV" run_mustfail "--force --repair on unmounted filesystem" \ $SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV" + +cleanup_loopdevs -- cgit v1.2.3