From 0198590c5a4451febdb9e4f2dda8e824e7615a56 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@parallels.com>
Date: Tue, 1 Jul 2014 21:02:07 +0400
Subject: [PATCH] zdtm: Factor out starting the test via Makefule

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
---
 test/zdtm.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index 9bd09180f..cd7ee30e3 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -368,7 +368,7 @@ start_test()
 
 	if [ -z "$PIDNS" ]; then
 		TPID="$test.pid"
-		make -C $tdir $tname.pid || return 1
+		unset ZDTM_NEWNS
 	else
 		TPID=$(readlink -f $tdir)/$tname.init.pid
 		if [ -z "$ZDTM_ROOT" ]; then
@@ -378,17 +378,19 @@ start_test()
 			mount --bind . $ZDTM_ROOT || return 1
 		fi
 		construct_root $ZDTM_ROOT $tdir/$tname || return 1
-	(	export ZDTM_NEWNS=1
+		export ZDTM_NEWNS=1
 		export ZDTM_PIDFILE=$TPID
 		cd $ZDTM_ROOT
 		rm -f $ZDTM_PIDFILE
-		if ! make -C $tdir $tname.pid; then
-			echo ERROR: fail to start $tdir/$tname
-			return 1
-		fi
-	)
 	fi
 
+	if ! make -C $tdir $tname.pid; then
+		echo ERROR: fail to start $tdir/$tname
+		return 1
+	fi
+
+	[ -z "$ZDTM_ROOT" ] || cd -
+
 	PID=`cat "$TPID"` || return 1
 	if ! ps -p $PID ; then
 		echo "Test failed to start"