Deprecate MPLSoGRE tunnels (VPP-502)

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 3db644e..93277be 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -192,21 +192,26 @@ define test
        @make -C test \
          VPP_TEST_BIN=$(BR)/install-$(1)-native/vpp/bin/vpp \
          VPP_TEST_API_TEST_BIN=$(BR)/install-$(1)-native/vpp-api-test/bin/vpp_api_test \
+         VPP_TEST_PLUGIN_PATH=$(BR)/install-$(1)-native/plugins/lib64/vpp_plugins \
          V=$(V) TEST=$(TEST)
 endef
 
-test:
+test: bootstrap
 ifeq ($(OS_ID),ubuntu)
-       @sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+       @if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
+         sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
+       fi
 endif
-       @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-install vpp-api-test-install
+       @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite vpp-api-install plugins-install vpp-install vpp-api-test-install
        $(call test,vpp_lite)
 
-test-debug:
+test-debug: bootstrap
 ifeq ($(OS_ID),ubuntu)
-       @sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+       @if ! (dpkg -l python-dev python-scapy &> /dev/null); then \
+         sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy; \
+       fi
 endif
-       @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-install vpp-api-test-install
+       @make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug vpp-api-install plugins-install vpp-install vpp-api-test-install
        $(call test,vpp_lite_debug)
 
 retest: