[CRIU] [PATCH 1/2] test: use an origin test name to generate uniq name for test files

[Andrew Vagin]

Currently ns/test and test may have the same test directory,
especially if zdtm.sh is executed with --ct.

Reported-by: Mr Jenkins
Signed-off-by: Andrew Vagin <avagin at openvz.org>
---
 test/zdtm.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/zdtm.sh b/test/zdtm.sh
index ac897ba..73fa963 100755
--- a/test/zdtm.sh
+++ b/test/zdtm.sh
@@ -574,6 +574,7 @@ diff_fds()
 
 run_test()
 {
+	local test_name=$1
 	local test=$1
 	local snappdir=
 	local ps_pid=
@@ -608,7 +609,7 @@ run_test()
 		make -C $tdir $tname && return 0 || return 1
 	fi
 
-	echo "Execute $test"
+	echo "Execute $test_name"
 
 	start_test $tdir $tname || return 1
 
@@ -653,7 +654,7 @@ EOF
 		local cpt_args=
 		local dump_only=
 		local dump_cmd="dump"
-		ddump=`readlink -fm dump/$(basename $tdir)/$tname/$PID/$i`
+		ddump=`readlink -fm dump/$test_name/$i/$PID`
 		DUMP_PATH=$ddump
 		echo Dump $PID
 		mkdir -p $ddump
-- 
1.9.3