[CRIU] [RFC PATCHv2 15/32] zdtm: Makefile: use different launcher arguments for tests which do busy-loops

Ivan Shapovalov intelfx at intelfx.name
Sat Mar 12 00:42:14 PST 2016


This patch adds a `%.args-multi` target, which says "--lib <path to binary>"
for all regular tests and "--lib-threaded <path to binary>" for those tests
which perform busy loops during C/R.

Currently, this target is not used. It will be used in the multi-test
launcher added in the next commits.

Signed-off-by: Ivan Shapovalov <intelfx at intelfx.name>
---
 test/zdtm/Makefile.live       |  6 ++++++
 test/zdtm/static/Makefile     | 11 +++++++++++
 test/zdtm/transition/Makefile | 18 ++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/test/zdtm/Makefile.live b/test/zdtm/Makefile.live
index e041d4f..127ce66 100644
--- a/test/zdtm/Makefile.live
+++ b/test/zdtm/Makefile.live
@@ -27,6 +27,12 @@ install: all
 %.args-global:
 	@echo --pidfile=$(basename $@).pid --outfile=$(basename $@).out
 
+%.args-multi:
+	@echo --lib $(basename $(@D)/$(@F))
+
+$(TST_BUSY_LOOP:%=%.args-multi):
+	@echo --lib-threaded $(basename $(@D)/$(@F))
+
 $(TST_NOFILE:%=%.args)::
 
 $(TST_FILE:%=%.args)::
diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
index a1552c4..9af625c 100644
--- a/test/zdtm/static/Makefile
+++ b/test/zdtm/static/Makefile
@@ -239,6 +239,17 @@ TST_STATE	=				\
 		conntracks			\
 		route_rules			\
 
+TST_BUSY_LOOP   =                               \
+                busyloop00                      \
+                rtc                             \
+                socket-tcpbuf                   \
+                socket-tcpbuf-local             \
+                socket-tcpbuf6                  \
+                socket-tcpbuf6-local            \
+                mem-touch                       \
+                uptime_grow                     \
+
+# note to above: sigpending does test_go() in a separate thread for sanity checking only
 
 all: criu-rtc.so
 
diff --git a/test/zdtm/transition/Makefile b/test/zdtm/transition/Makefile
index 6b87072..82b07a3 100644
--- a/test/zdtm/transition/Makefile
+++ b/test/zdtm/transition/Makefile
@@ -24,6 +24,24 @@ TST_FILE	=	\
 		fifo_loop       \
 
 
+TST_BUSY_LOOP   =               \
+                fork            \
+                fork2           \
+                ipc             \
+                maps007         \
+                pipe_loop00     \
+                pipe_shared00   \
+                socket-tcp      \
+                socket-tcp6     \
+                epoll           \
+                fifo_dyn        \
+                fifo_loop       \
+                file_aio        \
+                ptrace          \
+                socket_loop00   \
+                unix_sock       \
+
+
 file_aio:	override LDLIBS += -lrt -pthread
 socket-tcp:	override CFLAGS += -D STREAM
 socket-tcp6:	override CFLAGS += -D ZDTM_IPV6 -D STREAM
-- 
2.7.2



More information about the CRIU mailing list