Commit 18d4be7c authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Andrei Vagin

zdtm/make: Include Makefile.inc after defining $(DEP)

Otherwise, tests dependencies are not considered for build.
Add an error in Makefile.inc so this won't happen again.

Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Reported-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
Signed-off-by: 's avatarDmitry Safonov <dima@arista.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent bf455467
...@@ -98,6 +98,9 @@ dep: $(DEP) ...@@ -98,6 +98,9 @@ dep: $(DEP)
no-deps-targets := clean cleandep cleanout realclean groups.cleanout no-deps-targets := clean cleandep cleanout realclean groups.cleanout
ifeq ($(strip $(DEP)),)
$(error No DEP defined in sub-make)
endif
ifeq ($(filter $(no-deps-targets), $(MAKECMDGOALS)),) ifeq ($(filter $(no-deps-targets), $(MAKECMDGOALS)),)
-include $(wildcard $(DEP)) -include $(wildcard $(DEP))
endif endif
......
...@@ -205,8 +205,6 @@ TST_NOFILE := \ ...@@ -205,8 +205,6 @@ TST_NOFILE := \
unlink_multiple_largefiles \ unlink_multiple_largefiles \
# jobctl00 \ # jobctl00 \
include ../Makefile.inc
ifneq ($(SRCARCH),arm) ifneq ($(SRCARCH),arm)
ifneq ($(COMPAT_TEST),y) ifneq ($(COMPAT_TEST),y)
TST_NOFILE += maps03 TST_NOFILE += maps03
...@@ -365,6 +363,8 @@ OUT = $(TST:%=%.out) ...@@ -365,6 +363,8 @@ OUT = $(TST:%=%.out)
STATE = $(TST_STATE:%=%.state) STATE = $(TST_STATE:%=%.state)
STATE_OUT = $(TST_STATE:%=%.out) STATE_OUT = $(TST_STATE:%=%.out)
include ../Makefile.inc
all: $(TST) criu-rtc.so all: $(TST) criu-rtc.so
install: all install: all
.PHONY: all install .PHONY: all install
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment