test: add a target to execute non-zdtm tests

make -C test other
Signed-off-by: Andrew Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

test/Makefile

@@ -9,6 +9,13 @@ all: .FORCE
 	$(MAKE) zdtm
 .PHONY: all
 
+TESTS = unix-callback mem-snap rpc libcriu
+
+other: .FORCE
+	for t in $(TESTS); do			\
+		$(MAKE) -C $$t run || break;	\
+	done					\
+
 zdtm: .FORCE
 	$(MAKE) zdtm_ns
 	for t in $(shell echo "$(TST)" | tr ' ' '\n' | grep -Pv $(EXP)); do \

test/libcriu/Makefile

 all: build/test
 .PHONY: all
 
+run: all
+	./run.sh
+
 build/test: build/test.o
 	gcc $^ -L ../../lib -lcriu -o $@
 

test/libcriu/run.sh

@@ -53,7 +53,8 @@ LOOP_PID=${!}
 echo "pid ${LOOP_PID}"
 
 title_print "Run test.c"
-LD_LIBRARY_PATH=../../../lib
+ln -s ../../../lib/libcriu.so libcriu.so.1
+LD_LIBRARY_PATH=.
 export LD_LIBRARY_PATH
 ./test ${LOOP_PID} || _exit $?
 

test/mem-snap/Makefile

+run: all
+	./run.sh

test/mem-snap/run.sh

+#!/bin/bash
+
+# Don't execute tests, which use maps04, they are executed by zdtm
+
+set -e
+
+#./run-predump-2.sh
+./run-predump.sh
+./run-snap-auto-dedup.sh
+./run-snap-dedup-on-restore.sh
+./run-snap-dedup.sh
+#./run-snap-maps04.sh
+./run-snap.sh

test/rpc/Makefile

 all: test-c rpc_pb2.py
 .PHONY: all
 
+run: all
+	./run.sh
+
 test-c: rpc.pb-c.o test.o
 	gcc $^ -o $@ -lprotobuf-c
 

test/tcp/Makefile

@@ -3,6 +3,9 @@ OBJS=cln srv
 all: $(OBJS)
 .PHONY: all
 
+run: all
+	./run.sh
+
 clean:
 	rm -f $(OBJS)
 .PHONY: clean

test/unix-callback/Makefile

 all: unix-lib.so unix-server unix-client syslog-lib.so
 
+run: all
+	./run.sh
+
 unix.pb-c.c: unix.proto
 	protoc-c --proto_path=. --c_out=. unix.proto