From 4305d024938113df5d73021a09eb2a991f54ca2f Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Mon, 13 Feb 2017 11:24:33 +0000 Subject: New upstream release Closes: #849353, #817806, #854915, #845473 --- tests/fuzz-tests.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'tests/fuzz-tests.sh') diff --git a/tests/fuzz-tests.sh b/tests/fuzz-tests.sh index 29691cae..f72385e5 100755 --- a/tests/fuzz-tests.sh +++ b/tests/fuzz-tests.sh @@ -3,13 +3,13 @@ # misc tests on fuzzed or crafted images 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/fuzz-tests-results.txt" IMAGE="$TOP/tests/test.img" -source $TOP/tests/common +source "$TOP/tests/common" export TOP export RESULTS @@ -17,24 +17,27 @@ export LANG export IMAGE export TEST_DEV -rm -f $RESULTS +rm -f "$RESULTS" check_prereq btrfs # The tests are driven by their custom script called 'test.sh' -for i in $(find $TOP/tests/fuzz-tests -maxdepth 1 -mindepth 1 -type d \ +for i in $(find "$TOP/tests/fuzz-tests" -maxdepth 1 -mindepth 1 -type d \ ${TEST:+-name "$TEST"} | sort) do - name=$(basename $i) + name=$(basename "$i") cd $i if [ -x test.sh ]; then - echo "=== Entering $i" >> $RESULTS + echo "=== Entering $i" >> "$RESULTS" echo " [TEST/fuzz] $name" ./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 -- cgit v1.2.3