ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make test-ext: a new test target that builds VOM (existing one no longer do)

Browse Source 
Change-Id: If590e90b2a1c3b884863ec15a92ea4353ac9eb7c
Signed-off-by: Neale Ranns <nranns@cisco.com>
This commit is contained in:
Neale Ranns
2018-07-16 08:22:37 -04:00
committed by Dave Barach
parent 78451a6a66
commit b7d41fc18e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -188,6 +188,7 @@ help:
@echo " test-debug - build and run (basic) functional tests (debug build)" @echo " test-debug - build and run (basic) functional tests (debug build)"
@echo " test-all - build and run (all) functional tests" @echo " test-all - build and run (all) functional tests"
@echo " test-all-debug - build and run (all) functional tests (debug build)" @echo " test-all-debug - build and run (all) functional tests (debug build)"
@echo " test-ext - build and run 'extras' functional tests"
@echo " test-shell - enter shell with test environment" @echo " test-shell - enter shell with test environment"
@echo " test-shell-debug - enter shell with test environment (debug build)" @echo " test-shell-debug - enter shell with test environment (debug build)"
@echo " test-wipe - wipe files generated by unit tests" @echo " test-wipe - wipe files generated by unit tests"
@ -354,7 +355,7 @@ export VPP_PYTHON_PREFIX ?= $(BR)/python
libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
define test define test
$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install vom-install,) $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
$(eval libs:=lib lib64) $(eval libs:=lib lib64)
make -C test \ make -C test \
TEST_DIR=$(WS_ROOT)/test \ TEST_DIR=$(WS_ROOT)/test \
@ -380,6 +381,11 @@ test-all:
$(eval EXTENDED_TESTS=yes) $(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp,test) $(call test,vpp,vpp,test)
test-ext:
$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install,)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_debug,test-ext)
test-all-debug: test-all-debug:
$(eval EXTENDED_TESTS=yes) $(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_debug,test) $(call test,vpp,vpp_debug,test)

5
test/Makefile
View File

@ -143,7 +143,10 @@ ext:
test-dep: verify-python-path $(PAPI_INSTALL_DONE) test-dep: verify-python-path $(PAPI_INSTALL_DONE)
test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset test: verify-python-path $(PAPI_INSTALL_DONE) sanity reset
$(call retest-func)
test-ext: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
$(call retest-func) $(call retest-func)
retest: verify-python-path sanity reset retest: verify-python-path sanity reset