From ba4713d383c67edea32cddefb8d4c3cdde31e43b Mon Sep 17 00:00:00 2001
From: Andrey Vagin <avagin@openvz.org>
Date: Fri, 23 Jan 2015 00:07:05 +0300
Subject: [PATCH] zdtm.sh: don't allow anyone to print on stdout

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

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 01bcbec82..fa6b4bcdf 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+# duplicate stdout into 3
+exec 3<&1
+# duplicate stderr into stdout
+exec 1>&2
+
 ARCH=`uname -m | sed			\
 		-e s/i.86/i386/		\
 		-e s/sun4u/sparc64/	\
@@ -541,7 +546,13 @@ start_test()
 		rm -f $ZDTM_PIDFILE
 	fi
 
-	if ! make -C $tdir $tname.pid; then
+	(
+		# Here is no way to set FD_CLOEXEC on 3
+		exec 3>&-
+		make -C $tdir $tname.pid
+	)
+
+	if [ $? -ne 0 ]; then
 		echo ERROR: fail to start $test
 		return 1
 	fi
@@ -1025,7 +1036,7 @@ while :; do
 		shift
 		;;
 	  -l)
-		echo $TEST_LIST | tr ' ' '\n'
+		echo $TEST_LIST | tr ' ' '\n' >&3
 		exit 0
 		;;
 	  -v)