X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=def06a3656a99d244ecf8534bbad603c32ebd715;hb=b23ffd7ef216463c35b75c831e6a27e58971f4ec;hp=fb5bd1dd10faf56f526658823f0e1416a7493af0;hpb=8ccc6b350703d3390633636d2b1c2f578f37cb21;p=vpp.git diff --git a/Makefile b/Makefile index fb5bd1dd10f..def06a3656a 100644 --- a/Makefile +++ b/Makefile @@ -262,7 +262,6 @@ help: @echo " startup.conf file is present" @echo " GDB= - gdb binary to use for debugging" @echo " PLATFORM= - target platform. default is vpp" - @echo " TEST= - apply filter to test set, see test-help" @echo " DPDK_CONFIG= - add specified dpdk config commands to" @echo " autogenerated startup.conf" @echo " (e.g. \"no-pci\" )" @@ -413,7 +412,6 @@ wipe-release: test-wipe $(BR)/.deps.ok rebuild-release: wipe-release build-release export TEST_DIR ?= $(WS_ROOT)/test -export RND_SEED ?= $(shell python3 -c 'import time; print(time.time())') define test $(if $(filter-out $(2),retest),make -C $(BR) PLATFORM=vpp TAG=$(1) vpp-install,) @@ -427,6 +425,7 @@ define test OS_ID=$(OS_ID) \ RND_SEED=$(RND_SEED) \ CACHE_OUTPUT=$(CACHE_OUTPUT) \ + TAG=$(1) \ $(2) endef @@ -444,12 +443,12 @@ test-gcov: .PHONY: test-all test-all: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp,test) .PHONY: test-all-debug test-all-debug: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp_debug,test) .PHONY: papi-wipe @@ -496,7 +495,7 @@ test-wipe-doc: .PHONY: test-cov test-cov: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp_gcov,cov) .PHONY: test-wipe-cov @@ -529,12 +528,12 @@ retest-debug: .PHONY: retest-all retest-all: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp,retest) .PHONY: retest-all-debug retest-all-debug: - $(eval EXTENDED_TESTS=yes) + $(eval EXTENDED_TESTS=1) $(call test,vpp_debug,retest) .PHONY: test-start-vpp-in-gdb