[CRIU] [PATCH 2/4] test: Merge zdtm/live streaming and transition tests
Pavel Emelyanov
xemul at virtuozzo.com
Fri Feb 19 05:35:21 PST 2016
These two sets are the same -- they test something and ask to be
C/R-ed at the time they do it. No other differences.
Signed-off-by: Pavel Emelyanov <xemul at virtuozzo.com>
---
test/zdtm/live/Makefile | 2 +-
test/zdtm/live/streaming/Makefile | 91 ----------------------
test/zdtm/live/transition/Makefile | 21 ++++-
.../zdtm/live/{streaming => transition}/fifo_dyn.c | 0
.../live/{streaming => transition}/fifo_dyn.desc | 0
.../live/{streaming => transition}/fifo_loop.c | 0
.../live/{streaming => transition}/fifo_loop.desc | 0
.../zdtm/live/{streaming => transition}/file_aio.c | 0
.../live/{streaming => transition}/file_aio.desc | 0
.../live/{streaming => transition}/netlink00.c | 0
.../live/{streaming => transition}/netlink00.desc | 0
.../live/{streaming => transition}/pipe_loop00.c | 0
.../live/{streaming => transition}/pipe_shared00.c | 0
.../live/{streaming => transition}/socket-tcp.c | 0
.../live/{streaming => transition}/socket-tcp.desc | 0
.../live/{streaming => transition}/socket-tcp.opts | 0
.../live/{streaming => transition}/socket-tcp6.c | 0
.../{streaming => transition}/socket-tcp6.desc | 0
.../{streaming => transition}/socket-tcp6.opts | 0
.../live/{streaming => transition}/socket_loop00.c | 0
.../{streaming => transition}/socket_loop00.desc | 0
.../live/{streaming => transition}/unix_sock.c | 0
.../live/{streaming => transition}/unix_sock.desc | 0
23 files changed, 19 insertions(+), 95 deletions(-)
delete mode 100644 test/zdtm/live/streaming/Makefile
rename test/zdtm/live/{streaming => transition}/fifo_dyn.c (100%)
rename test/zdtm/live/{streaming => transition}/fifo_dyn.desc (100%)
rename test/zdtm/live/{streaming => transition}/fifo_loop.c (100%)
rename test/zdtm/live/{streaming => transition}/fifo_loop.desc (100%)
rename test/zdtm/live/{streaming => transition}/file_aio.c (100%)
rename test/zdtm/live/{streaming => transition}/file_aio.desc (100%)
rename test/zdtm/live/{streaming => transition}/netlink00.c (100%)
rename test/zdtm/live/{streaming => transition}/netlink00.desc (100%)
rename test/zdtm/live/{streaming => transition}/pipe_loop00.c (100%)
rename test/zdtm/live/{streaming => transition}/pipe_shared00.c (100%)
rename test/zdtm/live/{streaming => transition}/socket-tcp.c (100%)
rename test/zdtm/live/{streaming => transition}/socket-tcp.desc (100%)
rename test/zdtm/live/{streaming => transition}/socket-tcp.opts (100%)
rename test/zdtm/live/{streaming => transition}/socket-tcp6.c (100%)
rename test/zdtm/live/{streaming => transition}/socket-tcp6.desc (100%)
rename test/zdtm/live/{streaming => transition}/socket-tcp6.opts (100%)
rename test/zdtm/live/{streaming => transition}/socket_loop00.c (100%)
rename test/zdtm/live/{streaming => transition}/socket_loop00.desc (100%)
rename test/zdtm/live/{streaming => transition}/unix_sock.c (100%)
rename test/zdtm/live/{streaming => transition}/unix_sock.desc (100%)
diff --git a/test/zdtm/live/Makefile b/test/zdtm/live/Makefile
index 0640bb4..87c0e7e 100644
--- a/test/zdtm/live/Makefile
+++ b/test/zdtm/live/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = streaming transition static
+SUBDIRS = transition static
default: all
.PHONY: default
diff --git a/test/zdtm/live/streaming/Makefile b/test/zdtm/live/streaming/Makefile
deleted file mode 100644
index e65e3fd..0000000
--- a/test/zdtm/live/streaming/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-include ../../Makefile.inc
-
-LIBDIR = ../../lib
-LIB = $(LIBDIR)/libzdtmtst.a
-override CPPFLAGS += -I$(LIBDIR)
-CFLAGS = -g -O2 -Wall -Werror -fno-strict-aliasing
-CFLAGS += $(USERCFLAGS)
-
-TST_NOFILE = \
- pipe_loop00 \
- pipe_shared00 \
- socket_loop00 \
- netlink00 \
- file_aio \
- socket-tcp \
- socket-tcp6 \
-
-TST_FILE = \
- unix_sock \
- fifo_dyn \
- fifo_loop \
-
-TST = $(TST_NOFILE) $(TST_FILE)
-SRC = $(TST:%=%.c)
-OBJ = $(SRC:%.c=%.o)
-DEP = $(SRC:%.c=%.d)
-PID = $(TST:%=%.pid)
-OUT = $(TST:%=%.out)
-
-DEPEND.c = $(COMPILE.c) -MM -MP
-%.d: %.c
- $(DEPEND.c) $(OUTPUT_OPTION) $<
-
-all: $(TST)
-install: all
-.PHONY: all install
-
-$(TST_NOFILE:%=%.pid): %.pid: %
- $(<D)/$(<F) --pidfile=$@ --outfile=$<.out
-
-$(TST_FILE:%=%.pid): %.pid: %
- $(<D)/$(<F) --pidfile=$@ --outfile=$<.out --filename=$<.test
-
-%.out: %.pid %
- -kill -TERM `cat $<`
-
-start: $(PID)
-
-%.is_running: %.pid
- kill -0 `cat $<`
-
-check_start: $(PID:%.pid=%.is_running)
-
-stop:
- -kill -TERM `cat *.pid`
-
-WAIT_TIME=10
-wait_stop:
- -for i in `seq 1 $(WAIT_TIME)`; do \
- kill -0 `cat *.pid 2>/dev/null` 2>/dev/null || break; \
- sleep 1; \
- done
-
-$(TST): $(LIB)
-
-file_aio: override LDLIBS += -lrt -pthread
-socket-tcp: override CFLAGS += -D STREAM
-socket-tcp6: override CFLAGS += -D ZDTM_IPV6 -D STREAM
-
-$(LIB): force
- $(Q) $(MAKE) -C $(LIBDIR)
-
-clean:
- $(RM) -f $(OBJ) $(TST) *~
-
-cleandep: clean
- $(RM) -f $(DEP)
-
-%.cleanout: %
- $(Q) $(RM) -f -r $<.pid $<.init.pid $<.out* $<.test
-
-cleanout:
- $(RM) -f *.pid *.out* *.test*
-
-realclean: cleandep cleanout
-
-.PHONY: force clean cleandep cleanout realclean start check_start stop wait_stop
-
-ifeq ($(filter-out no-deps-targets, $(MAKECMDGOALS)),)
--include $(DEP)
-endif
diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile
index c791e62..256d116 100644
--- a/test/zdtm/live/transition/Makefile
+++ b/test/zdtm/live/transition/Makefile
@@ -3,7 +3,7 @@ include ../../Makefile.inc
LIBDIR = ../../lib
LIB = $(LIBDIR)/libzdtmtst.a
override CPPFLAGS += -I$(LIBDIR)
-CFLAGS = -g -O2 -Wall -Werror
+CFLAGS = -g -O2 -Wall -Werror -fno-strict-aliasing
CFLAGS += $(USERCFLAGS)
TST_NOFILE = \
@@ -14,9 +14,21 @@ TST_NOFILE = \
fork2 \
thread-bomb \
maps007 \
+ pipe_loop00 \
+ pipe_shared00 \
+ socket_loop00 \
+ netlink00 \
+ file_aio \
+ socket-tcp \
+ socket-tcp6 \
+
TST_FILE = \
file_read \
+ unix_sock \
+ fifo_dyn \
+ fifo_loop \
+
TST = $(TST_NOFILE) $(TST_FILE)
SRC = $(TST:%=%.c)
@@ -61,11 +73,14 @@ wait_stop:
$(TST): $(LIB)
+file_aio: override LDLIBS += -lrt -pthread
+socket-tcp: override CFLAGS += -D STREAM
+socket-tcp6: override CFLAGS += -D ZDTM_IPV6 -D STREAM
ptrace.o: override CFLAGS += -pthread
ptrace: override LDFLAGS += -pthread
fork2: override CFLAGS += -D FORK2
-thread-bomb.o: override CFLAGS += -pthread
-thread-bomb: override LDFLAGS += -pthread
+thread-bomb.o: override CFLAGS += -pthread
+thread-bomb: override LDFLAGS += -pthread
%: %.sh
cp $< $@
diff --git a/test/zdtm/live/streaming/fifo_dyn.c b/test/zdtm/live/transition/fifo_dyn.c
similarity index 100%
rename from test/zdtm/live/streaming/fifo_dyn.c
rename to test/zdtm/live/transition/fifo_dyn.c
diff --git a/test/zdtm/live/streaming/fifo_dyn.desc b/test/zdtm/live/transition/fifo_dyn.desc
similarity index 100%
rename from test/zdtm/live/streaming/fifo_dyn.desc
rename to test/zdtm/live/transition/fifo_dyn.desc
diff --git a/test/zdtm/live/streaming/fifo_loop.c b/test/zdtm/live/transition/fifo_loop.c
similarity index 100%
rename from test/zdtm/live/streaming/fifo_loop.c
rename to test/zdtm/live/transition/fifo_loop.c
diff --git a/test/zdtm/live/streaming/fifo_loop.desc b/test/zdtm/live/transition/fifo_loop.desc
similarity index 100%
rename from test/zdtm/live/streaming/fifo_loop.desc
rename to test/zdtm/live/transition/fifo_loop.desc
diff --git a/test/zdtm/live/streaming/file_aio.c b/test/zdtm/live/transition/file_aio.c
similarity index 100%
rename from test/zdtm/live/streaming/file_aio.c
rename to test/zdtm/live/transition/file_aio.c
diff --git a/test/zdtm/live/streaming/file_aio.desc b/test/zdtm/live/transition/file_aio.desc
similarity index 100%
rename from test/zdtm/live/streaming/file_aio.desc
rename to test/zdtm/live/transition/file_aio.desc
diff --git a/test/zdtm/live/streaming/netlink00.c b/test/zdtm/live/transition/netlink00.c
similarity index 100%
rename from test/zdtm/live/streaming/netlink00.c
rename to test/zdtm/live/transition/netlink00.c
diff --git a/test/zdtm/live/streaming/netlink00.desc b/test/zdtm/live/transition/netlink00.desc
similarity index 100%
rename from test/zdtm/live/streaming/netlink00.desc
rename to test/zdtm/live/transition/netlink00.desc
diff --git a/test/zdtm/live/streaming/pipe_loop00.c b/test/zdtm/live/transition/pipe_loop00.c
similarity index 100%
rename from test/zdtm/live/streaming/pipe_loop00.c
rename to test/zdtm/live/transition/pipe_loop00.c
diff --git a/test/zdtm/live/streaming/pipe_shared00.c b/test/zdtm/live/transition/pipe_shared00.c
similarity index 100%
rename from test/zdtm/live/streaming/pipe_shared00.c
rename to test/zdtm/live/transition/pipe_shared00.c
diff --git a/test/zdtm/live/streaming/socket-tcp.c b/test/zdtm/live/transition/socket-tcp.c
similarity index 100%
rename from test/zdtm/live/streaming/socket-tcp.c
rename to test/zdtm/live/transition/socket-tcp.c
diff --git a/test/zdtm/live/streaming/socket-tcp.desc b/test/zdtm/live/transition/socket-tcp.desc
similarity index 100%
rename from test/zdtm/live/streaming/socket-tcp.desc
rename to test/zdtm/live/transition/socket-tcp.desc
diff --git a/test/zdtm/live/streaming/socket-tcp.opts b/test/zdtm/live/transition/socket-tcp.opts
similarity index 100%
rename from test/zdtm/live/streaming/socket-tcp.opts
rename to test/zdtm/live/transition/socket-tcp.opts
diff --git a/test/zdtm/live/streaming/socket-tcp6.c b/test/zdtm/live/transition/socket-tcp6.c
similarity index 100%
rename from test/zdtm/live/streaming/socket-tcp6.c
rename to test/zdtm/live/transition/socket-tcp6.c
diff --git a/test/zdtm/live/streaming/socket-tcp6.desc b/test/zdtm/live/transition/socket-tcp6.desc
similarity index 100%
rename from test/zdtm/live/streaming/socket-tcp6.desc
rename to test/zdtm/live/transition/socket-tcp6.desc
diff --git a/test/zdtm/live/streaming/socket-tcp6.opts b/test/zdtm/live/transition/socket-tcp6.opts
similarity index 100%
rename from test/zdtm/live/streaming/socket-tcp6.opts
rename to test/zdtm/live/transition/socket-tcp6.opts
diff --git a/test/zdtm/live/streaming/socket_loop00.c b/test/zdtm/live/transition/socket_loop00.c
similarity index 100%
rename from test/zdtm/live/streaming/socket_loop00.c
rename to test/zdtm/live/transition/socket_loop00.c
diff --git a/test/zdtm/live/streaming/socket_loop00.desc b/test/zdtm/live/transition/socket_loop00.desc
similarity index 100%
rename from test/zdtm/live/streaming/socket_loop00.desc
rename to test/zdtm/live/transition/socket_loop00.desc
diff --git a/test/zdtm/live/streaming/unix_sock.c b/test/zdtm/live/transition/unix_sock.c
similarity index 100%
rename from test/zdtm/live/streaming/unix_sock.c
rename to test/zdtm/live/transition/unix_sock.c
diff --git a/test/zdtm/live/streaming/unix_sock.desc b/test/zdtm/live/transition/unix_sock.desc
similarity index 100%
rename from test/zdtm/live/streaming/unix_sock.desc
rename to test/zdtm/live/transition/unix_sock.desc
--
2.5.0
More information about the CRIU
mailing list