Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ppp: simplify code using existing functions
[vpp.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
eae2d89
..
724b504
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-76,10
+76,9
@@
PYTHON_EXTRA_DEPENDS=
endif
PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) -r requirements.txt
endif
PYTHON_DEPENDS=$(PYTHON_EXTRA_DEPENDS) -r requirements.txt
-SCAPY_SOURCE=$(shell find $(VENV_PATH) -name site-packages)
+SCAPY_SOURCE=$(shell find $(VENV_PATH)
/lib/$(PYTHON)
-name site-packages)
BUILD_COV_DIR=$(TEST_DIR)/coverage
BUILD_COV_DIR=$(TEST_DIR)/coverage
-GET_PIP_SCRIPT=$(TEST_RUN_DIR)/get-pip.py
PIP_INSTALL_DONE=$(TEST_RUN_DIR)/pip-install.done
PIP_PATCH_DONE=$(TEST_RUN_DIR)/pip-patch.done
PAPI_INSTALL_DONE=$(TEST_RUN_DIR)/papi-install.done
PIP_INSTALL_DONE=$(TEST_RUN_DIR)/pip-install.done
PIP_PATCH_DONE=$(TEST_RUN_DIR)/pip-patch.done
PAPI_INSTALL_DONE=$(TEST_RUN_DIR)/papi-install.done
@@
-92,14
+91,10
@@
else
PYTHON_INTERP=$(PYTHON)
endif
PYTHON_INTERP=$(PYTHON)
endif
-$(
GET_PIP_SCRIPT
):
+$(
PIP_INSTALL_DONE
):
@mkdir -p $(TEST_RUN_DIR)
@mkdir -p $(TEST_RUN_DIR)
- @bash -c "cd $(TEST_RUN_DIR) && curl -O https://bootstrap.pypa.io/get-pip.py"
-
-$(PIP_INSTALL_DONE): $(GET_PIP_SCRIPT)
@virtualenv $(VENV_PATH) -p $(PYTHON_INTERP)
@virtualenv $(VENV_PATH) -p $(PYTHON_INTERP)
- @bash -c "source $(VENV_PATH)/bin/activate && python $(GET_PIP_SCRIPT)"
- @bash -c "source $(VENV_PATH)/bin/activate && pip install $(PYTHON_DEPENDS)"
+ @bash -c "source $(VENV_PATH)/bin/activate && $(PYTHON_INTERP) -m pip install $(PYTHON_DEPENDS)"
@touch $@
$(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
@touch $@
$(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
@@
-112,11
+107,11
@@
$(PIP_PATCH_DONE): $(PIP_INSTALL_DONE)
@touch $@
$(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
@touch $@
$(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
- @bash -c "source $(VENV_PATH)/bin/activate &&
cd $(WS_ROOT)/src/vpp-api/python && python setup.py install
"
+ @bash -c "source $(VENV_PATH)/bin/activate &&
$(PYTHON_INTERP) -m pip install -e $(WS_ROOT)/src/vpp-api/python
"
@touch $@
define retest-func
@touch $@
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
$(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) $(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
@@
-125,8
+120,8
@@
ifeq ($(SANITY),no)
SANITY_IMPORT_VPP_PAPI_CMD=true
SANITY_RUN_VPP_CMD=true
else
SANITY_IMPORT_VPP_PAPI_CMD=true
SANITY_RUN_VPP_CMD=true
else
-SANITY_IMPORT_VPP_PAPI_CMD=source $(VENV_PATH)/bin/activate &&
python
sanity_import_vpp_papi.py
-SANITY_RUN_VPP_CMD=source $(VENV_PATH)/bin/activate &&
python
sanity_run_vpp.py
+SANITY_IMPORT_VPP_PAPI_CMD=source $(VENV_PATH)/bin/activate &&
$(PYTHON_INTERP)
sanity_import_vpp_papi.py
+SANITY_RUN_VPP_CMD=source $(VENV_PATH)/bin/activate &&
$(PYTHON_INTERP)
sanity_run_vpp.py
endif
ifndef TEST_JOBS
endif
ifndef TEST_JOBS
@@
-179,10
+174,10
@@
retest: verify-test-dir sanity reset
shell: verify-test-dir $(PAPI_INSTALL_DONE)
@echo "source $(VENV_PATH)/bin/activate;\
echo '***';\
shell: verify-test-dir $(PAPI_INSTALL_DONE)
@echo "source $(VENV_PATH)/bin/activate;\
echo '***';\
- echo _BUILD_DIR=$(VPP_BUILD_DIR);\
- echo _BIN=$(VPP_BIN);\
- echo _PLUGIN_PATH=$(VPP_PLUGIN_PATH);\
- echo _INSTALL_PATH=$(VPP_INSTALL_PATH);\
+ echo
VPP
_BUILD_DIR=$(VPP_BUILD_DIR);\
+ echo
VPP
_BIN=$(VPP_BIN);\
+ echo
VPP
_PLUGIN_PATH=$(VPP_PLUGIN_PATH);\
+ echo
VPP
_INSTALL_PATH=$(VPP_INSTALL_PATH);\
echo EXTERN_TESTS=$(EXTERN_TESTS);\
echo EXTERN_PLUGINS=$(EXTERN_PLUGINS);\
echo EXTERN_COV_DIR=$(EXTERN_COV_DIR);\
echo EXTERN_TESTS=$(EXTERN_TESTS);\
echo EXTERN_PLUGINS=$(EXTERN_PLUGINS);\
echo EXTERN_COV_DIR=$(EXTERN_COV_DIR);\
@@
-204,9
+199,9
@@
wipe: reset
@rm -f $(PAPI_INSTALL_FLAGS)
doc: verify-test-dir $(PIP_PATCH_DONE)
@rm -f $(PAPI_INSTALL_FLAGS)
doc: verify-test-dir $(PIP_PATCH_DONE)
- @virtualenv $(VENV_PATH) -p
$(PYTHON_INTERP)
- @bash -c "source $(VENV_PATH)/bin/activate && pip install sphinx sphinx-rtd-theme"
- @bash -c "source $(VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR)
NO_VPP_PAPI=1
html"
+ @virtualenv $(VENV_PATH) -p
python3
+ @bash -c "source $(VENV_PATH)/bin/activate && p
ython3 -m p
ip install sphinx sphinx-rtd-theme"
+ @bash -c "source $(VENV_PATH)/bin/activate && make -C doc WS_ROOT=$(WS_ROOT) BR=$(BR) html"
.PHONY: wipe-doc
.PHONY: wipe-doc
@@
-214,11
+209,11
@@
wipe-doc:
@make -C doc wipe BR=$(BR)
cov: wipe-cov reset ext verify-test-dir $(PAPI_INSTALL_DONE)
@make -C doc wipe BR=$(BR)
cov: wipe-cov reset ext verify-test-dir $(PAPI_INSTALL_DONE)
- @lcov --zerocounters --directory $(_BUILD_DIR)
+ @lcov --zerocounters --directory $(
VPP
_BUILD_DIR)
@test -z "$(EXTERN_COV_DIR)" || lcov --zerocounters --directory $(EXTERN_COV_DIR)
$(call retest-func)
@mkdir $(BUILD_COV_DIR)
@test -z "$(EXTERN_COV_DIR)" || lcov --zerocounters --directory $(EXTERN_COV_DIR)
$(call retest-func)
@mkdir $(BUILD_COV_DIR)
- @lcov --capture --directory $(_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
+ @lcov --capture --directory $(
VPP
_BUILD_DIR) --output-file $(BUILD_COV_DIR)/coverage.info
@test -z "$(EXTERN_COV_DIR)" || lcov --capture --directory $(EXTERN_COV_DIR) --output-file $(BUILD_COV_DIR)/extern-coverage.info
@genhtml $(BUILD_COV_DIR)/coverage.info --output-directory $(BUILD_COV_DIR)/html
@test -z "$(EXTERN_COV_DIR)" || genhtml $(BUILD_COV_DIR)/extern-coverage.info --output-directory $(BUILD_COV_DIR)/extern-html
@test -z "$(EXTERN_COV_DIR)" || lcov --capture --directory $(EXTERN_COV_DIR) --output-file $(BUILD_COV_DIR)/extern-coverage.info
@genhtml $(BUILD_COV_DIR)/coverage.info --output-directory $(BUILD_COV_DIR)/html
@test -z "$(EXTERN_COV_DIR)" || genhtml $(BUILD_COV_DIR)/extern-coverage.info --output-directory $(BUILD_COV_DIR)/extern-html
@@
-233,10
+228,10
@@
wipe-cov: wipe
.PHONY: checkstyle
checkstyle: verify-test-dir
.PHONY: checkstyle
checkstyle: verify-test-dir
- @virtualenv $(VENV_PATH) -p
$(PYTHON_INTERP)
- @bash -c "source $(VENV_PATH)/bin/activate && pip install pycodestyle"
+ @virtualenv $(VENV_PATH) -p
python3
+ @bash -c "source $(VENV_PATH)/bin/activate && p
ython3 -m p
ip install pycodestyle"
@bash -c "source $(VENV_PATH)/bin/activate &&\
@bash -c "source $(VENV_PATH)/bin/activate &&\
- pycodestyle --show-source --ignore=W504,E126,E241,E226,E305,E704,E741,E722 -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 ||\
(echo \"*******************************************************************\" &&\
echo \"* Test framework PEP8 compliance check FAILED \" &&\
echo \"*******************************************************************\" &&\
(echo \"*******************************************************************\" &&\
echo \"* Test framework PEP8 compliance check FAILED \" &&\
echo \"*******************************************************************\" &&\
@@
-260,6
+255,7
@@
help:
@echo ""
@echo "Arguments controlling test runs:"
@echo " V=[0|1|2] - set test verbosity level"
@echo ""
@echo "Arguments controlling test runs:"
@echo " V=[0|1|2] - set test verbosity level"
+ @echo " 0=ERROR, 1=INFO, 2=DEBUG"
@echo " TEST_JOBS=[<n>|auto] - use <n> parallel processes for test execution or automatic discovery of maximum acceptable processes (default: 1)"
@echo " CACHE_OUTPUT=[0|1] - cache VPP stdout/stderr and log as one block after test finishes (default: 1)"
@echo " FAILFAST=[0|1] - fail fast if 1, complete all tests if 0"
@echo " TEST_JOBS=[<n>|auto] - use <n> parallel processes for test execution or automatic discovery of maximum acceptable processes (default: 1)"
@echo " CACHE_OUTPUT=[0|1] - cache VPP stdout/stderr and log as one block after test finishes (default: 1)"
@echo " FAILFAST=[0|1] - fail fast if 1, complete all tests if 0"
@@
-299,6
+295,10
@@
help:
@echo ""
@echo " TEST_DEBUG=1 - turn on debugging of the test framework itself (expert)"
@echo ""
@echo ""
@echo " TEST_DEBUG=1 - turn on debugging of the test framework itself (expert)"
@echo ""
+ @echo " SKIP_AARCH64=1 - skip tests that are failing on the ARM platorm in FD.io CI"
+ @echo ""
+ @echo " SOCKET=1 - Communicate with VPP over Unix domain socket instead of SHM"
+ @echo ""
@echo "Creating test documentation"
@echo " test-doc - generate documentation for test framework"
@echo " test-wipe-doc - wipe documentation for test framework"
@echo "Creating test documentation"
@echo " test-doc - generate documentation for test framework"
@echo " test-wipe-doc - wipe documentation for test framework"