VXLAN:validate mcast encapsulation ip/mac

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 4454706..bdf20e8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
 DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
 DEB_DEPENDS += lcov chrpath autoconf nasm
-DEB_DEPENDS += python-dev python-virtualenv python-pip libffi6
+DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += openjdk-8-jdk-headless
 else
@@ -143,6 +143,21 @@ ifeq ($(OS_ID),ubuntu)
          exit 1 ; \
        fi ; \
        exit 0
+else ifneq ("$(wildcard /etc/redhat-release)","")
+       @for i in $(RPM_DEPENDS) $(EPEL_DEPENDS) ; do \
+           RPM=$$(basename -s .rpm "$${i##*/}" | cut -d- -f1,2,3)  ;   \
+           if [[ "$$RPM" =~ "epel-release-latest" ]] ; then            \
+               MISSING+=$$(rpm -q epel-release | grep "^package") ;    \
+           else                                                        \
+               MISSING+=$$(rpm -q $$RPM | grep "^package")        ;    \
+           fi                                                     ;    \
+       done                                                       ;    \
+       if [ -n "$$MISSING" ] ; then \
+         echo "Please install missing RPMs: \n$$MISSING\n" ; \
+         echo "by executing \"make install-dep\"\n" ; \
+         exit 1 ; \
+       fi ; \
+       exit 0
 endif
        @echo "SOURCE_PATH = $(WS_ROOT)"                   > $(BR)/build-config.mk
        @echo "#!/bin/bash\n"                              > $(BR)/path_setup
@@ -222,6 +237,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 +268,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 +280,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: