Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix IP feature ordering.
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b50d203
..
4454706
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-39,7
+39,8
@@
endif
DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
-DEB_DEPENDS += python-dev python-virtualenv python-pip lcov chrpath autoconf
+DEB_DEPENDS += lcov chrpath autoconf nasm
+DEB_DEPENDS += python-dev python-virtualenv python-pip libffi6
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
else
ifeq ($(OS_VERSION_ID),14.04)
DEB_DEPENDS += openjdk-8-jdk-headless
else
@@
-49,8
+50,9
@@
endif
RPM_DEPENDS_GROUPS = 'Development Tools'
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
RPM_DEPENDS_GROUPS = 'Development Tools'
RPM_DEPENDS = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
-RPM_DEPENDS += python-devel python-virtualenv lcov chrpath
-EPEL_DEPENDS = libconfuse-devel ganglia-devel
+RPM_DEPENDS += python-devel python-virtualenv lcov chrpath libffi-devel
+RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
+EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@
-82,8
+84,12
@@
help:
@echo " run-release - run release binary"
@echo " debug - run debug binary with debugger"
@echo " debug-release - run release binary with debugger"
@echo " run-release - run release binary"
@echo " debug - run debug binary with debugger"
@echo " debug-release - run release binary with debugger"
- @echo " test - build and run functional tests"
- @echo " test-debug - build and run functional tests (debug build)"
+ @echo " test - build and run (basic) functional tests"
+ @echo " test-debug - build and run (basic) functional tests (debug build)"
+ @echo " test-all - build and run (all) functional tests"
+ @echo " test-all-debug - build and run (all) functional tests (debug build)"
+ @echo " test-shell - enter shell with test environment"
+ @echo " test-shell-debug - enter shell with test environment (debug build)"
@echo " test-wipe - wipe files generated by unit tests"
@echo " retest - run functional tests"
@echo " retest-debug - run functional tests (debug build)"
@echo " test-wipe - wipe files generated by unit tests"
@echo " retest - run functional tests"
@echo " retest-debug - run functional tests (debug build)"
@@
-115,7
+121,7
@@
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=<
name> - only run specific test
"
+ @echo " TEST=<
filter> - apply filter to test set, see test-help
"
@echo ""
@echo "Current Argument Values:"
@echo " V = $(V)"
@echo ""
@echo "Current Argument Values:"
@echo " V = $(V)"
@@
-221,14
+227,23
@@
define test
VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
+ EXTENDED_TESTS=$(EXTENDED_TESTS) \
$(3)
endef
test: bootstrap
$(3)
endef
test: bootstrap
- $(call test,vpp
_lite,vpp_lite
,test)
+ $(call test,vpp
,vpp
,test)
test-debug: bootstrap
test-debug: bootstrap
- $(call test,vpp_lite,vpp_lite_debug,test)
+ $(call test,vpp,vpp_debug,test)
+
+test-all: bootstrap
+ $(eval EXTENDED_TESTS=yes)
+ $(call test,vpp,vpp,test)
+
+test-all-debug: bootstrap
+ $(eval EXTENDED_TESTS=yes)
+ $(call test,vpp,vpp_debug,test)
test-help:
@make -C test help
test-help:
@make -C test help
@@
-236,6
+251,12
@@
test-help:
test-wipe:
@make -C test wipe
test-wipe:
@make -C test wipe
+test-shell: bootstrap
+ $(call test,vpp_lite,vpp_lite,shell)
+
+test-shell-debug: bootstrap
+ $(call test,vpp_lite,vpp_lite_debug,shell)
+
test-doc:
@make -C test doc
test-doc:
@make -C test doc
@@
-243,7
+264,7
@@
test-wipe-doc:
@make -C test wipe-doc
test-cov: bootstrap
@make -C test wipe-doc
test-cov: bootstrap
- $(call test,vpp
_lite,vpp_lite
_gcov,cov)
+ $(call test,vpp
,vpp
_gcov,cov)
test-wipe-cov:
@make -C test wipe-cov
test-wipe-cov:
@make -C test wipe-cov
@@
-252,10
+273,10
@@
test-checkstyle:
@make -C test checkstyle
retest:
@make -C test checkstyle
retest:
- $(call test,vpp
_lite,vpp_lite
,retest)
+ $(call test,vpp
,vpp
,retest)
retest-debug:
retest-debug:
- $(call test,vpp
_lite,vpp_lite
_debug,retest)
+ $(call test,vpp
,vpp
_debug,retest)
STARTUP_DIR ?= $(PWD)
ifeq ("$(wildcard $(STARTUP_CONF))","")
STARTUP_DIR ?= $(PWD)
ifeq ("$(wildcard $(STARTUP_CONF))","")
@@
-357,8
+378,6
@@
endef
verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
$(call banner,"Building for PLATFORM=vpp using gcc")
@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
$(call banner,"Building for PLATFORM=vpp using gcc")
@make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
- $(call banner,"Building for PLATFORM=vpp_lite using gcc")
- @make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
$(call banner,"Installing dependencies")
@sudo -E apt-get update
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
$(call banner,"Installing dependencies")
@sudo -E apt-get update
@@
-368,5
+387,6
@@
ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
endif
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
endif
$(call banner,"Building $(PKG) packages")
@make pkg-$(PKG)
+ @make test-all