X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=37dbf593564463d0a6f0722fe901be1773b9d59c;hb=3ace4d62e2dd23154f00dcc6eb7991477f7eb5c5;hp=5b7dd36d77b44b4f27c390cd9c487952a2e0c918;hpb=ea2721f76649c94133debce1877dc6b079c8bfcb;p=vpp.git

diff --git a/Makefile b/Makefile
index 5b7dd36d77b..37dbf593564 100644
--- a/Makefile
+++ b/Makefile
@@ -72,10 +72,11 @@ DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema python3-yaml
 DEB_DEPENDS += python3-venv  # ensurepip
 DEB_DEPENDS += python3-dev   # needed for python3 -m pip install psutil
 DEB_DEPENDS += libnl-3-dev libnl-route-3-dev libmnl-dev
-DEB_DEPENDS += enchant  # for docs
+# DEB_DEPENDS += enchant  # for docs
 DEB_DEPENDS += python3-virtualenv
 DEB_DEPENDS += libssl-dev
 DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
+DEB_DEPENDS += iperf3 # for 'make test TEST=vcl'
 
 LIBFFI=libffi6 # works on all but 20.04 and debian-testing
 
@@ -83,22 +84,20 @@ ifeq ($(OS_VERSION_ID),20.04)
 	DEB_DEPENDS += python3-virtualenv
 	DEB_DEPENDS += libssl-dev
 	DEB_DEPENDS += libelf-dev # for libbpf (af_xdp)
-	# TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
-	#       when clang-format-10 is removed
-	DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
+	DEB_DEPENDS += clang-11 clang-format-11
 	LIBFFI=libffi7
 	DEB_DEPENDS += enchant-2  # for docs
 else ifeq ($(OS_VERSION_ID),20.10)
-	# TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
-	#       when clang-format-10 is removed
-	DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
+	DEB_DEPENDS += clang-11 clang-format-11
 	LIBFFI=libffi8ubuntu1
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
 	DEB_DEPENDS += virtualenv
+else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-11)
+	DEB_DEPENDS += virtualenv
+	DEB_DEPENDS += clang-11 clang-format-11
+	LIBFFI=libffi7
 else
-	# TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
-	#       when clang-format-10 is removed
-	DEB_DEPENDS += clang-11 clang-format-11 clang-format-10
+	DEB_DEPENDS += clang-11 clang-format-11
 	LIBFFI=libffi7
 	DEB_DEPENDS += enchant-2  # for docs
 endif
@@ -257,7 +256,6 @@ help:
 	@echo "                            startup.conf file is present"
 	@echo " GDB=<path>               - gdb binary to use for debugging"
 	@echo " PLATFORM=<name>          - target platform. default is vpp"
-	@echo " TEST=<filter>            - apply filter to test set, see test-help"
 	@echo " DPDK_CONFIG=<conf>       - add specified dpdk config commands to"
 	@echo "                            autogenerated startup.conf"
 	@echo "                            (e.g. \"no-pci\" )"
@@ -320,7 +318,7 @@ ifeq ($(OS_ID),rhel)
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),centos-8)
 	@sudo -E dnf install $(CONFIRM) dnf-plugins-core epel-release
 	@sudo -E dnf config-manager --set-enabled \
-          $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1)
+          $(shell dnf repolist all 2>/dev/null|grep -i powertools|cut -d' ' -f1|grep -v source)
 	@sudo -E dnf groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo -E dnf install --skip-broken $(CONFIRM) $(RPM_DEPENDS)
 else ifeq ($(OS_ID),centos)
@@ -408,7 +406,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,)
@@ -422,6 +419,7 @@ define test
 	  OS_ID=$(OS_ID) \
 	  RND_SEED=$(RND_SEED) \
 	  CACHE_OUTPUT=$(CACHE_OUTPUT) \
+	  TAG=$(1) \
 	  $(2)
 endef
 
@@ -439,12 +437,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
@@ -491,7 +489,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
@@ -524,12 +522,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
@@ -635,7 +633,7 @@ json-api-files-debug:
 
 .PHONY: go-api-files
 go-api-files: json-api-files
-	$(WS_ROOT)/src/tools/vppapigen/generate_go.py
+	$(WS_ROOT)/src/tools/vppapigen/generate_go.py $(ARGS)
 
 .PHONY: ctags
 ctags: ctags.files