From 18d4be7cca335931d9c4539444febbbd63a8581a Mon Sep 17 00:00:00 2001 From: Dmitry Safonov Date: Mon, 30 Apr 2018 19:41:57 +0100 Subject: [PATCH] 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 Reported-by: Andrei Vagin Signed-off-by: Dmitry Safonov Signed-off-by: Andrei Vagin --- test/zdtm/Makefile.inc | 3 +++ test/zdtm/static/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc index 12fa86e08..170f31632 100644 --- a/test/zdtm/Makefile.inc +++ b/test/zdtm/Makefile.inc @@ -98,6 +98,9 @@ dep: $(DEP) 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)),) -include $(wildcard $(DEP)) endif diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile index 4f2e97c26..fa8a9a237 100644 --- a/test/zdtm/static/Makefile +++ b/test/zdtm/static/Makefile @@ -205,8 +205,6 @@ TST_NOFILE := \ unlink_multiple_largefiles \ # jobctl00 \ -include ../Makefile.inc - ifneq ($(SRCARCH),arm) ifneq ($(COMPAT_TEST),y) TST_NOFILE += maps03 @@ -365,6 +363,8 @@ OUT = $(TST:%=%.out) STATE = $(TST_STATE:%=%.state) STATE_OUT = $(TST_STATE:%=%.out) +include ../Makefile.inc + all: $(TST) criu-rtc.so install: all .PHONY: all install