Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
api: Add API support for marvell PP2 plugin
[vpp.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
3a92f14
..
d8bbf4d
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-135,8
+135,15
@@
refresh-deps: clean-deps $(PYTHON_DEPENDS)
clean-deps:
@rm -f $(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
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
endef
.PHONY: sanity
@@
-184,9
+191,7
@@
sanity: verify-no-running-vpp
.PHONY: ext
ext:
.PHONY: ext
ext:
- @if [ "$(EXTENDED_TESTS)" = "yes" ]; then\
- make -C ext;\
- fi
+ make -C ext
test-dep: verify-test-dir $(PAPI_INSTALL_DONE)
test-dep: verify-test-dir $(PAPI_INSTALL_DONE)
@@
-262,7
+267,7
@@
checkstyle: verify-test-dir
@virtualenv $(VENV_PATH) -p python3
@bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install pycodestyle"
@bash -c "source $(VENV_PATH)/bin/activate &&\
@virtualenv $(VENV_PATH) -p python3
@bash -c "source $(VENV_PATH)/bin/activate && python3 -m pip install pycodestyle"
@bash -c "source $(VENV_PATH)/bin/activate &&\
- pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 --exclude=$(WS_ROOT)/test/_*.py -v $(WS_ROOT)/test/*.py ||\
+ pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 --exclude=$(WS_ROOT)/test/_*.py -v $(WS_ROOT)/test/*.py
$(PLUGIN_SRC_DIR)/*/test/*.py
||\
(echo \"*******************************************************************\" &&\
echo \"* Test framework PEP8 compliance check FAILED \" &&\
echo \"*******************************************************************\" &&\
(echo \"*******************************************************************\" &&\
echo \"* Test framework PEP8 compliance check FAILED \" &&\
echo \"*******************************************************************\" &&\