X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2FMakefile;h=66c8f8a9bb7ea5282a3577b9902ae05797c06d70;hb=a43c93f8554ad7418e31be3791b3fb71232f60ac;hp=8a6d69c3a628a6e8421f05918b98d42b571c71e1;hpb=8adb92be294a10dbdb5cfd374420d74621c57b8f;p=vpp.git

diff --git a/test/Makefile b/test/Makefile
index 8a6d69c3a62..66c8f8a9bb7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -135,8 +135,15 @@ refresh-deps: clean-deps $(PYTHON_DEPENDS)
 clean-deps:
 	@rm -f $(PYTHON_DEPENDS)
 
+ifneq ($(EXTERN_PLUGIN_SRC_DIR),)
+PLUGIN_SRC_DIR=$(EXTERN_PLUGIN_SRC_DIR)
+else
+PLUGIN_SRC_DIR=$(WS_ROOT)/src/plugins
+endif
+PLUGIN_TEST_DIRS=$(shell find $(PLUGIN_SRC_DIR) -type d -name test -exec echo -n " -d {}" \;)
+
 define retest-func
-@env FORCE_FOREGROUND=$(FORCE_FOREGROUND) FAILED_DIR=$(FAILED_DIR) VENV_PATH=$(VENV_PATH) scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(VENV_PATH)/bin/activate $(PYTHON_INTERP) $(PYTHON_PROFILE_OPTS) run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS) || env FAILED_DIR=$(FAILED_DIR) COMPRESS_FAILED_TEST_LOGS=$(COMPRESS_FAILED_TEST_LOGS) scripts/compress_failed.sh
+@env FORCE_FOREGROUND=$(FORCE_FOREGROUND) FAILED_DIR=$(FAILED_DIR) VENV_PATH=$(VENV_PATH) scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(VENV_PATH)/bin/activate $(PYTHON_INTERP) $(PYTHON_PROFILE_OPTS) run_tests.py -d $(TEST_DIR)$(PLUGIN_TEST_DIRS) $(UNITTEST_EXTRA_OPTS) || env FAILED_DIR=$(FAILED_DIR) COMPRESS_FAILED_TEST_LOGS=$(COMPRESS_FAILED_TEST_LOGS) scripts/compress_failed.sh
 endef
 
 .PHONY: sanity
@@ -252,6 +259,11 @@ cov: wipe-cov reset ext verify-test-dir $(PAPI_INSTALL_DONE)
 wipe-cov: wipe
 	@rm -rf $(BUILD_COV_DIR)
 
+.PHONY: papi-wipe
+
+papi-wipe:
+	@rm -rf $(PAPI_INSTALL_DONE)
+
 .PHONY: checkstyle
 checkstyle: verify-test-dir
 	@virtualenv $(VENV_PATH) -p python3
@@ -275,6 +287,7 @@ help:
 	@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 " papi-wipe           - rebuild vpp_papi sources"
 	@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)"