mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 06:45:35 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Dmitry Safonov <dima@arista.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Dmitry Safonov
2018-04-30 19:41:57 +01:00
committed by Andrei Vagin
parent bf455467cf
commit 18d4be7cca
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/zdtm/Makefile.inc
View File

@@ -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

4
test/zdtm/static/Makefile
View File

@@ -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)
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