[CRIU] [PATCH 1/2] zdtm: don't execute ns/ and ns/user tests simultaneously

[Andrey Vagin]

One test can't be execute as ns/test ans ns/user/test
simultaneously, because they use the same file tree

Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 test/Makefile      | 3 ++-
 test/Makefile.zdtm | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 7a2688a..2bfc3c3 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -23,8 +23,9 @@ zdtm-tst-list: zdtm.sh
 	./zdtm.sh -l > zdtm-tst-list
 
 zdtm: zdtm-tst-list .FORCE 
-	$(MAKE) -f Makefile.zdtm zdtm_ns
 	$(MAKE) -f Makefile.zdtm zdtm_nons
+	$(MAKE) -f Makefile.zdtm zdtm_ns
+	$(MAKE) -f Makefile.zdtm zdtm_ns_user
 
 zdtm-pre-dump: zdtm-tst-list
 	ZDTM_ARGS="-P -p -i 3 -C" $(MAKE) -f Makefile.zdtm ns/static/pipe00
diff --git a/test/Makefile.zdtm b/test/Makefile.zdtm
index 576e088..ee39bd6 100644
--- a/test/Makefile.zdtm
+++ b/test/Makefile.zdtm
@@ -3,8 +3,9 @@ CFLAGS += -D_GNU_SOURCE
 
 .FORCE:
 
-zdtm_ns: $(shell echo "$(TST)" | tr ' ' '\n' | awk '/^ns\// && !/tty|pty/ {print}')
-zdtm_nons: $(shell echo "$(TST)" | tr ' ' '\n' | awk '!/^ns\// || /tty|pty/ {print}')
+zdtm_ns: $(shell echo "$(TST)" | tr ' ' '\n' | awk '/^ns\// && !/ns\/user/ {print}')
+zdtm_ns_user: $(shell echo "$(TST)" | tr ' ' '\n' | awk '/^ns\/user/ {print}')
+zdtm_nons: $(shell echo "$(TST)" | tr ' ' '\n' | awk '!/^ns\// {print}')
 
 $(TST): zdtm_ct mount_cgroups .FORCE
 	./zdtm.sh --ct ${ZDTM_ARGS} -r $(@) &> $(subst /,_,$@).log; \
-- 
1.9.3