[CRIU] [RFC PATCH 20/21] zdtm: Makefile: run tests with busy-loops using threaded launcher mode

[Ivan Shapovalov]

Signed-off-by: Ivan Shapovalov <intelfx at intelfx.name>
---
 test/zdtm/live/Makefile.live       | 8 +++++++-
 test/zdtm/live/static/Makefile     | 8 ++++++++
 test/zdtm/live/streaming/Makefile  | 6 ++++++
 test/zdtm/live/transition/Makefile | 6 ++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/test/zdtm/live/Makefile.live b/test/zdtm/live/Makefile.live
index 29cfb78..60ffaa9 100644
--- a/test/zdtm/live/Makefile.live
+++ b/test/zdtm/live/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):
@@ -39,7 +45,7 @@ $(TST_DIR_FILE:%=%.args):
 	@echo --dirname=$(basename $@).dir.test --filename=$(basename $@).test
 
 %.pid: %
-	../../launcher/launcher $(shell $(MAKE) -s $<.args-global) --lib $(<D)/$(<F) $(shell $(MAKE) -s $<.args)
+	../../launcher/launcher $(shell $(MAKE) -s $<.args-global $<.args-multi $<.args)
 
 %.out: %.pid %
 	-kill -TERM `cat $<`
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index 3ea47c4..488d2b1 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -236,6 +236,14 @@ TST_STATE	=				\
 		conntracks			\
 		route_rules			\
 
+TST_BUSY_LOOP   =                               \
+                busyloop00                      \
+                rtc                             \
+                socket-tcpbuf                   \
+                socket-tcpbuf-local             \
+                socket-tcpbuf6                  \
+                socket-tcpbuf6-local
+# sigpending does test_go() in a separate thread for sanity checking only
 
 all: criu-rtc.so
 
diff --git a/test/zdtm/live/streaming/Makefile b/test/zdtm/live/streaming/Makefile
index e77f3aa..cdefc9c 100644
--- a/test/zdtm/live/streaming/Makefile
+++ b/test/zdtm/live/streaming/Makefile
@@ -14,6 +14,12 @@ TST_FILE	=	\
 		fifo_dyn	\
 		fifo_loop	\
 
+TST_BUSY_LOOP   =               \
+                pipe_loop00     \
+                pipe_shared00   \
+                socket-tcp      \
+                socket-tcp6
+
 file_aio: override LDLIBS += -lrt -pthread
 socket-tcp: override CFLAGS += -D STREAM
 socket-tcp6: override CFLAGS += -D ZDTM_IPV6 -D STREAM
diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile
index 43b3d8d..b2e2ccc 100644
--- a/test/zdtm/live/transition/Makefile
+++ b/test/zdtm/live/transition/Makefile
@@ -12,6 +12,12 @@ TST_NOFILE	=	\
 TST_FILE	=	\
 		file_read	\
 
+TST_BUSY_LOOP   =               \
+                fork            \
+                fork2           \
+                ipc             \
+                maps007
+
 ptrace:		override LDFLAGS += -pthread
 fork2.o:		override CFLAGS += -D FORK2
 thread-bomb:		override LDFLAGS += -pthread
-- 
2.7.1