Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
make test: add make test-shell[-debug] targets
[vpp.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
bbbb2ac
..
f0173cc
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-39,7
+39,7
@@
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 += python-dev python-virtualenv python-pip lcov chrpath autoconf
nasm
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
@@
-82,8
+82,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)"
@@
-221,6
+225,7
@@
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
$(3)
endef
@@
-230,12
+235,26
@@
test: bootstrap
test-debug: bootstrap
$(call test,vpp_lite,vpp_lite_debug,test)
test-debug: bootstrap
$(call test,vpp_lite,vpp_lite_debug,test)
+test-all: bootstrap
+ $(eval EXTENDED_TESTS=yes)
+ $(call test,vpp_lite,vpp_lite,test)
+
+test-all-debug: bootstrap
+ $(eval EXTENDED_TESTS=yes)
+ $(call test,vpp_lite,vpp_lite_debug,test)
+
test-help:
@make -C test help
test-wipe:
@make -C test wipe
test-help:
@make -C test help
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
@@
-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