LISP: improve DP speed

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index f47c98a..91c80bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ RPM_DEPENDS  = redhat-lsb glibc-static java-1.8.0-openjdk-devel yum-utils
 RPM_DEPENDS += openssl-devel https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm apr-devel
 RPM_DEPENDS += python-devel python-virtualenv lcov chrpath libffi-devel
 RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
-EPEL_DEPENDS = libconfuse-devel ganglia-devel
+EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
         STARTUP_CONF ?= $(STARTUP_DIR)/startup.conf
@@ -222,6 +222,7 @@ export VPP_PYTHON_PREFIX=$(BR)/python
 define test
        $(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
        make -C test \
+         TEST_DIR=$(WS_ROOT)/test \
          VPP_TEST_BUILD_DIR=$(BR)/build-$(2)-native \
          VPP_TEST_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
          VPP_TEST_PLUGIN_PATH=$(BR)/install-$(2)-native/vpp/lib64/vpp_plugins \
@@ -252,10 +253,10 @@ test-wipe:
        @make -C test wipe
 
 test-shell: bootstrap
-       $(call test,vpp_lite,vpp_lite,shell)
+       $(call test,vpp,vpp,shell)
 
 test-shell-debug: bootstrap
-       $(call test,vpp_lite,vpp_lite_debug,shell)
+       $(call test,vpp,vpp_debug,shell)
 
 test-doc:
        @make -C test doc
@@ -264,6 +265,7 @@ test-wipe-doc:
        @make -C test wipe-doc
 
 test-cov: bootstrap
+       $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_gcov,cov)
 
 test-wipe-cov: