[CRIU] [crtools-bot for Andrey Vagin ] zdtm.sh: clean up output

Cyrill Gorcunov gorcunov at openvz.org
Fri Feb 17 06:20:27 EST 2012


The commit is pushed to "master" and will appear on git://github.com/cyrillos/crtools.git
------>
commit 427349c737eb0601ed8607ba10cc8dd60026525f
Author: Andrey Vagin <avagin at openvz.org>
Date:   Fri Feb 17 11:16:39 2012 +0300

    zdtm.sh: clean up output
    
    * Remove redundant messages
    * Show which test will be executed
    
    Signed-off-by: Andrey Vagin <avagin at openvz.org>
    Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 test/zdtm.sh |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 36c494b..3120e41 100644
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -72,7 +72,9 @@ run_test()
 	local tname=`basename $test`
 	local tdir=`dirname $test`
 
-	killall -9 $tname
+	echo "Execute $test"
+
+	killall -9 $tname &> /dev/null
 	make -C $tdir cleanout $tname.pid
 
 	local pid ddump
@@ -87,7 +89,7 @@ run_test()
 		echo WARNING: process $tname is left running for your debugging needs
 		return 1
 	}
-	if expr " $ARGS" : ' -s'; then
+	if expr " $ARGS" : ' -s' > /dev/null; then
 		save_fds $pid  $ddump/dump.fd.after
 		diff_fds $ddump/dump.fd $ddump/dump.fd.after || return 1
 		killall -CONT $tname


More information about the CRIU mailing list