X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2FMakefile;h=021498036670a9a69ad575803f08823d8b84d4d9;hb=a86e289570dfb7e02c47bed023c0669f3804a8bd;hp=5c0d48f0f07aae78d1c37705544fede3d20b5211;hpb=104543fa6a836df84b5b6d9b1909df3d5226a1e7;p=vpp.git

diff --git a/test/Makefile b/test/Makefile
index 5c0d48f0f07..02149803667 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,8 +5,32 @@ ifndef VPP_PYTHON_PREFIX
 	$(error VPP_PYTHON_PREFIX is not set)
 endif
 
+.PHONY: verify-no-running-vpp
+
+ifdef VPP_ZOMBIE_NOCHECK
+VPP_PIDS=
+else
+VPP_PIDS=$(shell pgrep -d, -x vpp_main)
+endif
+
+verify-no-running-vpp:
+	@if [ "$(VPP_PIDS)" != "" ]; then \
+		echo; \
+		echo "*** Existing vpp processes detected (PID(s): $(VPP_PIDS)). Running tests under these conditions is not supported. ***"; \
+		echo; \
+		ps -fp $(VPP_PIDS);\
+		echo; \
+		false; \
+	fi
+
+UNITTEST_EXTRA_OPTS=""
+
+ifeq ($(FAILFAST),1)
+UNITTEST_EXTRA_OPTS="-f"
+endif
+
 PYTHON_VENV_PATH=$(VPP_PYTHON_PREFIX)/virtualenv
-PYTHON_DEPENDS=scapy==2.3.3 pexpect
+PYTHON_DEPENDS=scapy==2.3.3 pexpect subprocess32 git+https://github.com/klement/py-lispnetworking@setup
 SCAPY_SOURCE=$(PYTHON_VENV_PATH)/lib/python2.7/site-packages/
 BUILD_COV_DIR = $(BR)/test-cov
 
@@ -35,15 +59,26 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
 	@touch $@
 
 define retest-func
-	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover -p test_\"*.py\""
+	@bash -c "source $(PYTHON_VENV_PATH)/bin/activate && python run_tests.py discover $(UNITTEST_EXTRA_OPTS) -p test_\"*.py\""
 endef
 
-test: reset verify-python-path $(PAPI_INSTALL_DONE)
+test: verify-python-path verify-no-running-vpp reset $(PAPI_INSTALL_DONE)
 	$(call retest-func)
 
-retest: reset verify-python-path
+retest: verify-python-path verify-no-running-vpp reset
 	$(call retest-func)
 
+shell: verify-python-path $(PAPI_INSTALL_DONE)
+	@echo "source $(PYTHON_VENV_PATH)/bin/activate;\
+		echo '***';\
+		echo VPP_TEST_BUILD_DIR=$(VPP_TEST_BUILD_DIR);\
+		echo VPP_TEST_BIN=$(VPP_TEST_BIN);\
+		echo VPP_TEST_PLUGIN_PATH=$(VPP_TEST_PLUGIN_PATH);\
+		echo VPP_TEST_INSTALL_PATH=$(VPP_TEST_INSTALL_PATH);\
+		echo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH);\
+		echo '***';\
+		exec </dev/tty" | bash -i
+
 .PHONY: wipe doc
 
 reset:
@@ -95,14 +130,19 @@ checkstyle: verify-python-path
 help:
 	@echo "Running tests:"
 	@echo ""
-	@echo " test                - build and run functional tests"
-	@echo " test-debug          - build and run functional tests (debug build)"
+	@echo " test                - build and run (basic) functional tests"
+	@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 " retest              - run functional tests"
 	@echo " retest-debug        - run functional tests (debug build)"
 	@echo " test-wipe           - wipe (temporary) files generated by unit tests"
+	@echo " test-shell          - enter shell with test environment"
+	@echo " test-shell-debug    - enter shell with test environment (debug build)"
 	@echo ""
 	@echo "Arguments controlling test runs:"
 	@echo " V=[0|1|2]            - set test verbosity level"
+	@echo " FAILFAST=[0|1]       - fail fast if 1, complete all tests if 0"
 	@echo " DEBUG=<type>         - set VPP debugging kind"
 	@echo "    DEBUG=core        - detect coredump and load it in gdb on crash"
 	@echo "    DEBUG=gdb         - allow easy debugging by printing VPP PID "
@@ -121,6 +161,11 @@ help:
 	@echo "                             TEST='bfd.BFDAPITestCase.test_add_bfd' selects a single test named test_add_bfd from test_bfd.py/BFDAPITestCase"
 	@echo "                             TEST='*.*.test_add_bfd' selects all test functions named test_add_bfd from all files/classes"
 	@echo ""
+	@echo " VPP_ZOMBIE_NOCHECK=1 - skip checking for vpp (zombie) processes (CAUTION)"
+	@echo " COREDUMP_SIZE=<size> - pass <size> as unix { coredump-size <size> } argument to vpp"
+	@echo "                        e.g. COREDUMP_SIZE=4g"
+	@echo "                             COREDUMP_SIZE=unlimited"
+	@echo ""
 	@echo "Creating test documentation"
 	@echo " test-doc            - generate documentation for test framework"
 	@echo " test-wipe-doc       - wipe documentation for test framework"