btrfs-progs: update CHANGES for v4.13.3

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

diff --git a/tests/common b/tests/common
index ebd41ba..eb525a4 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
 }
 
@@ -506,7 +509,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 +551,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 +559,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
 }