tests/others: a few fixes of paths

Signed-off-by: Andrew Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

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
 

test/others/env.sh

 #!/bin/sh
 
-CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../criu/criu)
+CRIU=$(readlink -f `dirname ${BASH_SOURCE[0]}`/../../criu/criu)
 criu=$CRIU

test/others/mounts/run.sh

 #!/bin/bash
 
-CRIU=../../../criu
+CRIU=../../../criu/criu
 set -x
 
 mkdir -p dump

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"

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