[CRIU] [PATCH 3/4] zdtm: don't print useless messages from Makefile

Andrey Vagin avagin at openvz.org
Thu Jul 11 04:30:06 EDT 2013


Signed-off-by: Andrey Vagin <avagin at openvz.org>
---
 test/zdtm/Makefile.inc             | 10 ++++++++++
 test/zdtm/live/static/Makefile     |  4 ++--
 test/zdtm/live/streaming/Makefile  |  4 ++--
 test/zdtm/live/transition/Makefile |  4 ++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 1884050..08e826f 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -18,3 +18,13 @@ ifeq ($(ARCH),x86_64)
 endif
 
 CPPFLAGS += -iquote $(LIBDIR)/arch/$(ARCH)/include
+
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
+export E Q
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index 12ea4a5..feb2eef 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -239,7 +239,7 @@ socket_listen6: override CFLAGS += -D ZDTM_IPV6
 sigpending:		override LDLIBS += -lrt
 
 $(LIB):	force
-	$(MAKE) -C $(LIBDIR)
+	$(Q) $(MAKE) -C $(LIBDIR)
 
 clean:
 	$(RM) -f $(OBJ) $(TST) *~
@@ -251,7 +251,7 @@ cleanout:
 	$(RM) -f -r *.pid *.out* *.test* *.state
 
 %.cleanout: %
-	$(RM) -f -r $<.pid $<.out* *$<.test* $<.*.test $<.state
+	$(Q) $(RM) -f -r $<.pid $<.out* *$<.test* $<.*.test $<.state
 
 realclean:	cleandep cleanout
 
diff --git a/test/zdtm/live/streaming/Makefile b/test/zdtm/live/streaming/Makefile
index 51d543e..9dd27e5 100644
--- a/test/zdtm/live/streaming/Makefile
+++ b/test/zdtm/live/streaming/Makefile
@@ -66,7 +66,7 @@ socket-tcp: override CFLAGS += -D STREAM
 socket-tcp6: override CFLAGS += -D ZDTM_IPV6 -D STREAM
 
 $(LIB):	force
-	$(MAKE) -C $(LIBDIR)
+	$(Q) $(MAKE) -C $(LIBDIR)
 
 clean:
 	$(RM) -f $(OBJ) $(TST) *~
@@ -75,7 +75,7 @@ cleandep:	clean
 	$(RM) -f $(DEP)
 
 %.cleanout: %
-	$(RM) -f -r $<.pid $<.out* $<.test
+	$(Q) $(RM) -f -r $<.pid $<.out* $<.test
 
 cleanout:
 	$(RM) -f *.pid *.out* *.test*
diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile
index 66524e3..ea6568b 100644
--- a/test/zdtm/live/transition/Makefile
+++ b/test/zdtm/live/transition/Makefile
@@ -67,7 +67,7 @@ fork2:		override CFLAGS += -D FORK2
 	chmod +x $@
 
 $(LIB):	force
-	$(MAKE) -C $(LIBDIR)
+	$(Q) $(MAKE) -C $(LIBDIR)
 
 clean:
 	$(RM) -f $(OBJ) $(TST) *~
@@ -76,7 +76,7 @@ cleandep:	clean
 	$(RM) -f $(DEP)
 
 %.cleanout: %
-	$(RM) -f -r $<.pid $<.out* $<.test chew_$<.test*
+	$(Q) $(RM) -f -r $<.pid $<.out* $<.test chew_$<.test*
 
 cleanout:
 	$(RM) -f *.pid *.out* *.test chew*
-- 
1.8.3.1



More information about the CRIU mailing list