diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-02-13 11:24:33 +0000 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2017-02-13 11:24:33 +0000 |
commit | 4305d024938113df5d73021a09eb2a991f54ca2f (patch) | |
tree | d9e7ecc9db14bcc1394607a9e6c644a8b93e9bea /tests/misc-tests.sh | |
parent | e693f0e4ffb1776a05b78264ee3d93d5f07efede (diff) |
New upstream release Closes: #849353, #817806, #854915, #845473
Diffstat (limited to 'tests/misc-tests.sh')
-rwxr-xr-x | tests/misc-tests.sh | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/misc-tests.sh b/tests/misc-tests.sh index eefe8a81..1c645c9b 100755 --- a/tests/misc-tests.sh +++ b/tests/misc-tests.sh @@ -3,13 +3,13 @@ # Misc tests LANG=C -SCRIPT_DIR=$(dirname $(readlink -f $0)) -TOP=$(readlink -f $SCRIPT_DIR/../) +SCRIPT_DIR=$(dirname $(readlink -f "$0")) +TOP=$(readlink -f "$SCRIPT_DIR/../") TEST_DEV=${TEST_DEV:-} RESULTS="$TOP/tests/misc-tests-results.txt" IMAGE="$TOP/tests/test.img" -source $TOP/tests/common +source "$TOP/tests/common" export TOP export RESULTS @@ -17,27 +17,31 @@ export LANG export TEST_DEV export IMAGE -rm -f $RESULTS +rm -f "$RESULTS" # test rely on corrupting blocks tool check_prereq btrfs-corrupt-block check_prereq btrfs-image check_prereq btrfstune check_prereq btrfs +check_kernel_support # The tests are driven by their custom script called 'test.sh' -for i in $(find $TOP/tests/misc-tests -maxdepth 1 -mindepth 1 -type d \ +for i in $(find "$TOP/tests/misc-tests" -maxdepth 1 -mindepth 1 -type d \ ${TEST:+-name "$TEST"} | sort) do echo " [TEST/misc] $(basename $i)" - cd $i - echo "=== Entering $i" >> $RESULTS + cd "$i" + echo "=== Entering $i" >> "$RESULTS" if [ -x test.sh ]; then ./test.sh if [ $? -ne 0 ]; then + if [[ $TEST_LOG =~ dump ]]; then + cat "$RESULTS" + fi _fail "test failed for case $(basename $i)" fi fi - cd $TOP + cd "$TOP" done |