From a4118a6e82db75cbe25704262fc225d49e1c1acf Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Fri, 1 Nov 2013 15:37:54 +0400
Subject: [PATCH] zdtm: show logs only in verbose mode

It's may be useful for Jenkins or other auto executors, but human would
prefer to open log file in text editor rather than scroll a terminal
history.

The error message in non-verbose mode contains only critical information
such as error messages and paths to log files.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 test/zdtm.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 4aa3be7b4..bd08e4223 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -155,6 +155,7 @@ CRIU_CPT=$CRIU
 TMP_TREE=""
 SCRIPTDIR=`dirname $CRIU`/test
 POSTDUMP="--action-script $SCRIPTDIR/post-dump.sh"
+VERBOSE=0
 
 ARGS=""
 
@@ -578,10 +579,12 @@ EOF
 		if [ -e "$DUMP_PATH/dump.log" ]; then
 			echo "Dump log   : $DUMP_PATH/dump.log"
 			cat $DUMP_PATH/dump.log* | grep Error
-			cat <<EOF
+			if [ $VERBOSE -gt 0 ]; then
+				cat <<EOF
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 EOF
-			tail -n 40 $DUMP_PATH/dump.log*
+				tail -n 40 $DUMP_PATH/dump.log*
+			fi
 			cat <<EOF
 -------------------------------------------------------------------
 EOF
@@ -589,10 +592,12 @@ EOF
 		if [ -e "$DUMP_PATH/restore.log" ]; then
 			echo "Restore log: $DUMP_PATH/restore.log"
 			cat $DUMP_PATH/restore.log* | grep Error
-			cat <<EOF
+			if [ $VERBOSE -gt 0 ]; then
+				cat <<EOF
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 EOF
-			tail -n 40 $DUMP_PATH/restore.log*
+				tail -n 40 $DUMP_PATH/restore.log*
+			fi
 			cat <<EOF
 -------------------------------------------------------------------
 EOF
@@ -650,6 +655,7 @@ Options:
 	-g : Generate executables only
 	-n : Batch test
 	-r : Run test with specified name directly without match or check
+	-v : Verbose mode 
 EOF
 }
 
@@ -723,6 +729,10 @@ while :; do
 		echo $TEST_LIST | tr ' ' '\n'
 		exit 0
 		;;
+	  -v)
+		VERBOSE=1
+		shift
+		;;
 	  -h)
 		usage
 		exit 0