From 7de5fafc646514c3b72e9baacf2de9180e7f392e Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 30 Jan 2018 18:51:25 +0100 Subject: btrfs-progs: tests: enhance common umount helper to take optional paths The run_check_umount_test_dev umounts the TEST_DEV and also optionally uses the arguments but this would not work as expected if the TEST_DEV is not a vald path for umount (eg. a restored image). Update the helper so it tries to umount all paths, or fallback to TEST_DEV to keep the current behaviour. Signed-off-by: David Sterba --- tests/common | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/common b/tests/common index 2fac202a..8e5d0cde 100644 --- a/tests/common +++ b/tests/common @@ -477,10 +477,14 @@ run_check_mount_test_dev() run_check $SUDO_HELPER mount -t btrfs $loop_opt "$@" "$TEST_DEV" "$TEST_MNT" } +# $1-$n: optional paths to unmount, otherwise fallback to TEST_DEV run_check_umount_test_dev() { setup_root_helper - run_check $SUDO_HELPER umount "$@" "$TEST_DEV" + if [ "$#" = 0 ]; then + set -- "$TEST_DEV" + fi + run_check $SUDO_HELPER umount "$@" } check_kernel_support() -- cgit v1.2.3