[CRIU] [PATCH] test: expand the default test set

[Andrey Vagin]

* check page server
* check snapshots
* check a few iterations of dump/restore

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 test/Makefile                 | 14 ++++++++++++--
 test/jenkins/criu-btrfs.sh    |  2 +-
 test/jenkins/criu-dump.sh     |  2 +-
 test/jenkins/criu-iter.sh     |  2 +-
 test/jenkins/criu-pre-dump.sh |  2 +-
 test/jenkins/criu-snap.sh     |  2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 3687692..4c35b5b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,8 +5,8 @@ ZDTM_ARGS ?= -C
 
 .FORCE:
 
-all: .FORCE
-	$(MAKE) zdtm
+all: zdtm zdtm-pre-dump zdtm-snapshot zdtm-iter
+
 .PHONY: all
 
 TESTS = unix-callback mem-snap rpc libcriu mounts/ext security
@@ -19,6 +19,16 @@ other: .FORCE
 zdtm: .FORCE 
 	$(MAKE) zdtm_ns
 	$(MAKE) zdtm_nons
+
+zdtm-pre-dump:
+	ZDTM_ARGS="-P -p -i 3 -C" $(MAKE) ns/static/pipe00
+
+zdtm-snapshot:
+	ZDTM_ARGS="-s -i 3 -C" $(MAKE) ns/static/pipe00
+
+zdtm-iter:
+	ZDTM_ARGS="-i 3 -C" $(MAKE) ns/static/pipe00
+
 .PHONY: zdtm
 
 fault-injection: .FORCE
diff --git a/test/jenkins/criu-btrfs.sh b/test/jenkins/criu-btrfs.sh
index 400e6c8..e749ad9 100644
--- a/test/jenkins/criu-btrfs.sh
+++ b/test/jenkins/criu-btrfs.sh
@@ -2,5 +2,5 @@
 
 source `dirname $0`/criu-lib.sh &&
 prep &&
-make -C test -j 4 ZDTM_ARGS="-C -x '\(maps04\|mountpoints\|inotify_irmap\)'" &&
+make -C test -j 4 ZDTM_ARGS="-C -x '\(maps04\|mountpoints\|inotify_irmap\)'" zdtm &&
 true || fail
diff --git a/test/jenkins/criu-dump.sh b/test/jenkins/criu-dump.sh
index 3d69cf9..a32894e 100644
--- a/test/jenkins/criu-dump.sh
+++ b/test/jenkins/criu-dump.sh
@@ -4,5 +4,5 @@ source `dirname $0`/criu-lib.sh &&
 prep &&
 mkdir -p test/dump &&
 mount -t tmpfs dump test/dump &&
-make -C test -j 4 ZDTM_ARGS="-d -C -x static/cgroup02" &&
+make -C test -j 4 ZDTM_ARGS="-d -C -x static/cgroup02" zdtm &&
 true || fail
diff --git a/test/jenkins/criu-iter.sh b/test/jenkins/criu-iter.sh
index a537866..49e77f6 100644
--- a/test/jenkins/criu-iter.sh
+++ b/test/jenkins/criu-iter.sh
@@ -2,5 +2,5 @@
 
 source `dirname $0`/criu-lib.sh &&
 prep &&
-make -C test -j 4 ZDTM_ARGS="-C -i 3" &&
+make -C test -j 4 ZDTM_ARGS="-C -i 3" zdtm &&
 true || fail
diff --git a/test/jenkins/criu-pre-dump.sh b/test/jenkins/criu-pre-dump.sh
index 66758fe..a06445c 100644
--- a/test/jenkins/criu-pre-dump.sh
+++ b/test/jenkins/criu-pre-dump.sh
@@ -4,5 +4,5 @@ source `dirname $0`/criu-lib.sh &&
 prep &&
 mkdir -p test/dump &&
 mount -t tmpfs dump test/dump &&
-make -C test -j 4 'ZDTM_ARGS=-P -i 3 -C' &&
+make -C test -j 4 'ZDTM_ARGS=-P -i 3 -C' zdtm &&
 true || fail
diff --git a/test/jenkins/criu-snap.sh b/test/jenkins/criu-snap.sh
index f92a4f0..33a92bd 100644
--- a/test/jenkins/criu-snap.sh
+++ b/test/jenkins/criu-snap.sh
@@ -4,5 +4,5 @@ source `dirname $0`/criu-lib.sh &&
 prep &&
 mkdir -p test/dump &&
 mount -t tmpfs dump test/dump &&
-make -C test -j 4 ZDTM_ARGS="-s -i 3 -C -x '\(unlink\|socket-tcp\)'" &&
+make -C test -j 4 ZDTM_ARGS="-s -i 3 -C -x '\(unlink\|socket-tcp\)'" zdtm &&
 true || fail
-- 
1.9.3