[CRIU] [PATCH] test: shm-unaligned -- Use unique key

Cyrill Gorcunov gorcunov at openvz.org
Thu Jun 1 01:45:10 PDT 2017


For convenient simultaneous run.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 test/zdtm/static/Makefile | 2 ++
 test/zdtm/static/shm.c    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index 1ea9393ce461..7e62082482e3 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -463,6 +463,8 @@ pty-console:		CFLAGS += -D ZDTM_DEV_CONSOLE
 userns02:		CFLAGS += -D USERNS02
 proc-self01:		override CFLAGS += -D PROC_SELF01
 
+shm-unaligned:		CFLAGS += -DZDTM_SHM_UNALIGNED
+
 $(LIB):	force
 	$(Q) $(MAKE) -C $(LIBDIR)
 
diff --git a/test/zdtm/static/shm.c b/test/zdtm/static/shm.c
index d033321356eb..a177e3561728 100644
--- a/test/zdtm/static/shm.c
+++ b/test/zdtm/static/shm.c
@@ -111,7 +111,11 @@ int main(int argc, char **argv)
 
 	test_init(argc, argv);
 
+#ifdef ZDTM_SHM_UNALIGNED
 	key = ftok(argv[0], 822155666);
+#else
+	key = ftok(argv[0], 822155667);
+#endif
 	if (key == -1) {
 		pr_perror("Can't make key");
 		goto out;
-- 
2.7.4



More information about the CRIU mailing list