aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlement Sekera <ksekera@cisco.com>2018-11-15 14:27:04 +0100
committerDamjan Marion <dmarion@me.com>2018-11-23 15:36:15 +0000
commite61ad8d6c49d6c2fb30d29b446f6e6603c8b1de6 (patch)
treecc0f6abd0374030dc740b4caf0ddef26aebd6749
parentccfead6e12f5d5a124e1e279a5b74361e00e2de8 (diff)
make test: remove test-ext, fix test*-all targets
build extended binaries, vom & friends when test*-all targets are run, remove unneeded test-ext target (which is semantically same as test-debug-all) Change-Id: Id710e061fdc93e286a4ed91be6a0cdcf75a2dafd Signed-off-by: Klement Sekera <ksekera@cisco.com>
-rw-r--r--Makefile8
-rw-r--r--test/Makefile9
2 files changed, 6 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index f5f10ef77e5..e0c710fdfd7 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,6 @@ 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"
@@ -399,15 +398,12 @@ test-debug:
$(call test,vpp,vpp_debug,test)
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 japi-install,)
$(eval EXTENDED_TESTS=yes)
- $(call test,vpp,vpp_debug,test-ext)
+ $(call test,vpp,vpp,test)
test-all-debug:
+ $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
$(eval EXTENDED_TESTS=yes)
$(call test,vpp,vpp_debug,test)
diff --git a/test/Makefile b/test/Makefile
index 5f456e172c4..5b4a965482c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -162,14 +162,13 @@ sanity: verify-no-running-vpp
.PHONY: ext
ext:
- make -C ext
+ @if [ "$(EXTENDED_TESTS)" = "yes" ]; then\
+ make -C ext;\
+ fi
test-dep: verify-python-path $(PAPI_INSTALL_DONE)
-test: verify-python-path $(PAPI_INSTALL_DONE) sanity reset
- $(call retest-func)
-
-test-ext: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
+test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
$(call retest-func)
retest: verify-python-path sanity reset