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>

diff --git a/Makefile b/Makefile
index f5f10ef..e0c710f 100644 (file)
--- 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 5f456e1..5b4a965 100644 (file)
--- 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