X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=f0173cc1757afbbc727d3bf947a106dc91a5c237;hb=78053e164fbb75c014126a3deff440f165504582;hp=8122c6a4c3857dc2da74f39e3e7c6709189f54de;hpb=6ca42d333b247eaee4995a7f779a43759a81909e;p=vpp.git

diff --git a/Makefile b/Makefile
index 8122c6a4c38..f0173cc1757 100644
--- a/Makefile
+++ b/Makefile
@@ -82,8 +82,12 @@ help:
 	@echo " run-release         - run release binary"
 	@echo " debug               - run debug binary with debugger"
 	@echo " debug-release       - run release binary with debugger"
-	@echo " test                - build and run functional tests"
-	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " test                - build and run (basic) functional tests"
+	@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-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"
 	@echo " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
@@ -221,6 +225,7 @@ define test
 	  VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
 	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
 	  LD_LIBRARY_PATH=$(BR)/install-$(2)-native/vpp/lib64/ \
+	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  $(3)
 endef
 
@@ -230,12 +235,26 @@ test: bootstrap
 test-debug: bootstrap
 	$(call test,vpp_lite,vpp_lite_debug,test)
 
+test-all: bootstrap
+	$(eval EXTENDED_TESTS=yes)
+	$(call test,vpp_lite,vpp_lite,test)
+
+test-all-debug: bootstrap
+	$(eval EXTENDED_TESTS=yes)
+	$(call test,vpp_lite,vpp_lite_debug,test)
+
 test-help:
 	@make -C test help
 
 test-wipe:
 	@make -C test wipe
 
+test-shell: bootstrap
+	$(call test,vpp_lite,vpp_lite,shell)
+
+test-shell-debug: bootstrap
+	$(call test,vpp_lite,vpp_lite_debug,shell)
+
 test-doc:
 	@make -C test doc
 
@@ -368,5 +387,6 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 endif
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
+	@make test-all