summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1388977704..02c6288f15 100644
--- a/Makefile
+++ b/Makefile
@@ -114,16 +114,22 @@ NOCOMPILE:=1
endif
ifneq ($(filter %clean lint% help% what-jenkins-does,$(MAKECMDGOALS)),)
NOMKDIR:=1
+UNIT_TEST:=1
endif
endif
-ifneq ($(filter %-test %-tests,$(MAKECMDGOALS)),)
+ifneq ($(filter help%, $(MAKECMDGOALS)), )
+NOCOMPILE:=1
+UNIT_TEST:=1
+else
+ifneq ($(filter %-test %-tests, $(MAKECMDGOALS)),)
ifneq ($(filter-out %-test %-tests, $(MAKECMDGOALS)),)
$(error Cannot mix unit-tests targets with other targets)
endif
UNIT_TEST:=1
NOCOMPILE:=
endif
+endif
$(xcompile): util/xcompile/xcompile
rm -f $@
@@ -141,6 +147,7 @@ include $(TOPLEVEL)/Makefile.inc
include $(TOPLEVEL)/payloads/Makefile.inc
include $(TOPLEVEL)/util/testing/Makefile.inc
-include $(TOPLEVEL)/site-local/Makefile.inc
+include $(TOPLEVEL)/tests/Makefile.inc
real-all:
@echo "Error: Expected config file ($(DOTCONFIG)) not present." >&2
@echo "Please specify a config file or run 'make menuconfig' to" >&2