[CRIU] [PATCH 4/4] tests/others: a few fixes of paths

[Andrey Vagin]

From: Andrew Vagin <avagin at virtuozzo.com>

Signed-off-by: Andrew Vagin <avagin at virtuozzo.com>
---
 test/Makefile                        | 2 +-
 test/others/env.sh                   | 2 +-
 test/others/mounts/run.sh            | 2 +-
 test/others/socketpairs/socketpair.c | 2 +-
 test/others/unix-callback/Makefile   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 4102658..0c68a86 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -15,7 +15,7 @@ TESTS = unix-callback mem-snap rpc libcriu mounts/ext security pipes crit socket
 
 other:
 	for t in $(TESTS); do				\
-		setsid $(MAKE) -C $$t run || exit 1;	\
+		setsid $(MAKE) -C others/$$t run || exit 1;	\
 	done
 .PHONY: other
 
diff --git a/test/others/env.sh b/test/others/env.sh
index 4fe030a..c211ed4 100755
--- a/test/others/env.sh
+++ b/test/others/env.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../criu/criu)
+CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu/criu)
 criu=$CRIU
diff --git a/test/others/mounts/run.sh b/test/others/mounts/run.sh
index 6428239..35927fb 100755
--- a/test/others/mounts/run.sh
+++ b/test/others/mounts/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CRIU=../../../criu
+CRIU=../../../criu/criu
 set -x
 
 mkdir -p dump
diff --git a/test/others/socketpairs/socketpair.c b/test/others/socketpairs/socketpair.c
index 900c3d6..d0c1bbd 100644
--- a/test/others/socketpairs/socketpair.c
+++ b/test/others/socketpairs/socketpair.c
@@ -46,7 +46,7 @@ typedef unsigned long ulong;
 
 #define MAX_FORKS	3	/* child, checkpoint, restore */
 
-#define CRIU_BINARY		"../../criu/criu"
+#define CRIU_BINARY		"../../../criu/criu"
 #define IMG_DIR			"images"
 #define DUMP_LOG_FILE		"dump.log"
 #define RESTORE_LOG_FILE	"restore.log"
diff --git a/test/others/unix-callback/Makefile b/test/others/unix-callback/Makefile
index f2993c5..25bcf22 100644
--- a/test/others/unix-callback/Makefile
+++ b/test/others/unix-callback/Makefile
@@ -7,10 +7,10 @@ unix.pb-c.c: unix.proto
 	protoc-c --proto_path=. --c_out=. unix.proto
 
 unix-lib.so: unix-lib.c unix.pb-c.c
-	gcc -g -Werror -Wall -shared -nostartfiles unix-lib.c unix.pb-c.c -o unix-lib.so -iquote ../../include -fPIC
+	gcc -g -Werror -Wall -shared -nostartfiles unix-lib.c unix.pb-c.c -o unix-lib.so -iquote ../../../criu/include -fPIC
 
 syslog-lib.so: syslog-lib.c
-	gcc -g -Werror -Wall -shared -nostartfiles syslog-lib.c -o syslog-lib.so -iquote ../../include -fPIC
+	gcc -g -Werror -Wall -shared -nostartfiles syslog-lib.c -o syslog-lib.so -iquote ../../../criu/include -fPIC
 
 unix-server: unix-server.c
 	gcc -Werror -Wall -o unix-server unix-server.c
-- 
2.5.0