make test: remove test-ext, fix test*-all targets

[vpp.git] / Makefile

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)