From 64592d97c1aebdb1f7a92c702d04ce269db08996 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 16 Feb 2017 14:57:43 +0000 Subject: [PATCH] mk: do not build tests by default Don't build tests with default "make" command. Require explicit command to build tests because not everybody interested in running unit tests. Following changes done in make rules: "make test-build" <--- Added "make test" <--- Updated functionality (build + run basic tests) Now "make test" builds all tests and runs unit test (test). Thanks to dependency resolving, it is possible to call "make test" directly after config, "make test" will compile dependent components (lib and drivers, but not apps). And a new "make test-build" make rule added which will build tests but not run unit test. "make test-build" has same dependency resolving features with "make test" To include "test" folder into makesystem, existing ROOTDIRS- variable is used instead of hardcoding folder name into makefiles, current usage of ROOTDIRS* variables are: ROOTDIRS-y <-- root level folders prepared and compiled by default ROOTDIRS- <-- root level folders prepared but not compiled by default The preparation is required for dependency resolving and cleaning. Signed-off-by: Ferruh Yigit Acked-by: Bruce Richardson --- GNUmakefile | 3 ++- mk/rte.sdkbuild.mk | 9 ++++++--- mk/rte.sdkdepdirs.mk | 2 +- mk/rte.sdkroot.mk | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index b1a5b761ab..45b7fbbe24 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -40,6 +40,7 @@ export RTE_SDK # directory list # -ROOTDIRS-y := buildtools lib drivers app test +ROOTDIRS-y := buildtools lib drivers app +ROOTDIRS- := test include $(RTE_SDK)/mk/rte.sdkroot.mk diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk index db6b98326a..02ff35b029 100644 --- a/mk/rte.sdkbuild.mk +++ b/mk/rte.sdkbuild.mk @@ -48,7 +48,7 @@ define depdirs_rule $(1): $(sort $(LOCAL_DEPDIRS-$(1))) endef -$(foreach d,$(ROOTDIRS-y),$(eval $(call depdirs_rule,$(d)))) +$(foreach d,$(ROOTDIRS-y) $(ROOTDIRS-),$(eval $(call depdirs_rule,$(d)))) drivers: | buildtools # @@ -72,9 +72,12 @@ clean: $(CLEANDIRS) $(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean @echo Clean complete +.PHONY: test-build +test-build: test + .SECONDEXPANSION: -.PHONY: $(ROOTDIRS-y) -$(ROOTDIRS-y): +.PHONY: $(ROOTDIRS-y) $(ROOTDIRS-) +$(ROOTDIRS-y) $(ROOTDIRS-): @[ -d $(BUILDDIR)/$@ ] || mkdir -p $(BUILDDIR)/$@ @echo "== Build $@" $(Q)$(MAKE) S=$@ -f $(RTE_SRCDIR)/$@/Makefile -C $(BUILDDIR)/$@ all diff --git a/mk/rte.sdkdepdirs.mk b/mk/rte.sdkdepdirs.mk index 38fd863681..1d4b12f27f 100644 --- a/mk/rte.sdkdepdirs.mk +++ b/mk/rte.sdkdepdirs.mk @@ -36,7 +36,7 @@ ifeq (,$(wildcard $(RTE_OUTPUT)/Makefile)) $(error "need a make config first") endif -DEPDIR_FILES = $(addsuffix /.depdirs, $(addprefix $(BUILDDIR)/,$(ROOTDIRS-y))) +DEPDIR_FILES = $(addsuffix /.depdirs, $(addprefix $(BUILDDIR)/,$(ROOTDIRS-y) $(ROOTDIRS-))) .PHONY: depdirs depdirs: $(RTE_OUTPUT)/.depdirs diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index 04ad523bb4..1bc0f94de8 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -96,6 +96,9 @@ config showconfigs showversion showversionum: test fast_test ring_test mempool_test perf_test coverage: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@ +.PHONY: test-buid +test: test-build + .PHONY: install install: $(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install -- 2.20.1