X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=Makefile;h=4b7170d27ff0ece0e60be1826309cc8f4ea652b0;hb=9876520f9ba746ed4d9923f392911c4f1888a105;hp=5808a3336c16d6f83830dd5d7faac1cd6f99e350;hpb=54ccf2261cb1f4afd966b7b1e92689183cb17836;p=vpp.git

diff --git a/Makefile b/Makefile
index 5808a3336c1..4b7170d27ff 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,11 @@ GDB_ARGS= -ex "handle SIGUSR1 noprint nostop"
 #
 # OS Detection
 #
+# We allow Darwin (MacOS) for docs generation; VPP build will still fail.
+ifneq ($(shell uname),Darwin)
 OS_ID        = $(shell grep '^ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
 OS_VERSION_ID= $(shell grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\"//g')
+endif
 
 DEB_DEPENDS  = curl build-essential autoconf automake bison libssl-dev ccache
 DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
@@ -55,6 +58,7 @@ endif
 .PHONY: help bootstrap wipe wipe-release build build-release rebuild rebuild-release
 .PHONY: run run-release debug debug-release build-vat run-vat pkg-deb pkg-rpm
 .PHONY: ctags cscope plugins plugins-release build-vpp-api
+.PHONY: test test-debug retest retest-debug
 
 help:
 	@echo "Make Targets:"
@@ -72,6 +76,10 @@ help:
 	@echo " run-release         - run release binary"
 	@echo " debug               - run debug binary with debugger"
 	@echo " debug-release       - run release binary with debugger"
+	@echo " test                - build and run functional tests"
+	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " retest              - run functional tests"
+	@echo " retest-debug        - run functional tests (debug build)"
 	@echo " build-vat           - build vpp-api-test tool"
 	@echo " build-vpp-api       - build vpp-api"
 	@echo " run-vat             - run vpp-api-test tool"
@@ -80,6 +88,8 @@ help:
 	@echo " ctags               - (re)generate ctags database"
 	@echo " gtags               - (re)generate gtags database"
 	@echo " cscope              - (re)generate cscope database"
+	@echo " checkstyle          - check coding style"
+	@echo " fixstyle            - fix coding style"
 	@echo " doxygen             - (re)generate documentation"
 	@echo " bootstrap-doxygen   - setup Doxygen dependencies"
 	@echo " wipe-doxygen        - wipe all generated documentation"
@@ -93,6 +103,7 @@ help:
 	@echo "                       startup.conf file is present"
 	@echo " GDB=<path>          - gdb binary to use for debugging"
 	@echo " PLATFORM=<name>     - target platform. default is vpp"
+	@echo " TEST=<name>         - only run specific test"
 	@echo ""
 	@echo "Current Argumernt Values:"
 	@echo " V            = $(V)"
@@ -177,6 +188,34 @@ plugins-release: $(BR)/.bootstrap.ok
 build-vpp-api: $(BR)/.bootstrap.ok
 	$(call make,$(PLATFORM)_debug,vpp-api-install)
 
+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:
+ifeq ($(OS_ID),ubuntu)
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+endif
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite plugins-install vpp-install vpp-api-test-install
+	$(call test,vpp_lite)
+
+test-debug:
+ifeq ($(OS_ID),ubuntu)
+	@sudo -E apt-get $(CONFIRM) $(FORCE) install python-dev python-scapy
+endif
+	@make -C $(BR) PLATFORM=vpp_lite TAG=vpp_lite_debug plugins-install vpp-install vpp-api-test-install
+	$(call test,vpp_lite_debug)
+
+retest:
+	$(call test,vpp_lite)
+
+retest-debug:
+	$(call test,vpp_lite_debug)
+
 STARTUP_DIR ?= $(PWD)
 ifeq ("$(wildcard $(STARTUP_CONF))","")
 define run
@@ -233,6 +272,11 @@ gtags: ctags
 cscope: cscope.files
 	@cscope -b -q -v
 
+checkstyle:
+	@build-root/scripts/checkstyle.sh
+
+fixstyle:
+	@build-root/scripts/checkstyle.sh --fix
 
 #
 # Build the documentation
@@ -242,7 +286,7 @@ cscope: cscope.files
 export DOXY_DIR ?= $(WS_ROOT)/doxygen
 
 define make-doxy
-	@WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@
+	@OS_ID="$(OS_ID)" WS_ROOT="$(WS_ROOT)" BR="$(BR)" make -C $(DOXY_DIR) $@
 endef
 
 .PHONY: bootstrap-doxygen doxygen wipe-doxygen