[CRIU] [PATCH] zdtm: handle COMPAT_TEST from Makefile.inc

Andrei Vagin avagin at openvz.org
Sun Jan 8 23:48:00 PST 2017


From: Andrei Vagin <avagin at virtuozzo.com>

In this case it will work for any make commangs. For example:
make COMPAT_TEST=y -C test/zdtm/lib

Cc: Dmitry Safonov <dsafonov at virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
---
 test/zdtm/Makefile     | 8 --------
 test/zdtm/Makefile.inc | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/zdtm/Makefile b/test/zdtm/Makefile
index 2566a92..8abf214 100644
--- a/test/zdtm/Makefile
+++ b/test/zdtm/Makefile
@@ -1,13 +1,5 @@
 SUBDIRS	=	lib static transition
 
-ifeq ($(COMPAT_TEST),y)
-ifeq ($(ARCH),x86)
-        export USERCFLAGS += -m32
-        export CFLAGS += -m32
-        export LDFLAGS += -m32
-endif
-endif
-
 default:	all
 .PHONY: default lib static transition
 
diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
index 074e39b..ef7c1b8 100644
--- a/test/zdtm/Makefile.inc
+++ b/test/zdtm/Makefile.inc
@@ -30,4 +30,12 @@ endif
 
 RM := rm -f --one-file-system
 
+ifeq ($(COMPAT_TEST),y)
+ifeq ($(ARCH),x86)
+        export USERCFLAGS += -m32
+        export CFLAGS += -m32
+        export LDFLAGS += -m32
+endif
+endif
+
 export E Q RM
-- 
2.7.4



More information about the CRIU mailing list