summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2018-07-16 08:22:37 -0400
committerDave Barach <openvpp@barachs.net>2018-07-22 21:16:55 +0000
commitb7d41fc18e43e4b839b6297d776c4a3e31fd1fb6 (patch)
tree00045a631978e6b1c3b0c3745f449e85587ed1d1
parent78451a6a660cd26a67d2284219f48878a2dfe2c3 (diff)
make test-ext: a new test target that builds VOM (existing one no longer do)
Change-Id: If590e90b2a1c3b884863ec15a92ea4353ac9eb7c Signed-off-by: Neale Ranns <nranns@cisco.com>
-rw-r--r--Makefile8
-rw-r--r--test/Makefile5
2 files changed, 11 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index afbe6f9b45b..298046dfa89 100644
--- a/Makefile
+++ b/Makefile
@@ -188,6 +188,7 @@ help:
@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-ext - build and run 'extras' functional tests"
@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"
@@ -354,7 +355,7 @@ export VPP_PYTHON_PREFIX ?= $(BR)/python
libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
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)
make -C test \
TEST_DIR=$(WS_ROOT)/test \
@@ -380,6 +381,11 @@ test-all:
$(eval EXTENDED_TESTS=yes)
$(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:
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_debug,test)
diff --git a/test/Makefile b/test/Makefile
index 2c5f1ec6f98..06596424e9d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -143,7 +143,10 @@ ext:
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)
retest: verify-python-path sanity reset