X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=ebf94db724ef2d1378ef75d27d7c3d5173579446;hb=b64e4e2af314e1b2bc074b12ede50ad6d96c37c0;hp=7faba3b61ef69f5efb57749840073f23fc2d4b67;hpb=871349371a62f1f20b159b6afead8e84f8a2322b;p=vpp.git

diff --git a/Makefile b/Makefile
index 7faba3b61ef..ebf94db724e 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,7 @@ RPM_DEPENDS_GROUPS = 'Development Tools'
 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
+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
 
 ifneq ($(wildcard $(STARTUP_DIR)/startup.conf),)
@@ -86,6 +87,8 @@ 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-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)"
@@ -228,18 +231,18 @@ define test
 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_lite,vpp_lite,test)
+	$(call test,vpp,vpp,test)
 
 test-all-debug: bootstrap
 	$(eval EXTENDED_TESTS=yes)
-	$(call test,vpp_lite,vpp_lite_debug,test)
+	$(call test,vpp,vpp_debug,test)
 
 test-help:
 	@make -C test help
@@ -247,6 +250,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
 
@@ -254,7 +263,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
@@ -263,10 +272,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))","")
@@ -368,8 +377,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