From 4305d024938113df5d73021a09eb2a991f54ca2f Mon Sep 17 00:00:00 2001
From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 13 Feb 2017 11:24:33 +0000
Subject: New upstream release Closes: #849353, #817806, #854915, #845473

---
 tests/convert-tests.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'tests/convert-tests.sh')

diff --git a/tests/convert-tests.sh b/tests/convert-tests.sh
index 0e025f99..c5663367 100755
--- a/tests/convert-tests.sh
+++ b/tests/convert-tests.sh
@@ -4,14 +4,14 @@
 # clean.
 
 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/convert-tests-results.txt"
 IMAGE="$TOP/tests/test.img"
 
-source $TOP/tests/common
-source $TOP/tests/common.convert
+source "$TOP/tests/common"
+source "$TOP/tests/common.convert"
 
 export TOP
 export RESULTS
@@ -19,7 +19,9 @@ export LANG
 export IMAGE
 export TEST_DEV
 
-rm -f $RESULTS
+rm -f "$RESULTS"
+
+check_kernel_support
 
 run_one_test() {
 	local testdir
@@ -29,12 +31,15 @@ run_one_test() {
 	testname=$(basename "$testdir")
 	echo "    [TEST/conv]   $testname"
 	cd "$testdir"
-	echo "=== Entering $testname" >> $RESULTS
+	echo "=== Entering $testname" >> "$RESULTS"
 	if [ -x test.sh ]; then
 		# Only support custom test scripts
 		./test.sh
 		if [ $? -ne 0 ]; then
 			_fail "test failed for case $testname"
+			if [[ $TEST_LOG =~ dump ]]; then
+				cat "$RESULTS"
+			fi
 		fi
 	else
 		_fail "custom test script not found"
@@ -42,7 +47,7 @@ run_one_test() {
 }
 
 # Test special images
-for i in $(find $TOP/tests/convert-tests -maxdepth 1 -mindepth 1 -type d \
+for i in $(find "$TOP/tests/convert-tests" -maxdepth 1 -mindepth 1 -type d \
 	   ${TEST:+-name "$TEST"} | sort)
 do
 	run_one_test "$i"
-- 
cgit v1.2.3