[CRIU] [PATCH v7] zdtm: print test dir, dump and restore path (if any) in case of error

[Kinsbursky Stanislav]

From: Stanislav Kinsbursky <skinsbursky at parallels.com>

v7: cosmetic chages due to public pressure

v6: silly "/" miss fixed

v5: it finally workks as expected

v4: fixed wrong error print after successfull  run on all zdtm tests

v3: spaces removed

v2: print test output file path  (if present)

Print dump and restore file in case of running all tests suit.

Signed-off-by: Stanislav Kinsbursky <skinsbursky at parallels.com>

---
 test/zdtm.sh |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 2586186..597f4da 100644
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ZP="zdtm/live/"
+ZP="zdtm/live"
 
 TEST_LIST="\
 $ZP/static/pipe00
@@ -46,7 +46,7 @@ run_test()
 	make -C $tdir cleanout $tname.pid
 	pid=`cat $test.pid`
 	ddump="dump/$tname/$pid"
-	dump_path=`pwd`"/"$ddump
+	DUMP_PATH=`pwd`"/"$ddump
 	mkdir -p $ddump
 	ls -l /proc/$pid/fd/
 	setsid $CRTOOLS dump -D $ddump -o dump.log -t $pid $2 || return 1
@@ -67,29 +67,36 @@ run_test()
 	cat $test.out | grep PASS || return 2
 }
 
+case_error()
+{
+	test=$1
+	test_log="`pwd`/$test.out"
+
+	echo "Test: $test"
+	echo "====================== ERROR ======================"
+
+	[ -e "$DUMP_PATH/dump.log" ] && echo "Dump log   : $DUMP_PATH/dump.log"
+	[ -e "$DUMP_PATH/restore.log" ] && echo "Restore log: $DUMP_PATH/restore.log"
+	[ -e "$test_log" ] && echo "Output file: $test_log"
+	exit 1
+}
+
 cd `dirname $0` || exit 1
 
 if [ $# -eq 0 ]; then
 	for t in $TEST_LIST; do
-		run_test $t "" || exit 1
+		run_test $t "" || case_error $t
 	done
 	for t in $NS_TEST_LIST; do
-		run_test $t "-n" || exit 1
+		run_test $t "-n" || case_error $t
 	done
 elif [ "$1" == "-l" ]; then
 	echo $TEST_LIST | sed -e "s#$ZP/##g" -e 's/ /\n/g'
 	echo $NS_TEST_LIST | sed -e "s#$ZP/##g" -e 's/ /\n/g'
 else
 	if echo "$NS_TEST_LIST" | fgrep -q "$1" ; then
-		run_test "$ZP/$1" "-n" && exit 0
-	else
-		run_test "$ZP/$1" && exit 0
-	fi
-	result=$?
-	echo "====================== ERROR ======================"
-	if [ $result == 1 ]; then
-		echo "Dump log: "$dump_path"/dump.log"
+		run_test "$ZP/$1" "-n" || case_error "$ZP/$1"
 	else
-		echo "Restore log: "$dump_path"/restore.log"
+		run_test "$ZP/$1" || case_error "$ZP/$1"
 	fi
 fi