diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2019-08-22 00:32:29 +0000 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2019-08-23 17:31:08 -0400 |
| commit | 9e25c7723d96412a139d4f1b73f9fad020f3e7a9 (patch) | |
| tree | 1a39ac7b3965afbfa25ffd9f9f2437bab0c7a7f8 /test/Makefile | |
| parent | 46441cb9cde2044c4e3e743d69418cecc897a63a (diff) | |
tests: move plugin tests to src/plugins/*/test
- Relocate plugin tests for 'make test' into
src/plugins/*/test so that plugin test cases
are co-located with the plugin source code.
Type: refactor
Ticket: VPP-1754
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I503e6a43528e14981799b735fa65674155713f67
(cherry picked from commit a43c93f8554ad7418e31be3791b3fb71232f60ac)
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile index 3a92f1413b5..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 |