ACL plugin rejects ICMP messages (VPP-624)

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 8122c6a..1527d60 100644 (file)
--- 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,14 +225,23 @@ 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
 
 test: bootstrap
-       $(call test,vpp_lite,vpp_lite,test)
+       $(call test,vpp,vpp,test)
 
 test-debug: bootstrap
-       $(call test,vpp_lite,vpp_lite_debug,test)
+       $(call test,vpp,vpp_debug,test)
+
+test-all: bootstrap
+       $(eval EXTENDED_TESTS=yes)
+       $(call test,vpp,vpp,test)
+
+test-all-debug: bootstrap
+       $(eval EXTENDED_TESTS=yes)
+       $(call test,vpp,vpp_debug,test)
 
 test-help:
        @make -C test help
@@ -236,6 +249,12 @@ 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
 
@@ -243,7 +262,7 @@ test-wipe-doc:
        @make -C test wipe-doc
 
 test-cov: bootstrap
-       $(call test,vpp_lite,vpp_lite_gcov,cov)
+       $(call test,vpp,vpp_gcov,cov)
 
 test-wipe-cov:
        @make -C test wipe-cov
@@ -252,10 +271,10 @@ test-checkstyle:
        @make -C test checkstyle
 
 retest:
-       $(call test,vpp_lite,vpp_lite,retest)
+       $(call test,vpp,vpp,retest)
 
 retest-debug:
-       $(call test,vpp_lite,vpp_lite_debug,retest)
+       $(call test,vpp,vpp_debug,retest)
 
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
@@ -357,8 +376,6 @@ endef
 verify: install-dep $(BR)/.bootstrap.ok dpdk-install-dev
        $(call banner,"Building for PLATFORM=vpp using gcc")
        @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
-       $(call banner,"Building for PLATFORM=vpp_lite using gcc")
-       @make -C build-root PLATFORM=vpp_lite TAG=vpp_lite wipe-all install-packages
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
        $(call banner,"Installing dependencies")
        @sudo -E apt-get update
@@ -368,5 +385,6 @@ ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
 endif
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
+       @make test-all