btrfs-progs: test/common: Enhance prepare_test_dev to reset device size

[platform/upstream/btrfs-progs.git] / tests / common

diff --git a/tests/common b/tests/common
index ebd41ba..734cd17 100644 (file)
--- a/tests/common
+++ b/tests/common
@@ -35,7 +35,7 @@ _is_file_or_command()
        if [ -f "$msg" -o -d "$msg" -o -b "$msg" ]; then
                return 0
        fi
-       msg=$(type -p "$msg")
+       msg=$(type -p -- "$msg")
        if [ -f "$msg" ]; then
                return 0
        fi
@@ -154,9 +154,12 @@ run_check_stdout()
        echo "############### $@" >> "$RESULTS" 2>&1
        if [[ $TEST_LOG =~ tty ]]; then echo "CMD(stdout): $@" > /dev/tty; fi
        if [ "$1" = 'root_helper' ]; then
-               "$@" 2>&1 | tee -a "$RESULTS" || _fail "failed: $@"
+               "$@" 2>&1 | tee -a "$RESULTS"
        else
-               $INSTRUMENT "$@" 2>&1 | tee -a "$RESULTS" || _fail "failed: $@"
+               $INSTRUMENT "$@" 2>&1 | tee -a "$RESULTS"
+       fi
+       if [ ${PIPESTATUS[0]} -ne 0 ]; then
+               _fail "failed: $@"
        fi
 }
 
@@ -233,6 +236,58 @@ run_mustfail()
        fi
 }
 
+# The first parameter is error message to print if it fails, just like
+# run_must_fail().
+# NOTE: we don't use pipefail to avoid disturbing other script, so here we
+# use a temporary output file.
+# So it doesn't support pipeline in the @cmd
+run_mustfail_stdout()
+{
+       local spec
+       local ins
+       local cmd
+       local msg
+       local ret
+       local tmp_output
+
+       tmp_output=$(mktemp --tmpdir btrfs-progs-test--mustfail-stdtout.XXXXXX)
+
+       msg="$1"
+       shift
+
+       if _is_file_or_command "$msg"; then
+               echo "ASSERTION FAIL: 1st argument of run_mustfail_stdout must be a message"
+               exit 1
+       fi
+
+       ins=$(_get_spec_ins "$@")
+       spec=$(($ins-1))
+       cmd=$(eval echo "\${$spec}")
+       spec=$(_cmd_spec "${@:$spec}")
+       set -- "${@:1:$(($ins-1))}" $spec "${@: $ins}"
+       echo "############### $@" >> "$RESULTS" 2>&1
+       if [[ $TEST_LOG =~ tty ]]; then echo "CMD(mustfail): $@" > /dev/tty; fi
+       if [ "$1" = 'root_helper' ]; then
+               "$@" 2>&1 > "$tmp_output"
+       else
+               $INSTRUMENT "$@" 2>&1 > "$tmp_output"
+       fi
+       ret=$?
+
+       cat "$tmp_output" >> "$RESULTS"
+       cat "$tmp_output"
+       rm "$tmp_output"
+
+       if [ "$ret" != 0 ]; then
+               echo "failed (expected): $@" >> "$RESULTS"
+               return 0
+       else
+               echo "succeeded (unexpected!): $@" >> "$RESULTS"
+               _fail "unexpected success: $msg"
+               return 1
+       fi
+}
+
 check_prereq()
 {
        if ! [ -f "$TOP/$1" ]; then
@@ -386,8 +441,12 @@ prepare_test_dev()
        # num[K/M/G/T...]
        local size="$1"
 
-       [[ "$TEST_DEV" ]] && return
        [[ "$size" ]] || size='2G'
+       # Still truncate it to new size
+       if [ -n "$TEST_DEV" ]; then
+               truncate -s "$size" "$TEST_DEV"
+               return;
+       fi
 
        echo "\$TEST_DEV not given, use $TOP/test/test.img as fallback" >> \
                "$RESULTS"
@@ -425,8 +484,12 @@ run_check_umount_test_dev()
 check_kernel_support()
 {
        if ! grep -iq 'btrfs' /proc/filesystems; then
-               echo "WARNING: btrfs filesystem not listed in /proc/filesystems, some tests might fail"
-               return 1
+               run_check $SUDO_HELPER modprobe btrfs
+                       if ! grep -iq 'btrfs' /proc/filesystems; then
+                               echo \
+"WARNING: btrfs filesystem not found in /proc/filesystems, some tests might fail"
+                               return 1
+                       fi
        fi
        return 0
 }
@@ -506,7 +569,7 @@ generate_dataset() {
                        ;;
 
                slow_symlink)
-                       long_filename=`date +%s | sha256sum | cut -f1 -d'-'`
+                       long_filename=`date +%s | sha256sum | cut -f1 -d ' '`
                        run_check $SUDO_HELPER touch "$dirpath/$long_filename"
                        for num in $(seq 1 "$DATASET_SIZE"); do
                                run_check $SUDO_HELPER ln -s "$dirpath/$long_filename" "$dirpath/slow_slink.$num"
@@ -548,7 +611,7 @@ prepare_loopdevs()
        done
 }
 
-# detach loop devices and reset their size to 0, does not delete the files
+# detach loop devices and reset their size to 0, delete the files afterwards
 cleanup_loopdevs()
 {
        for dev in ${loopdevs[@]}; do
@@ -556,6 +619,7 @@ cleanup_loopdevs()
        done
        for i in `seq $nloopdevs`; do
                truncate -s0 $loopdev_prefix$i
+               rm -- "$loopdev_prefix$i"
        done
        run_check $SUDO_HELPER losetup --all
 }