Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
classify: skip l2 header in CLI
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
5b7dd36
..
def06a3
100644
(file)
--- 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 += 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 += 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
LIBFFI=libffi6 # works on all but 20.04 and debian-testing
@@
-95,6
+96,10
@@
else ifeq ($(OS_VERSION_ID),20.10)
LIBFFI=libffi8ubuntu1
else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-10)
DEB_DEPENDS += virtualenv
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
else
# TODO: change CLANG_FORMAT_VER default in extras/scripts/checkstyle.sh
# when clang-format-10 is removed
@@
-257,7
+262,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 " 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\" )"
@echo " DPDK_CONFIG=<conf> - add specified dpdk config commands to"
@echo " autogenerated startup.conf"
@echo " (e.g. \"no-pci\" )"
@@
-408,7
+412,6
@@
wipe-release: test-wipe $(BR)/.deps.ok
rebuild-release: wipe-release build-release
export TEST_DIR ?= $(WS_ROOT)/test
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,)
define test
$(if $(filter-out $(2),retest),make -C $(BR) PLATFORM=vpp TAG=$(1) vpp-install,)
@@
-422,6
+425,7
@@
define test
OS_ID=$(OS_ID) \
RND_SEED=$(RND_SEED) \
CACHE_OUTPUT=$(CACHE_OUTPUT) \
OS_ID=$(OS_ID) \
RND_SEED=$(RND_SEED) \
CACHE_OUTPUT=$(CACHE_OUTPUT) \
+ TAG=$(1) \
$(2)
endef
$(2)
endef
@@
-439,12
+443,12
@@
test-gcov:
.PHONY: test-all
test-all:
.PHONY: test-all
test-all:
- $(eval EXTENDED_TESTS=
yes
)
+ $(eval EXTENDED_TESTS=
1
)
$(call test,vpp,test)
.PHONY: test-all-debug
test-all-debug:
$(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
$(call test,vpp_debug,test)
.PHONY: papi-wipe
@@
-491,7
+495,7
@@
test-wipe-doc:
.PHONY: test-cov
test-cov:
.PHONY: test-cov
test-cov:
- $(eval EXTENDED_TESTS=
yes
)
+ $(eval EXTENDED_TESTS=
1
)
$(call test,vpp_gcov,cov)
.PHONY: test-wipe-cov
$(call test,vpp_gcov,cov)
.PHONY: test-wipe-cov
@@
-524,12
+528,12
@@
retest-debug:
.PHONY: retest-all
retest-all:
.PHONY: retest-all
retest-all:
- $(eval EXTENDED_TESTS=
yes
)
+ $(eval EXTENDED_TESTS=
1
)
$(call test,vpp,retest)
.PHONY: retest-all-debug
retest-all-debug:
$(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
$(call test,vpp_debug,retest)
.PHONY: test-start-vpp-in-gdb