X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=d5cc9f3785a80b6e5a8b4b97fe4dced5a5583e3c;hb=b4a7a7d;hp=36c7a5a741d00aaed10f1837797a6cb8171e3c58;hpb=3138d723091234a3534baa8b1bbaad31df6fb8d6;p=vpp.git

diff --git a/Makefile b/Makefile
index 36c7a5a741d..d5cc9f3785a 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,6 @@ help:
 	@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-ext            - build and run 'extras' functional tests"
 	@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"
@@ -296,8 +295,12 @@ endif
 	@sudo -E apt-get update
 	@sudo -E apt-get $(APT_ARGS) $(CONFIRM) $(FORCE) install $(DEB_DEPENDS)
 else ifneq ("$(wildcard /etc/redhat-release)","")
-	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
+ifeq ($(OS_ID),rhel)
+	@sudo -E yum-config-manager --enable rhel-server-rhscl-7-rpms
+else ifeq ($(OS_ID),centos)
 	@sudo -E yum install $(CONFIRM) centos-release-scl-rh
+endif
+	@sudo -E yum groupinstall $(CONFIRM) $(RPM_DEPENDS_GROUPS)
 	@sudo -E yum install $(CONFIRM) $(RPM_DEPENDS)
 	@sudo -E debuginfo-install $(CONFIRM) glibc openssl-libs mbedtls-devel zlib
 else ifeq ($(filter opensuse-tumbleweed,$(OS_ID)),$(OS_ID))
@@ -310,7 +313,7 @@ else ifeq ($(filter opensuse,$(OS_ID)),$(OS_ID))
 	@sudo -E zypper refresh
 	@sudo -E zypper install -y $(RPM_SUSE_DEPENDS)
 else
-	$(error "This option currently works only on Ubuntu, Debian, Centos or openSUSE systems")
+	$(error "This option currently works only on Ubuntu, Debian, RHEL, CentOS or openSUSE systems")
 endif
 
 define make
@@ -367,19 +370,18 @@ wipe-release: test-wipe $(BR)/.deps.ok
 
 rebuild-release: wipe-release build-release
 
-export VPP_PYTHON_PREFIX ?= $(BR)/python
-
 libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3)))
 
+export TEST_DIR ?= $(WS_ROOT)/test
+
 define test
 	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=$(1) TAG=$(2) vpp-install,)
 	$(eval libs:=lib lib64)
 	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=$(call libexpand,$(libs),$(2),vpp_plugins) \
-	  VPP_TEST_INSTALL_PATH=$(BR)/install-$(2)-native/ \
+	  VPP_BUILD_DIR=$(BR)/build-$(2)-native \
+	  VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \
+	  VPP_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \
+	  VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \
 	  LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \
 	  EXTENDED_TESTS=$(EXTENDED_TESTS) \
 	  PYTHON=$(PYTHON) \
@@ -395,15 +397,12 @@ test-debug:
 	$(call test,vpp,vpp_debug,test)
 
 test-all:
+	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp vom-install japi-install,)
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp,test)
 
-test-ext:
-	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
-	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp,vpp_debug,test-ext)
-
 test-all-debug:
+	$(if $(filter-out $(3),retest),make -C $(BR) PLATFORM=vpp TAG=vpp_debug vom-install japi-install,)
 	$(eval EXTENDED_TESTS=yes)
 	$(call test,vpp,vpp_debug,test)
 
@@ -496,7 +495,7 @@ pkg-srpm: dist
 	make -C extras/rpm srpm
 
 dpdk-install-dev:
-	$(call banner,"This command is deprecated. Please use 'make install-ext-libs'")
+	$(call banner,"This command is deprecated. Please use 'make install-ext-deps'")
 	make -C build/external install-$(PKG)
 
 install-ext-deps:
@@ -569,7 +568,7 @@ verify: install-dep $(BR)/.deps.ok install-ext-deps
 	@make -C build-root PLATFORM=vpp TAG=vpp vom-install
 	$(call banner,"Building $(PKG) packages")
 	@make pkg-$(PKG)
-ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-16.04)
+ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04)
 	$(call banner,"Running tests")
 	@make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test
 endif